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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-04-02 17:03:19 +0300 (Mon, 02 Apr 2007)
New Revision: 10905

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-thumb-menu-item.c
Log:
2007-04-02  Lucas Rocha  <lucas.rocha at nokia.com>

	* libhildondesktop/hildon-thumb-menu-item.c: make the needed checks to
	avoid hard dependency on Maemo GTK+.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-04-02 14:02:48 UTC (rev 10904)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-04-02 14:03:19 UTC (rev 10905)
@@ -1,3 +1,8 @@
+2007-04-02  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* libhildondesktop/hildon-thumb-menu-item.c: make the needed checks to
+	avoid hard dependency on Maemo GTK+.
+
 2007-04-02  Johan Bilien  <johan.bilien at nokia.com>
 
 	* configure.ac: 0.0.3

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-thumb-menu-item.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-thumb-menu-item.c	2007-04-02 14:02:48 UTC (rev 10904)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-thumb-menu-item.c	2007-04-02 14:03:19 UTC (rev 10905)
@@ -23,6 +23,7 @@
 
 #include <config.h>
 #include <string.h>
+#include <gtk/gtk.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkimagemenuitem.h>
 #include <gtk/gtkaccellabel.h>
@@ -737,10 +738,17 @@
     gtk_widget_ensure_style (GTK_WIDGET (thumb_menu_item));
 
     /* Fetch the colours to be used */
+#if GTK_CHECK_VERSION(2, 10, 0)
+    color1_found = gtk_style_lookup_color(GTK_WIDGET(
+                thumb_menu_item)->style, "DefaultTextColor", &color1);
+    color2_found = gtk_style_lookup_color(GTK_WIDGET(
+                thumb_menu_item)->style, "SecondaryTextColor", &color2);
+#else
     color1_found = gtk_style_lookup_logical_color(GTK_WIDGET(
                 thumb_menu_item)->style, "DefaultTextColor", &color1);
     color2_found = gtk_style_lookup_logical_color(GTK_WIDGET(
                 thumb_menu_item)->style, "SecondaryTextColor", &color2);
+#endif
 
     attrs = pango_attr_list_new();