[maemo-commits] [maemo-commits] r10352 - in projects/haf/trunk/hildon-desktop: . libhildondesktop

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-03-05 10:52:20 +0200 (Mon, 05 Mar 2007)
New Revision: 10352

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.c
Log:

2007-03-01  Johan Bilien  <johan.bilien at nokia.com>

	* libhildondesktop/hildon-home-titlebar.c:
	- add image as child rather than button icon for the accept and
	cancel buttons (hildon themes don't support button icons)



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-03-05 08:27:20 UTC (rev 10351)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-03-05 08:52:20 UTC (rev 10352)
@@ -1,3 +1,9 @@
+2007-03-01  Johan Bilien  <johan.bilien at nokia.com>
+
+	* libhildondesktop/hildon-home-titlebar.c:
+	- add image as child rather than button icon for the accept and
+	cancel buttons (hildon themes don't support button icons)
+
 2007-03-02  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* data/applications.menu, data/Makefile.am: add menu definition file

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.c	2007-03-05 08:27:20 UTC (rev 10351)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-titlebar.c	2007-03-05 08:52:20 UTC (rev 10352)
@@ -476,11 +476,10 @@
   gtk_container_add (GTK_CONTAINER (align), hbox);
   gtk_widget_show (hbox);
 
-  priv->layout_accept = gtk_button_new_with_label ("");
-  g_object_set (priv->layout_accept,
-                "image", gtk_image_new_from_icon_name (LAYOUT_MODE_ACCEPT_BUTTON,
-                                                       GTK_ICON_SIZE_BUTTON),
-                NULL);
+  priv->layout_accept = gtk_button_new ();
+  gtk_container_add (GTK_CONTAINER (priv->layout_accept),
+                     gtk_image_new_from_icon_name (LAYOUT_MODE_ACCEPT_BUTTON,
+                                                   GTK_ICON_SIZE_BUTTON));
   gtk_widget_set_size_request (priv->layout_accept,
                                LAYOUT_MODE_BUTTON_SIZE,
                                LAYOUT_MODE_BUTTON_SIZE);
@@ -490,11 +489,10 @@
   gtk_box_pack_start (GTK_BOX (hbox), priv->layout_accept, FALSE, FALSE, 0);
 
 
-  priv->layout_cancel = gtk_button_new_with_label ("");
-  g_object_set (priv->layout_cancel,
-                "image", gtk_image_new_from_icon_name (LAYOUT_MODE_CANCEL_BUTTON,
-                                                       GTK_ICON_SIZE_BUTTON),
-                NULL);
+  priv->layout_cancel = gtk_button_new ();
+  gtk_container_add (GTK_CONTAINER (priv->layout_cancel),
+                     gtk_image_new_from_icon_name (LAYOUT_MODE_CANCEL_BUTTON,
+                                                   GTK_ICON_SIZE_BUTTON));
   gtk_widget_set_size_request (priv->layout_cancel,
                                LAYOUT_MODE_BUTTON_SIZE,
                                LAYOUT_MODE_BUTTON_SIZE);