Merge lp:~larsu/ido/remove-slider-hack-953757 into lp:ido/12.10

[Lars Karlitski]

It's an old branch that still works, albeit with a minor merge conflict. I'll merge it manually when someone approves this.

[Charles Kerr (charlesk)]

Looks good. Nice catch on ->constructed

review: Approve

[jenkins (martin-mrazik+qa)]

FAILED: Autolanding.
No commit message was specified.
http://jenkins.qa.ubuntu.com/job/ido-autolanding/7/

review: Needs Fixing (continuous-integration)

=== modified file 'src/idorange.c'
--- src/idorange.c	2012-05-08 00:18:10 +0000
+++ src/idorange.c	2012-08-27 19:56:23 +0000
@@ -156,6 +156,8 @@
     }
 
   gtk_range_set_slider_size_fixed (GTK_RANGE (range), TRUE);
+
+  G_OBJECT_CLASS (ido_range_parent_class)->constructed (object);
 }
 
 static void

=== modified file 'src/idoscalemenuitem.c'
--- src/idoscalemenuitem.c	2012-05-08 00:18:10 +0000
+++ src/idoscalemenuitem.c	2012-08-27 19:56:23 +0000
@@ -205,21 +205,6 @@
   priv->toggle_size = toggle_size;
 }
 
-static gboolean
-on_scale_button_press_or_release_event (GtkWidget      * widget G_GNUC_UNUSED, 
-                                        GdkEventButton * event,
-                                        gpointer         unused G_GNUC_UNUSED)
-{
-  /* HACK: we want the behaviour you get with the middle button, so we
-   * mangle the event. clicking with other buttons moves the slider in
-   * step increments, clicking with the middle button moves the slider to
-   * the location of the click. */
-  if (event->button == 1)
-    event->button = 2;
-
-  return FALSE;
-}
-
 static void
 ido_scale_menu_item_constructed (GObject *object)
 {
@@ -238,12 +223,12 @@
   priv->scale = ido_range_new (adj, range_style);
   g_object_ref (priv->scale);
   gtk_scale_set_draw_value (GTK_SCALE (priv->scale), FALSE);
-  g_signal_connect (G_OBJECT (priv->scale), "button-press-event",
-                    G_CALLBACK (on_scale_button_press_or_release_event), NULL);
-  g_signal_connect (G_OBJECT (priv->scale), "button-release-event",
-                    G_CALLBACK (on_scale_button_press_or_release_event), NULL);
 
+<<<<<<< TREE
   
+=======
+#ifdef USE_GTK3
+>>>>>>> MERGE-SOURCE
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
   priv->primary_image = gtk_image_new ();