[uim] r6780 committed - * helper/toolbar-standalone-gtk.c...

[codesite-noreply]

Revision: 6780
Author: ek.kato
Date: Sun Sep 12 20:28:15 2010
Log: * helper/toolbar-standalone-gtk.c
  - Add check for gtk version for gtk_widget_get_mapped.
* helper/eggtrayicon.c
  - Add check for gtk version for gtk_widget_get_realized.
http://code.google.com/p/uim/source/detail?r=6780

Modified:
 /trunk/helper/eggtrayicon.c
 /trunk/helper/toolbar-standalone-gtk.c

=======================================
--- /trunk/helper/eggtrayicon.c Sat Sep 11 17:42:48 2010
+++ /trunk/helper/eggtrayicon.c Sun Sep 12 20:28:15 2010
@@ -507,7 +507,11 @@
       egg_tray_icon_get_orientation_property (icon);
       egg_tray_icon_get_visual_property (icon);

+#if GTK_CHECK_VERSION(2, 20, 0)
       if (gtk_widget_get_realized (GTK_WIDGET (icon)))
+#else
+      if (GTK_WIDGET_REALIZED (GTK_WIDGET (icon)))
+#endif
         {
           if ((icon->manager_visual == NULL &&
                gtk_widget_get_visual (widget) ==  
gdk_screen_get_system_visual (screen)) ||
=======================================
--- /trunk/helper/toolbar-standalone-gtk.c      Sat Sep 11 17:42:28 2010
+++ /trunk/helper/toolbar-standalone-gtk.c      Sun Sep 12 20:28:15 2010
@@ -189,7 +189,11 @@
 {
   gint x, y;

+#if GTK_CHECK_VERSION(2, 20, 0)
   if (gtk_widget_get_mapped(widget)) {
+#else
+  if (GTK_WIDGET_MAPPED(widget)) {
+#endif
     gtk_window_get_position(GTK_WINDOW(widget), &x, &y);
     helper_win_set_position(widget, x, y);
   }
@@ -198,7 +202,12 @@
 static void
 size_request_cb(GtkWidget *widget, GtkRequisition *req, gpointer data)
 {
+
+#if GTK_CHECK_VERSION(2, 20, 0)
   if (gtk_widget_get_mapped(widget)) {
+#else
+  if (GTK_WIDGET_MAPPED(widget)) {
+#endif
     gint width, height;
     gtk_window_get_size(GTK_WINDOW(widget), &width, &height);