2010-07-09 [iwkse] 3.7.6cvs14

	* src/mainwindow.c
			Bug #2224
			Always use stock icons on buttons

diff --git a/ChangeLog b/ChangeLog
index b3e90ddd4811337638afec3cef9cf9642e2a27c3..9460903aa6573e243b902f701c314ca6a5c12b0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-09 [iwkse]     3.7.6cvs14
+
+       * src/mainwindow.c
+                       Bug #2224
+                       Always use stock icons on buttons
+
 2010-07-08 [colin]     3.7.6cvs13
 
        * src/gtk/filesel.c

diff --git a/PATCHSETS b/PATCHSETS
index 26b572be9b2c77a5a5761419813b031a6388d4c0..a911266f08149cbf2d65201367a05925c602c2fc 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4009,3 +4009,4 @@
 ( cvs diff -u -r 1.2.2.28 -r 1.2.2.29 src/gtk/colorlabel.c;  ) > 3.7.6cvs11.patchset
 ( cvs diff -u -r 1.382.2.552 -r 1.382.2.553 src/compose.c;  ) > 3.7.6cvs12.patchset
 ( cvs diff -u -r 1.2.2.40 -r 1.2.2.41 src/gtk/filesel.c;  ) > 3.7.6cvs13.patchset
+( cvs diff -u -r 1.274.2.310 -r 1.274.2.311 src/mainwindow.c;  ) > 3.7.6cvs14.patchset

diff --git a/configure.ac b/configure.ac
index 415a101f21f9a4b07be7e38470c8ab3d8a56eeb0..fc0334ceca8685736fdacfdff3eabbb5bfc9400b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=13
+EXTRA_VERSION=14
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 4ba6727e48b489d51d4f434dd3da9ec12cda3725..89b8a375d29c035d83d3538edb99df91fe31e929 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1540,6 +1540,8 @@ MainWindow *main_window_create()
        debug_print("Creating main window...\n");
        mainwin = g_new0(MainWindow, 1);
 
+       g_object_set(gtk_settings_get_default(), "gtk-button-images", TRUE, NULL);
+
        /* main window */
        window = GTK_WIDGET(gtkut_window_new(GTK_WINDOW_TOPLEVEL, "mainwindow"));
        gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION);