[gnome-games/gnome-2-26] Fix gtk settings initialisation
- From: Christian Persch <chpe src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-games/gnome-2-26] Fix gtk settings initialisation
- Date: Fri, 12 Jun 2009 10:23:29 -0400 (EDT)
commit c4b226db30623ee0e37d2c56c3557c3545336d54
Author: Christian Persch <chpe gnome org>
Date: Sat Jun 6 23:25:14 2009 +0200
Fix gtk settings initialisation
We need to ref some gtk classes before setting the gtk settings,
since these properties are only installed by the various gtk classes
at class initialisation. See gtk bug #585024.
I think this wasn't noticeable on maemo3 due to the special launcher
which already had initialised gtk before the fork.
aisleriot/sol.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/aisleriot/sol.c b/aisleriot/sol.c
index 38db1dd..cfc7bf5 100644
--- a/aisleriot/sol.c
+++ b/aisleriot/sol.c
@@ -622,14 +622,22 @@ main_prog (void *closure, int argc, char *argv[])
#ifdef HAVE_HILDON
hildon_program_add_window (data.program, HILDON_WINDOW (data.window));
+ /* This is necessary since the setting is only installed
+ * during class initialisation. See bug #585024.
+ */
+ /* For "gtk-menu-images" */
+ g_type_class_unref (g_type_class_ref (GTK_TYPE_IMAGE_MENU_ITEM));
+ /* For "gtk-button-images" */
+ g_type_class_unref (g_type_class_ref (GTK_TYPE_BUTTON));
+ /* For "gtk-toolbar-style" */
+ g_type_class_unref (g_type_class_ref (GTK_TYPE_TOOLBAR));
+
/* FIXMEchpe sort of strange that maemo doesn't all of this out-of-the-box... */
g_object_set (gtk_widget_get_settings (GTK_WIDGET (data.window)),
"gtk-alternative-button-order", TRUE,
"gtk-toolbar-style", GTK_TOOLBAR_ICONS,
"gtk-menu-images", FALSE,
-#ifdef HAVE_MAEMO_3
"gtk-button-images", FALSE,
-#endif /* HAVE_MAEMO_3 */
#if GTK_CHECK_VERSION (2, 10, 0)
"gtk-enable-mnemonics", FALSE,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]