Updating branch refs/heads/bluesabre/gtk3
to bd77a00f98c72b9506a471e22dcda5b7ab70a1b1 (commit)
from 9183a35bf0a349c3f68aef3da3cbfa4572db4395 (commit)
commit bd77a00f98c72b9506a471e22dcda5b7ab70a1b1
Author: Sean Davis <smd.seanda...@gmail.com>
Date: Sun Sep 15 23:05:48 2013 -0400
Move motion-notify-event to glade
data/interfaces/parole.ui | 1 +
src/parole-player.c | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index b2199be..ee9cc58 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -719,6 +719,7 @@
<property name="can_focus">False</property>
<signal name="button-press-event"
handler="parole_player_gst_widget_button_press" swapped="no"/>
<signal name="button-release-event"
handler="parole_player_gst_widget_button_release" swapped="no"/>
+ <signal name="motion-notify-event"
handler="parole_player_gst_widget_motion_notify_event" swapped="no"/>
<child>
<object class="GtkBox" id="box4">
<property name="visible">True</property>
diff --git a/src/parole-player.c b/src/parole-player.c
index fba09b6..befbde6 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -253,6 +253,11 @@ gboolean parole_player_gst_widget_button_press
(GtkWidget *widget,
gboolean parole_player_gst_widget_button_release (GtkWidget *widget,
GdkEventButton *ev,
ParolePlayer *player);
+
+gboolean
+parole_player_gst_widget_motion_notify_event (GtkWidget *widget,
+ GdkEventMotion *ev,
+ ParolePlayer *player);
void parole_show_about (GtkWidget *widget,
ParolePlayer *player);
@@ -2078,7 +2083,7 @@ gboolean parole_player_hide_fs_window (gpointer data)
return FALSE;
}
-static gboolean
+gboolean
parole_player_gst_widget_motion_notify_event (GtkWidget *widget,
GdkEventMotion *ev, ParolePlayer *player)
{
static gulong hide_timeout = 0;
@@ -2918,9 +2923,6 @@ parole_player_init (ParolePlayer *player)
g_signal_connect (G_OBJECT (player->priv->gst), "dvd-chapter-change",
G_CALLBACK (parole_player_dvd_chapter_change_cb), player);
- g_signal_connect (G_OBJECT (player->priv->gst), "motion-notify-event",
- G_CALLBACK (parole_player_gst_widget_motion_notify_event), player);
-
g_signal_connect (G_OBJECT (player->priv->gst), "notify::volume",
G_CALLBACK (parole_property_notify_cb_volume), player);
@@ -3109,8 +3111,6 @@ parole_player_init (ParolePlayer *player)
gdk_color_parse("black", &background);
gtk_widget_modify_bg(GTK_WIDGET(player->priv->eventbox_output),
GTK_STATE_NORMAL, &background);
gtk_widget_add_events (GTK_WIDGET (player->priv->eventbox_output),
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
- g_signal_connect (G_OBJECT (player->priv->eventbox_output),
"motion-notify-event",
- G_CALLBACK (parole_player_gst_widget_motion_notify_event), player);
/* Background Image */
logo = gdk_pixbuf_new_from_file (g_strdup_printf ("%s/parole.png",
PIXMAPS_DIR), NULL);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
