Apply patch on GTK3 migration
authorJulien Lavergne <julien.lavergne@gmail.com>
Mon, 20 Dec 2010 18:19:54 +0000 (19:19 +0100)
committerJulien Lavergne <julien.lavergne@gmail.com>
Mon, 20 Dec 2010 18:19:54 +0000 (19:19 +0100)
src/lxappearance.c
src/utils.c

index 8d638d7..a2f6989 100644 (file)
@@ -48,16 +48,16 @@ static const char* lxsession_name = NULL;
 
 static void check_lxsession()
 {
-    lxsession_atom = XInternAtom( GDK_DISPLAY(), "_LXSESSION", True );
+    lxsession_atom = XInternAtom( GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), "_LXSESSION", True );
     if( lxsession_atom != None )
     {
-        XGrabServer( GDK_DISPLAY() );
-        if( XGetSelectionOwner( GDK_DISPLAY(), lxsession_atom ) )
+        XGrabServer( GDK_DISPLAY_XDISPLAY(gdk_display_get_default()) );
+        if( XGetSelectionOwner( GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), lxsession_atom ) )
         {
             app.use_lxsession = TRUE;
             lxsession_name = g_getenv("DESKTOP_SESSION");
         }
-        XUngrabServer( GDK_DISPLAY() );
+        XUngrabServer( GDK_DISPLAY_XDISPLAY(gdk_display_get_default()) );
     }
 }
 
index f3dddfc..7f9f11e 100644 (file)
@@ -73,7 +73,7 @@ gboolean show_progress_for_pid(GtkWindow* parent, const char* title, const char*
     gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 0);
     gtk_widget_show(progress);
     gtk_box_pack_start(GTK_BOX(vbox), progress, FALSE, TRUE, 0);
-    gtk_progress_set_activity_mode(GTK_PROGRESS(progress), TRUE);
+    gtk_progress_bar_pulse(GTK_PROGRESS_BAR(progress));
     g_signal_connect(dlg, "response", G_CALLBACK(on_progress_dlg_response), &pid);
 
     res = gtk_dialog_run(GTK_DIALOG(dlg));