[uim] r6500 committed - * helper/eggtrayicon.c : Support glib-2 <= 2.13.0.

[codesite-noreply]

Revision: 6500
Author: ek.kato
Date: Wed Jul 14 18:04:32 2010
Log: * helper/eggtrayicon.c : Support glib-2 <= 2.13.0.
http://code.google.com/p/uim/source/detail?r=6500

Modified:
 /trunk/helper/eggtrayicon.c

=======================================
--- /trunk/helper/eggtrayicon.c Wed Jul 14 08:56:43 2010
+++ /trunk/helper/eggtrayicon.c Wed Jul 14 18:04:32 2010
@@ -57,7 +57,9 @@
 static void egg_tray_icon_init (EggTrayIcon *icon);
 static void egg_tray_icon_class_init (EggTrayIconClass *klass);

+#if GLIB_CHECK_VERSION(2, 13, 1)
 static void egg_tray_icon_constructed  (GObject    *object);
+#endif
 static void egg_tray_icon_dispose      (GObject    *object);

 static void egg_tray_icon_get_property (GObject    *object,
@@ -125,7 +127,9 @@
   parent_class = g_type_class_peek_parent (klass);

   gobject_class->get_property = egg_tray_icon_get_property;
+#if GLIB_CHECK_VERSION(2, 13, 1)
   gobject_class->constructed = egg_tray_icon_constructed;
+#endif
   gobject_class->dispose = egg_tray_icon_dispose;

   widget_class->realize = egg_tray_icon_realize;
@@ -145,7 +149,11 @@
 }

 static void
+#if GLIB_CHECK_VERSION(2, 13, 1)
 egg_tray_icon_constructed (GObject *object)
+#else
+egg_tray_icon_realize_internal (GtkWidget *object)
+#endif
 {
   /* Do setup that depends on the screen; screen has been set at this  
point */

@@ -578,6 +586,10 @@
 {
   EggTrayIcon *icon = EGG_TRAY_ICON (widget);

+#if !GLIB_CHECK_VERSION(2, 13, 1)
+  egg_tray_icon_realize_internal (widget);
+#endif
+
   egg_tray_icon_set_colormap (icon);

   GTK_WIDGET_CLASS (parent_class)->realize (widget);