diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-10-28 20:28:54 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-10-28 20:30:27 +0800 |
| commit | 10de0a21f8abf9ad1719039addf347e03a6324dd (patch) | |
| tree | 9f31784ba98a707f7fa225bc3a6f9547a550ce44 /libempathy-gtk | |
| parent | 512026609a385f2715350d275f987ca61dbc2ad8 (diff) | |
| download | gsoc2013-empathy-10de0a21f8abf9ad1719039addf347e03a6324dd.tar gsoc2013-empathy-10de0a21f8abf9ad1719039addf347e03a6324dd.tar.gz gsoc2013-empathy-10de0a21f8abf9ad1719039addf347e03a6324dd.tar.bz2 gsoc2013-empathy-10de0a21f8abf9ad1719039addf347e03a6324dd.tar.lz gsoc2013-empathy-10de0a21f8abf9ad1719039addf347e03a6324dd.tar.xz gsoc2013-empathy-10de0a21f8abf9ad1719039addf347e03a6324dd.tar.zst gsoc2013-empathy-10de0a21f8abf9ad1719039addf347e03a6324dd.zip | |
rename timeout_id to auto_scroll_timeout_id
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-individual-view.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index 2f4c0d376..5f604058a 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -83,7 +83,7 @@ typedef struct GHashTable *expand_groups; /* Auto scroll */ - guint timeout_id; + guint auto_scroll_timeout_id; /* Distance between mouse pointer and the nearby border. Negative when scrolling updards.*/ gint distance; @@ -606,10 +606,10 @@ individual_view_drag_motion (GtkWidget *widget, model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); - if (priv->timeout_id != 0) + if (priv->auto_scroll_timeout_id != 0) { - g_source_remove (priv->timeout_id); - priv->timeout_id = 0; + g_source_remove (priv->auto_scroll_timeout_id); + priv->auto_scroll_timeout_id = 0; } gtk_widget_get_allocation (widget, &allocation); @@ -622,7 +622,7 @@ individual_view_drag_motion (GtkWidget *widget, else priv->distance = MAX (allocation.height - y, 1); - priv->timeout_id = g_timeout_add (10 * ABS (priv->distance), + priv->auto_scroll_timeout_id = g_timeout_add (10 * ABS (priv->distance), (GSourceFunc) individual_view_auto_scroll_cb, widget); } |