[Goodies-commits] r6900 - in xfmpc/trunk: . src

[Mike Massonnet]

Author: mmassonnet
Date: 2009-03-14 12:16:11 +0000 (Sat, 14 Mar 2009)
New Revision: 6900

Modified:
   xfmpc/trunk/ChangeLog
   xfmpc/trunk/src/interface.c
   xfmpc/trunk/src/interface.h
Log:
Move progress bar callback out of header inside C source

Modified: xfmpc/trunk/ChangeLog
===================================================================
--- xfmpc/trunk/ChangeLog	2009-03-14 12:02:52 UTC (rev 6899)
+++ xfmpc/trunk/ChangeLog	2009-03-14 12:16:11 UTC (rev 6900)
@@ -1,5 +1,15 @@
 2009-03-14	Mike Massonnet <mmassonnet at xfce.org>
 
+Move progress bar callback out of header inside C source
+	* src/interface.c, src/interface.h:
+	  - Remove xfmpc_interface_progress_box_press_event and place it
+	  inside the C source only under cb_progress_box_release_event
+	  - Set it a release event instead of press, it behaves better on
+	  mouse releases so you can also cancel it by moving the pointer
+	  outside the widget
+
+2009-03-14	Mike Massonnet <mmassonnet at xfce.org>
+
 Better fix for previous commit
 	* src/mpdclient.c(xfmpc_interface_init):
 	  - Better fix than the previous commit

Modified: xfmpc/trunk/src/interface.c
===================================================================
--- xfmpc/trunk/src/interface.c	2009-03-14 12:02:52 UTC (rev 6899)
+++ xfmpc/trunk/src/interface.c	2009-03-14 12:16:11 UTC (rev 6900)
@@ -48,6 +48,8 @@
 
 static void             cb_pp_changed                           (XfmpcInterface *interface,
                                                                  gboolean is_playing);
+static gboolean         cb_progress_box_release_event           (XfmpcInterface *interface,
+                                                                 GdkEventButton *event);
 static void             cb_time_changed                         (XfmpcInterface *interface,
                                                                  gint time,
                                                                  gint total_time);
@@ -195,8 +197,8 @@
                             G_CALLBACK (xfmpc_mpdclient_next), interface->mpdclient);
   g_signal_connect_swapped (priv->button_volume, "value-changed",
                             G_CALLBACK (xfmpc_interface_volume_changed), interface);
-  g_signal_connect_swapped (progress_box, "button-press-event",
-                            G_CALLBACK (xfmpc_interface_progress_box_press_event), interface);
+  g_signal_connect_swapped (progress_box, "button-release-event",
+                            G_CALLBACK (cb_progress_box_release_event), interface);
 
   g_signal_connect_swapped (interface->mpdclient, "connected",
                             G_CALLBACK (xfmpc_interface_reconnect), interface);
@@ -279,13 +281,13 @@
     gtk_image_set_from_stock (GTK_IMAGE (image), GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_BUTTON);
 }
 
-gboolean
-xfmpc_interface_progress_box_press_event (XfmpcInterface *interface,
-                                          GdkEventButton *event)
+static gboolean
+cb_progress_box_release_event (XfmpcInterface *interface,
+                               GdkEventButton *event)
 {
   XfmpcInterfacePrivate *priv = XFMPC_INTERFACE (interface)->priv;
 
-  if (G_UNLIKELY (event->type != GDK_BUTTON_PRESS || event->button != 1))
+  if (G_UNLIKELY (event->type != GDK_BUTTON_RELEASE || event->button != 1))
     return FALSE;
 
   gint time_total = xfmpc_mpdclient_get_total_time (interface->mpdclient);

Modified: xfmpc/trunk/src/interface.h
===================================================================
--- xfmpc/trunk/src/interface.h	2009-03-14 12:02:52 UTC (rev 6899)
+++ xfmpc/trunk/src/interface.h	2009-03-14 12:16:11 UTC (rev 6900)
@@ -76,8 +76,6 @@
 
 void                    xfmpc_interface_set_pp                  (XfmpcInterface *interface,
                                                                  gboolean play);
-gboolean                xfmpc_interface_progress_box_press_event (XfmpcInterface *interface,
-                                                                 GdkEventButton *event);
 void                    xfmpc_interface_volume_changed          (XfmpcInterface *interface,
                                                                  gdouble value);
 void                    xfmpc_interface_set_volume              (XfmpcInterface *interface,