[Gnucash-changes] r11930 - gnucash/branches/goffice-update/lib - Rewrite goffice/gtk code to use gtk-2.4-available feature.

[Joshua Sled]

Author: jsled
Date: 2005-11-14 12:30:49 -0500 (Mon, 14 Nov 2005)
New Revision: 11930
Trac: http://svn.gnucash.org/trac/changeset/11930

Modified:
   gnucash/branches/goffice-update/lib/goffice-0.0.4/Makefile.am
   gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/gtk/goffice-gtk.c
   gnucash/branches/goffice-update/lib/libgsf-1.12.3/Makefile.am
Log:
Rewrite goffice/gtk code to use gtk-2.4-available feature.
Remove po dirs from makefiles for the moment.


Modified: gnucash/branches/goffice-update/lib/goffice-0.0.4/Makefile.am
===================================================================
--- gnucash/branches/goffice-update/lib/goffice-0.0.4/Makefile.am	2005-11-14 05:14:21 UTC (rev 11929)
+++ gnucash/branches/goffice-update/lib/goffice-0.0.4/Makefile.am	2005-11-14 17:30:49 UTC (rev 11930)
@@ -1,6 +1,7 @@
 # Makefile.am for goffice
 
-SUBDIRS = goffice tests pixmaps plugins po
+SUBDIRS = goffice tests pixmaps plugins
+# po
 
 EXTRA_DIST = README NEWS BUGS MAINTAINERS AUTHORS \
 	goffice.mk \

Modified: gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/gtk/goffice-gtk.c
===================================================================
--- gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/gtk/goffice-gtk.c	2005-11-14 05:14:21 UTC (rev 11929)
+++ gnucash/branches/goffice-update/lib/goffice-0.0.4/goffice/gtk/goffice-gtk.c	2005-11-14 17:30:49 UTC (rev 11930)
@@ -124,11 +124,10 @@
 GtkWidget*
 go_gtk_button_new_with_stock (char const *text, char const* stock_id)
 {
-	GtkStockItem item;
-	GtkWidget *button = gtk_button_new_with_mnemonic (text);
-	if (gtk_stock_lookup (stock_id, &item))
-		gtk_button_set_image (GTK_BUTTON (button),
-			gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON));
+	GtkWidget *button = gtk_button_new_from_stock(stock_id);
+	gtk_button_set_use_underline(GTK_BUTTON(button), TRUE);
+	gtk_button_set_use_stock(GTK_BUTTON(button), FALSE);
+	gtk_button_set_label(GTK_BUTTON(button), text);
 	return button;
 }
 

Modified: gnucash/branches/goffice-update/lib/libgsf-1.12.3/Makefile.am
===================================================================
--- gnucash/branches/goffice-update/lib/libgsf-1.12.3/Makefile.am	2005-11-14 05:14:21 UTC (rev 11929)
+++ gnucash/branches/goffice-update/lib/libgsf-1.12.3/Makefile.am	2005-11-14 17:30:49 UTC (rev 11930)
@@ -8,7 +8,8 @@
   pkgconfig_DATA += libgsf-win32-1.pc
 endif
 
-SUBDIRS = po gsf gsf-gnome gsf-win32 doc tests
+SUBDIRS = gsf gsf-gnome gsf-win32 doc tests
+# po 
 
 if WITH_PYTHON
   SUBDIRS += python