[Xfce4-commits] <thunar:master> Signal id's are gulong.

[Nick Schermer]

Updating branch refs/heads/master
         to b73ec63839ecc39bd66afa3b9da7f74bbd8547ab (commit)
       from ed1bff3ed32b9e02657cb8612c0cbe79e026624b (commit)

commit b73ec63839ecc39bd66afa3b9da7f74bbd8547ab
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Nov 4 10:10:53 2012 +0100

    Signal id's are gulong.
    
    Use the correct type for signal ids to avoid
    integer overflow crashes.

 thunar/thunar-abstract-icon-view.c |   14 +++++++-------
 thunar/thunar-gtk-extensions.c     |    2 +-
 thunar/thunar-shortcuts-view.c     |   10 ++++++----
 thunar/thunar-tree-view.c          |    2 +-
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/thunar/thunar-abstract-icon-view.c b/thunar/thunar-abstract-icon-view.c
index dbd3d7c..b45bfc0 100644
--- a/thunar/thunar-abstract-icon-view.c
+++ b/thunar/thunar-abstract-icon-view.c
@@ -101,13 +101,13 @@ struct _ThunarAbstractIconViewPrivate
   gint ui_merge_id;
 
   /* mouse gesture support */
-  gint gesture_start_x;
-  gint gesture_start_y;
-  gint gesture_current_x;
-  gint gesture_current_y;
-  gint gesture_expose_id;
-  gint gesture_motion_id;
-  gint gesture_release_id;
+  gint   gesture_start_x;
+  gint   gesture_start_y;
+  gint   gesture_current_x;
+  gint   gesture_current_y;
+  gulong gesture_expose_id;
+  gulong gesture_motion_id;
+  gulong gesture_release_id;
 };
 
 
diff --git a/thunar/thunar-gtk-extensions.c b/thunar/thunar-gtk-extensions.c
index 6b2a2c4..0b4232c 100644
--- a/thunar/thunar-gtk-extensions.c
+++ b/thunar/thunar-gtk-extensions.c
@@ -149,7 +149,7 @@ thunar_gtk_menu_run (GtkMenu            *menu,
                      guint32             activate_time)
 {
   GMainLoop *loop;
-  guint      signal_id;
+  gulong     signal_id;
 
   _thunar_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
   _thunar_return_if_fail (GTK_IS_MENU (menu));
diff --git a/thunar/thunar-shortcuts-view.c b/thunar/thunar-shortcuts-view.c
index 07463c6..dcd1844 100644
--- a/thunar/thunar-shortcuts-view.c
+++ b/thunar/thunar-shortcuts-view.c
@@ -159,8 +159,10 @@ struct _ThunarShortcutsViewClass
 struct _ThunarShortcutsView
 {
   GtkTreeView        __parent__;
-  ThunarPreferences *preferences;
-  GtkCellRenderer   *icon_renderer;
+
+
+  ThunarPreferences      *preferences;
+  GtkCellRenderer        *icon_renderer;
 
   ThunarxProviderFactory *provider_factory;
 
@@ -168,7 +170,7 @@ struct _ThunarShortcutsView
    * button-press-event handler if the associated
    * button-release-event should activate.
    */
-  gint pressed_button;
+  gint  pressed_button;
   guint pressed_eject_button : 1;
 
   /* drop site support */
@@ -179,7 +181,7 @@ struct _ThunarShortcutsView
   /* id of the signal used to queue a resize on the
    * column whenever the shortcuts icon size is changed.
    */
-  gint queue_resize_signal_id;
+  gulong queue_resize_signal_id;
 };
 
 
diff --git a/thunar/thunar-tree-view.c b/thunar/thunar-tree-view.c
index 221aa0c..72428d5 100644
--- a/thunar/thunar-tree-view.c
+++ b/thunar/thunar-tree-view.c
@@ -238,7 +238,7 @@ struct _ThunarTreeView
   /* id of the signal used to queue a resize on the
    * column whenever the shortcuts icon size is changed.
    */
-  gint                    queue_resize_signal_id;
+  gulong                  queue_resize_signal_id;
 
   /* set cursor to current directory idle source */
   gint                    cursor_idle_id;