Importing several usefull fixes from the ubuntu-mobile branch.

diff --git a/ChangeLog b/ChangeLog
index 41548b6..89f297b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-05-21  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
 
+       * autogen.sh:
+       * debian/rules:
+       * src/hildon-banner.c: Importing several usefull fixes from the
+       ubuntu-mobile branch.
+
+2007-05-21  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
+
        * examples/Makefile.am:
        * examples/hildon-finger-example.c: Adding a finger-checking code
        example. 

diff --git a/autogen.sh b/autogen.sh
index be9d509..8a0d915 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -62,7 +62,7 @@ if test "$DIE" -eq 1; then
   exit 1
 fi
 
-if [ -z "$*" -a "x$NOCONFIGURE" == "x" ]; then
+if [ -z "$*" -a "x$NOCONFIGURE" = "x" ]; then
   echo "**Warning**: I am going to run \`configure' with no arguments."
   echo "If you wish to pass any to it, please specify them on the"
   echo \`$0\'" command line."

diff --git a/debian/rules b/debian/rules
index ad95c98..49619c0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -69,6 +69,7 @@ clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp 
+       rm -rf debian/build
 #      Add here commands to clean up after the build process.
        -$(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""

diff --git a/src/hildon-banner.c b/src/hildon-banner.c
index cdfc408..21b776b 100644 (file)
--- a/src/hildon-banner.c
+++ b/src/hildon-banner.c
@@ -1,7 +1,7 @@
 /*
  * This file is a part of hildon
  *
- * Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved.
+ * Copyright (C) 2005, 2006, 2007 Nokia Corporation, all rights reserved.
  *
  * Contact: Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
  *
@@ -400,7 +400,7 @@ hildon_banner_set_property                      (GObject *object,
         case PROP_PARENT_WINDOW:
             window = g_value_get_object (value);         
            if (priv->parent) {
-                   g_object_remove_weak_pointer(G_OBJECT (priv->parent), (gpointer *)&priv->parent);
+                   g_object_remove_weak_pointer(G_OBJECT (priv->parent), (gpointer) &priv->parent);
            }
 
             gtk_window_set_transient_for (GTK_WINDOW (object), (GtkWindow *) window);
@@ -408,7 +408,7 @@ hildon_banner_set_property                      (GObject *object,
 
             if (window) {
                 gtk_window_set_destroy_with_parent (GTK_WINDOW (object), TRUE);
-               g_object_add_weak_pointer(G_OBJECT (window), (gpointer *)&priv->parent);
+               g_object_add_weak_pointer(G_OBJECT (window), (gpointer) &priv->parent);
            }
 
             break;
@@ -561,7 +561,7 @@ hildon_banner_finalize                              (GObject *object)
     HildonBannerPrivate *priv = HILDON_BANNER_GET_PRIVATE (object);
 
     if (priv->parent) {
-       g_object_remove_weak_pointer(G_OBJECT (priv->parent), (gpointer *)&priv->parent);
+       g_object_remove_weak_pointer(G_OBJECT (priv->parent), (gpointer) &priv->parent);
     }
 
     G_OBJECT_CLASS (parent_class)->finalize (object);