[Goodies-commits] r4767 - ristretto/trunk/src

Stephan Arts stephan at xfce.org
Sat May 10 12:40:06 CEST 2008


Author: stephan
Date: 2008-05-10 10:40:06 +0000 (Sat, 10 May 2008)
New Revision: 4767

Modified:
   ristretto/trunk/src/main_window.c
   ristretto/trunk/src/thumbnail_bar.c
Log:
Fix bug with xfdesktop-detection
Scroll-wheel doesn't change image anymore.


Modified: ristretto/trunk/src/main_window.c
===================================================================
--- ristretto/trunk/src/main_window.c	2008-05-10 08:33:02 UTC (rev 4766)
+++ ristretto/trunk/src/main_window.c	2008-05-10 10:40:06 UTC (rev 4767)
@@ -436,7 +436,7 @@
 
         Window root_window = GDK_ROOT_WINDOW();
         Atom xfce_desktop_atom = XInternAtom (gdk_display, "XFCE_DESKTOP_WINDOW", False);
-        Atom xfce_selection_atom = XInternAtom (gdk_display, selection_name, True);
+        Atom xfce_selection_atom = XInternAtom (gdk_display, selection_name, False);
         XGetWindowProperty (gdk_display, 
                             root_window,
                             xfce_desktop_atom,
@@ -453,7 +453,7 @@
         {
             /* TODO: check XID */
             /* Window xid = (Window) prop[1]; */
-            if(XGetSelectionOwner(gdk_display, xfce_selection_atom) == prop[1])
+            if(XGetSelectionOwner(gdk_display, xfce_selection_atom) == prop[1] != 0)
                 window->priv->settings.desktop = RSTTO_DESKTOP_XFCE;
             else
             {

Modified: ristretto/trunk/src/thumbnail_bar.c
===================================================================
--- ristretto/trunk/src/thumbnail_bar.c	2008-05-10 08:33:02 UTC (rev 4766)
+++ ristretto/trunk/src/thumbnail_bar.c	2008-05-10 10:40:06 UTC (rev 4767)
@@ -823,13 +823,16 @@
     {
         case GDK_SCROLL_UP:
         case GDK_SCROLL_LEFT:
-            rstto_navigator_jump_back(bar->priv->navigator);
+            bar->priv->auto_center = FALSE;
+            bar->priv->offset -= 30;
             break;
         case GDK_SCROLL_DOWN:
         case GDK_SCROLL_RIGHT:
-            rstto_navigator_jump_forward(bar->priv->navigator);
+            bar->priv->auto_center = FALSE;
+            bar->priv->offset += 30;
             break;
     }
+    gtk_widget_queue_resize(GTK_WIDGET(bar));
     return FALSE;
 
 }




More information about the Goodies-commits mailing list