[Xfce4-commits] r26292 - in xfdesktop: branches/xfce_4_4/src trunk/src

[Brian Tarricone]

Author: kelnos
Date: 2007-11-15 06:18:27 +0000 (Thu, 15 Nov 2007)
New Revision: 26292

Modified:
   xfdesktop/branches/xfce_4_4/src/xfdesktop-icon-view.c
   xfdesktop/trunk/src/xfdesktop-icon-view.c
Log:
revert useless fix for bug 3426


Modified: xfdesktop/branches/xfce_4_4/src/xfdesktop-icon-view.c
===================================================================
--- xfdesktop/branches/xfce_4_4/src/xfdesktop-icon-view.c	2007-11-14 19:13:50 UTC (rev 26291)
+++ xfdesktop/branches/xfce_4_4/src/xfdesktop-icon-view.c	2007-11-15 06:18:27 UTC (rev 26292)
@@ -410,32 +410,6 @@
 }
 
 static gboolean
-xfdesktop_icon_view_icon_selected_idled(gpointer data)
-{
-    XfdesktopIcon *icon = data;
-    
-    g_signal_emit(G_OBJECT(xfdesktop_icon_peek_icon_view(icon)),
-                  __signals[SIG_ICON_SELECTED], 0, NULL);
-    xfdesktop_icon_selected(icon);
-    g_object_unref(G_OBJECT(icon));
-    
-    return FALSE;
-}
-
-static gboolean
-xfdesktop_icon_view_icon_activated_idled(gpointer data)
-{
-    XfdesktopIcon *icon = data;
-    
-    g_signal_emit(G_OBJECT(xfdesktop_icon_peek_icon_view(icon)),
-                  __signals[SIG_ICON_ACTIVATED], 0, NULL);
-    xfdesktop_icon_activated(icon);
-    g_object_unref(G_OBJECT(icon));
-    
-    return FALSE;
-}
-
-static gboolean
 xfdesktop_icon_view_button_press(GtkWidget *widget,
                                  GdkEventButton *evt,
                                  gpointer user_data)
@@ -539,8 +513,10 @@
                                                                                      icon1);
                                     xfdesktop_icon_view_clear_icon_extents(icon_view,
                                                                            icon1);
-                                    g_idle_add(xfdesktop_icon_view_icon_selected_idled,
-                                               g_object_ref(G_OBJECT(icon1)));
+                                    g_signal_emit(G_OBJECT(icon_view),
+                                                  __signals[SIG_ICON_SELECTED],
+                                                  0, NULL);
+                                    xfdesktop_icon_selected(icon1);
                                 }
                             }
                         }
@@ -549,8 +525,11 @@
                     icon_view->priv->selected_icons = g_list_prepend(icon_view->priv->selected_icons,
                                                                      icon);
                     xfdesktop_icon_view_clear_icon_extents(icon_view, icon);
-                    g_idle_add(xfdesktop_icon_view_icon_selected_idled,
-                               g_object_ref(G_OBJECT(icon)));
+                    
+                    g_signal_emit(G_OBJECT(icon_view),
+                                  __signals[SIG_ICON_SELECTED],
+                                  0, NULL);
+                    xfdesktop_icon_selected(icon);
                 }
             }
             
@@ -590,8 +569,9 @@
                                                (GCompareFunc)xfdesktop_check_icon_clicked);
             if(icon_l && (icon = icon_l->data)) {
                 icon_view->priv->last_clicked_item = icon;
-                g_idle_add(xfdesktop_icon_view_icon_activated_idled,
-                           g_object_ref(G_OBJECT(icon)));
+                g_signal_emit(G_OBJECT(icon_view), __signals[SIG_ICON_ACTIVATED],
+                              0, NULL);
+                xfdesktop_icon_activated(icon);
             }
         }
         

Modified: xfdesktop/trunk/src/xfdesktop-icon-view.c
===================================================================
--- xfdesktop/trunk/src/xfdesktop-icon-view.c	2007-11-14 19:13:50 UTC (rev 26291)
+++ xfdesktop/trunk/src/xfdesktop-icon-view.c	2007-11-15 06:18:27 UTC (rev 26292)
@@ -410,32 +410,6 @@
 }
 
 static gboolean
-xfdesktop_icon_view_icon_selected_idled(gpointer data)
-{
-    XfdesktopIcon *icon = data;
-    
-    g_signal_emit(G_OBJECT(xfdesktop_icon_peek_icon_view(icon)),
-                  __signals[SIG_ICON_SELECTED], 0, NULL);
-    xfdesktop_icon_selected(icon);
-    g_object_unref(G_OBJECT(icon));
-    
-    return FALSE;
-}
-
-static gboolean
-xfdesktop_icon_view_icon_activated_idled(gpointer data)
-{
-    XfdesktopIcon *icon = data;
-    
-    g_signal_emit(G_OBJECT(xfdesktop_icon_peek_icon_view(icon)),
-                  __signals[SIG_ICON_ACTIVATED], 0, NULL);
-    xfdesktop_icon_activated(icon);
-    g_object_unref(G_OBJECT(icon));
-    
-    return FALSE;
-}
-
-static gboolean
 xfdesktop_icon_view_button_press(GtkWidget *widget,
                                  GdkEventButton *evt,
                                  gpointer user_data)
@@ -539,8 +513,10 @@
                                                                                      icon1);
                                     xfdesktop_icon_view_clear_icon_extents(icon_view,
                                                                            icon1);
-                                    g_idle_add(xfdesktop_icon_view_icon_selected_idled,
-                                               g_object_ref(G_OBJECT(icon1)));
+                                    g_signal_emit(G_OBJECT(icon_view),
+                                                  __signals[SIG_ICON_SELECTED],
+                                                  0, NULL);
+                                    xfdesktop_icon_selected(icon1);
                                 }
                             }
                         }
@@ -549,8 +525,11 @@
                     icon_view->priv->selected_icons = g_list_prepend(icon_view->priv->selected_icons,
                                                                      icon);
                     xfdesktop_icon_view_clear_icon_extents(icon_view, icon);
-                    g_idle_add(xfdesktop_icon_view_icon_selected_idled,
-                               g_object_ref(G_OBJECT(icon)));
+                    
+                    g_signal_emit(G_OBJECT(icon_view),
+                                  __signals[SIG_ICON_SELECTED],
+                                  0, NULL);
+                    xfdesktop_icon_selected(icon);
                 }
             }
             
@@ -591,8 +570,9 @@
                                                (GCompareFunc)xfdesktop_check_icon_clicked);
             if(icon_l && (icon = icon_l->data)) {
                 icon_view->priv->last_clicked_item = icon;
-                g_idle_add(xfdesktop_icon_view_icon_activated_idled,
-                           g_object_ref(G_OBJECT(icon)));
+                g_signal_emit(G_OBJECT(icon_view), __signals[SIG_ICON_ACTIVATED],
+                              0, NULL);
+                xfdesktop_icon_activated(icon);
             }
         }