Merge lp:~mhr3/ido/bug-865122 into lp:ido/0.3

[Michal Hruby]

This installs an empty object method handler for the grab-notify signal on IdoRange, without this, GtkRange will call remove_grab which results in an infinite loop of grab_notifies.

The widget will still work properly, because grab-broken-event will get properly fired and internal state of GtkRange will be properly updated.

[Robert Carr (robertcarr)]

+1 for now? I want to investigate this all again later.

review: Approve

[Sebastien Bacher (seb128)]

That code should probably be used only when building with gtk3, the source is used in Oneiric to build both the gtk2 and gtk3 versions of ido (different configure option)

review: Needs Fixing

[lp:~mhr3/ido/bug-865122]

96. By Michal Hruby on 2011-10-03

Use the grab-notify workaround only when using Gtk3

[Andrea Cimitan (cimi)]

As seb said, we need the check for the gtk3 version plus (I'd recommend) put a FIXME in the code to remember why we are adding this workaround

[lp:~mhr3/ido/bug-865122]

97. By Michal Hruby on 2011-10-03

And we need to include config.h

98. By Michal Hruby on 2011-10-03

Get rid of unnecessary check

Unmerged revisions

=== modified file 'src/idorange.c'
--- src/idorange.c	2011-06-01 19:53:29 +0000
+++ src/idorange.c	2011-10-03 13:04:23 +0000
@@ -40,6 +40,10 @@
                                       guint             prop_id,
                                       GValue           *value,
                                       GParamSpec       *pspec);
+#ifdef USE_GTK3
+static void ido_range_grab_notify    (GtkWidget        *widget,
+                                      gboolean          was_grabbed);
+#endif
 
 #define IDO_RANGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IDO_TYPE_RANGE, IdoRangePrivate))
 
@@ -60,6 +64,10 @@
   gobject_class->set_property = ido_range_set_property;
   gobject_class->get_property = ido_range_get_property;
 
+#ifdef USE_GTK3
+  widget_class->grab_notify = ido_range_grab_notify;
+#endif
+
   g_object_class_install_property (gobject_class,
                                    PROP_STYLE,
                                    g_param_spec_enum ("range-style",
@@ -130,6 +138,22 @@
     }
 }
 
+#ifdef USE_GTK3
+static void
+ido_range_grab_notify (GtkWidget *widget, gboolean was_grabbed)
+{
+  /*
+   * FIXME: workaround for lp bug #865122.
+   * Without this handler, GtkRange will call remove_grab which results
+   * in an infinite loop of grab_notifies.
+   *
+   * The widget will still work properly, because grab-broken-event will get
+   * properly fired and internal state of GtkRange will be properly updated.
+   */
+  g_return_if_fail (IDO_IS_RANGE (widget));
+}
+#endif
+
 static void
 ido_range_constructed (GObject *object)
 {