ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 65
committer: Didier Roche <didier.roche@xxxxxxxxxxxxx>
branch nick: evolution-indicator
timestamp: Thu 2010-10-07 12:09:35 +0200
message:
  build with gtk deprecation flags (LP: #655937)
modified:
  src/evolution-indicator.c
  src/xutils.c


--
lp:evolution-indicator
https://code.launchpad.net/~indicator-applet-developers/evolution-indicator/trunk

Your team ayatana-commits is subscribed to branch lp:evolution-indicator.
To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/evolution-indicator/trunk/+edit-subscription

=== modified file 'src/evolution-indicator.c'
--- src/evolution-indicator.c	2010-03-30 22:47:10 +0000
+++ src/evolution-indicator.c	2010-10-07 10:09:35 +0000
@@ -862,7 +862,7 @@
   frame = data->parent;
   while (!GTK_IS_FRAME (frame))
   {
-    frame = frame->parent;
+    frame = gtk_widget_get_parent (frame);
 
     if (GTK_IS_WINDOW (frame) || !GTK_IS_WIDGET (frame))
       break;
@@ -875,9 +875,9 @@
     gchar *str1;
     gchar *str2;
 
-    frame = (GtkWidget*)data->parent->parent->parent;
+    frame = gtk_widget_get_parent (gtk_widget_get_parent (gtk_widget_get_parent ((GtkWidget*)data)));
 
-    gtk_box_reorder_child (GTK_BOX (frame->parent), frame, 0);
+    gtk_box_reorder_child (GTK_BOX (gtk_widget_get_parent (frame)), frame, 0);
 
     box = gtk_hbox_new (FALSE, 0);
     gtk_frame_set_label_widget (GTK_FRAME (frame), box);

=== modified file 'src/xutils.c'
--- src/xutils.c	2009-04-03 21:48:09 +0000
+++ src/xutils.c	2010-10-07 10:09:35 +0000
@@ -37,7 +37,7 @@
  
   gdk_error_trap_push ();
   type = None;
-  result = XGetWindowProperty (gdk_display,
+  result = XGetWindowProperty ((Display *)gdk_display_get_default (),
                                xwindow,
                                atom,
                                0, G_MAXLONG,
@@ -91,7 +91,7 @@
   ch.res_name = NULL;
   ch.res_class = NULL;
 
-  XGetClassHint (gdk_display, xwindow,
+  XGetClassHint ((Display *)gdk_display_get_default (), xwindow,
                  &ch);
 
   gdk_error_trap_pop ();