r2022 - in trunk/src/target/OM-2007/openmoko-libs: . libmokoui

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-05-18 19:19:19 +0200 (Fri, 18 May 2007)
New Revision: 2022

Modified:
   trunk/src/target/OM-2007/openmoko-libs/ChangeLog
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c
Log:
* libmokoui/moko-finger-tool-box.c: (cb_configure): Remove useless code
(also currently is causing a crash)
* libmokoui/moko-pixmap-button.c:
(moko_pixmap_button_set_center_stock): Load center stock icons at the
size they have been supplied by designers (36x36)


Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog	2007-05-18 17:17:11 UTC (rev 2021)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog	2007-05-18 17:19:19 UTC (rev 2022)
@@ -1,5 +1,13 @@
 2007-05-18  Thomas Wood  <thomas at openedhand.com>
 
+	* libmokoui/moko-finger-tool-box.c: (cb_configure): Remove useless code
+	(also currently is causing a crash)
+	* libmokoui/moko-pixmap-button.c:
+	(moko_pixmap_button_set_center_stock): Load center stock icons at the
+	size they have been supplied by designers (36x36)
+
+2007-05-18  Thomas Wood  <thomas at openedhand.com>
+
 	Patch by: Neil J Patel <njp at o-hand.com>
 
 	* libmokojournal/src/moko-journal.c:

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c	2007-05-18 17:17:11 UTC (rev 2021)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c	2007-05-18 17:19:19 UTC (rev 2022)
@@ -245,9 +245,7 @@
     gtk_widget_show( image );
     gtk_widget_show( window );
 #endif
-    GdkPixmap* pixmap;
-    gdk_pixbuf_render_pixmap_and_mask( pixbuf, &pixmap, &priv->mask, 1);
-    g_object_unref( pixmap );
+    gdk_pixbuf_render_pixmap_and_mask( pixbuf, NULL, &priv->mask, 1);
     gtk_widget_shape_combine_mask(priv->popup, priv->mask, 0, 0);
 
     priv->buttonWidth = w;

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c	2007-05-18 17:17:11 UTC (rev 2021)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c	2007-05-18 17:19:19 UTC (rev 2022)
@@ -261,7 +261,13 @@
     GtkWidget *loweralignment = gtk_alignment_new (0.5, 0.5, 0, 0);
     gtk_box_pack_start (GTK_BOX (priv->buttonvbox), loweralignment, TRUE, TRUE, 0);
 
-    priv->centerimage = gtk_image_new_from_stock (stock_name, GTK_ICON_SIZE_DND);
+    GdkPixbuf *pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
+                                                  stock_name,
+                                                  36,
+                                                  0, NULL);
+    priv->centerimage = gtk_image_new_from_pixbuf (pixbuf);
+    g_object_unref (pixbuf);
+
     gtk_container_add (GTK_CONTAINER (loweralignment), priv->centerimage);
 
     gtk_widget_show_all (GTK_WIDGET (priv->buttonvbox));