File libunique-1.1.6-gcc46.patch of Package mingw32-libunique

Overview Repositories Revisions Requests Users Attributes Meta

File libunique-1.1.6-gcc46.patch of Package mingw32-libunique (Revision fcf159d7014c3832a782abad70f5edf8)

Currently displaying revision fcf159d7014c3832a782abad70f5edf8 , Show latest

--- unique/dbus/uniquebackend-dbus.c	2011-04-01 23:11:45.000000000 +0200
+++ unique/dbus/uniquebackend-dbus.c	2011-04-01 23:12:00.000000000 +0200
@@ -84,7 +84,6 @@
 static gboolean
 unique_backend_dbus_request_name (UniqueBackend *backend)
 {
-  UniqueBackendDBus *backend_dbus;
   const gchar *name;
   DBusGConnection *connection;
   DBusGProxy *proxy;
@@ -97,8 +96,6 @@
   if (!connection)
     return FALSE;
 
-  backend_dbus = UNIQUE_BACKEND_DBUS (backend);
-
   retval = TRUE;
   name = unique_backend_get_name (backend);
   g_assert (name != NULL);
@@ -207,10 +204,14 @@
                                         cmd, data, time_,
                                         &resp,
                                         &error);
+  if (!res)
+    {
   if (error)
     {
       g_warning ("Error while sending message: %s", error->message);
       g_error_free (error);
+        }
+
       g_free (cmd);
       
       return UNIQUE_RESPONSE_INVALID;
--- unique/uniquebackend.c	2011-04-01 23:11:45.000000000 +0200
+++ unique/uniquebackend.c	2011-04-01 23:14:02.000000000 +0200
@@ -209,9 +209,9 @@
 guint
 unique_backend_get_workspace (UniqueBackend *backend)
 {
+#ifdef GDK_WINDOWING_X11
   GdkDisplay *display;
   GdkWindow *root_win;
-#ifdef GDK_WINDOWING_X11
   Atom _net_current_desktop, type;
   int format;
   unsigned long n_items, bytes_after;
@@ -223,10 +223,10 @@
   if (backend->workspace != -1)
     return backend->workspace;
 
+#ifdef GDK_WINDOWING_X11
   display = gdk_screen_get_display (backend->screen);
   root_win = gdk_screen_get_root_window (backend->screen);
 
-#ifdef GDK_WINDOWING_X11
   _net_current_desktop =
     gdk_x11_get_xatom_by_name_for_display (display, "_NET_CURRENT_DESKTOP");

Places

File libunique-1.1.6-gcc46.patch of Package mingw32-libunique (Revision fcf159d7014c3832a782abad70f5edf8)

Places