[maemo-commits] [maemo-commits] r11722 - in projects/haf/trunk/hildon-1: . debian src

[From: subversion at stage.maemo.org]

Author: mdk
Date: 2007-05-21 12:05:12 +0300 (Mon, 21 May 2007)
New Revision: 11722

Modified:
   projects/haf/trunk/hildon-1/ChangeLog
   projects/haf/trunk/hildon-1/autogen.sh
   projects/haf/trunk/hildon-1/debian/rules
   projects/haf/trunk/hildon-1/src/hildon-banner.c
Log:
Importing several usefull fixes from the ubuntu-mobile branch.


Modified: projects/haf/trunk/hildon-1/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-1/ChangeLog	2007-05-21 08:36:01 UTC (rev 11721)
+++ projects/haf/trunk/hildon-1/ChangeLog	2007-05-21 09:05:12 UTC (rev 11722)
@@ -1,5 +1,12 @@
 2007-05-21  Michael Dominic Kostrzewa  <michael.kostrzewa at 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 at nokia.com> 
+
 	* examples/Makefile.am:
 	* examples/hildon-finger-example.c: Adding a finger-checking code
 	example. 

Modified: projects/haf/trunk/hildon-1/autogen.sh
===================================================================
--- projects/haf/trunk/hildon-1/autogen.sh	2007-05-21 08:36:01 UTC (rev 11721)
+++ projects/haf/trunk/hildon-1/autogen.sh	2007-05-21 09:05:12 UTC (rev 11722)
@@ -62,7 +62,7 @@
   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."

Modified: projects/haf/trunk/hildon-1/debian/rules
===================================================================
--- projects/haf/trunk/hildon-1/debian/rules	2007-05-21 08:36:01 UTC (rev 11721)
+++ projects/haf/trunk/hildon-1/debian/rules	2007-05-21 09:05:12 UTC (rev 11722)
@@ -69,6 +69,7 @@
 	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)" ""

Modified: projects/haf/trunk/hildon-1/src/hildon-banner.c
===================================================================
--- projects/haf/trunk/hildon-1/src/hildon-banner.c	2007-05-21 08:36:01 UTC (rev 11721)
+++ projects/haf/trunk/hildon-1/src/hildon-banner.c	2007-05-21 09:05:12 UTC (rev 11722)
@@ -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 at nokia.com>
  *
@@ -400,7 +400,7 @@
         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 @@
 
             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 @@
     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);