rpms/audacious-plugins/F-12 audacious-plugins-2.2-status.patch, 1.2, 1.3 audacious-plugins.spec, 1.97, 1.98
Michael Schwendt
mschwendt at fedoraproject.org
Thu Apr 8 20:23:48 UTC 2010
Author: mschwendt
Update of /cvs/pkgs/rpms/audacious-plugins/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28066/F-12
Modified Files:
audacious-plugins-2.2-status.patch audacious-plugins.spec
Log Message:
* Thu Apr 8 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-31
- Merge minor enhancements to the Status Icon patch to improve
where it pops up with fast mouse movement.
audacious-plugins-2.2-status.patch:
si_ui.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++----------------
1 file changed, 91 insertions(+), 30 deletions(-)
Index: audacious-plugins-2.2-status.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins-2.2-status.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- audacious-plugins-2.2-status.patch 4 Mar 2010 11:21:56 -0000 1.2
+++ audacious-plugins-2.2-status.patch 8 Apr 2010 20:23:48 -0000 1.3
@@ -1,7 +1,15 @@
-diff -Nur audacious-plugins-2.2-orig/src/statusicon/si_ui.c audacious-plugins-2.2-status/src/statusicon/si_ui.c
+diff -Nur audacious-plugins-2.2-orig/src/statusicon/si_ui.c audacious-plugins-2.2/src/statusicon/si_ui.c
--- audacious-plugins-2.2-orig/src/statusicon/si_ui.c 2009-11-22 23:49:53.000000000 +0100
-+++ audacious-plugins-2.2-status/src/statusicon/si_ui.c 2010-03-04 12:18:39.000000000 +0100
-@@ -38,9 +38,13 @@
++++ audacious-plugins-2.2/src/statusicon/si_ui.c 2010-04-07 19:20:06.000000000 +0200
+@@ -30,17 +30,17 @@
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
+
+-#ifndef MAX
+-# define MAX(a,b) ((a) > (b) ? (a) : (b))
+-#endif
+-
+ static void si_ui_statusicon_popup_timer_start ( GtkStatusIcon * );
static void si_ui_statusicon_popup_timer_stop ( GtkStatusIcon * );
static void si_ui_statusicon_smallmenu_show ( gint x, gint y, guint button, guint32 time , gpointer );
static void si_ui_statusicon_smallmenu_recreate ( GtkStatusIcon * );
@@ -15,7 +23,22 @@ diff -Nur audacious-plugins-2.2-orig/src
/* this stuff required to make titlechange hook work properly */
-@@ -161,30 +165,50 @@
+@@ -93,6 +93,14 @@
+
+ case 3:
+ {
++ if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(icon), "popup_active" )) == 1)
++ {
++ popup_step = 1;
++
++ si_ui_statusicon_popup_hide( icon );
++ si_ui_statusicon_popup_timer_start( icon );
++ }
++
+ if (event->state & GDK_SHIFT_MASK)
+ audacious_drct_pl_prev();
+ else{
+@@ -161,30 +169,65 @@
static gboolean
si_ui_statusicon_popup_show ( gpointer icon )
{
@@ -44,6 +67,21 @@ diff -Nur audacious-plugins-2.2-orig/src
+ gint pl_active = aud_playlist_get_active();
+ gint pos = aud_playlist_get_position(pl_active);
+ GtkWidget *popup = g_object_get_data( G_OBJECT(icon) , "popup" );
++
++ GdkDisplay *display = gdk_display_get_default();
++ GdkScreen *screen = gdk_display_get_default_screen(display);
++ GdkRectangle area;
++ gint x, y;
++ gtk_status_icon_get_geometry(icon, &screen, &area, NULL);
++ gdk_display_get_pointer(display, &screen, &x, &y, NULL);
++
++ if (x < area.x || x > area.x + area.width || y < area.y || y > area.y + area.width)
++ {
++ si_ui_statusicon_popup_timer_stop(icon);
++ si_ui_statusicon_popup_hide(icon);
++
++ return TRUE;
++ }
+
+ tuple = (Tuple*) aud_playlist_entry_get_tuple( pl_active , pos );
+ if ( ( tuple == NULL ) || ( aud_tuple_get_int(tuple, FIELD_LENGTH, NULL) < 1 ) ) {
@@ -89,7 +127,7 @@ diff -Nur audacious-plugins-2.2-orig/src
}
-@@ -204,6 +228,7 @@
+@@ -204,6 +247,7 @@
si_ui_statusicon_popup_timer_start ( GtkStatusIcon * icon )
{
gint timer_id = g_timeout_add( 500 , si_ui_statusicon_popup_show , icon );
@@ -97,7 +135,7 @@ diff -Nur audacious-plugins-2.2-orig/src
g_object_set_data( G_OBJECT(icon) , "timer_id" , GINT_TO_POINTER(timer_id) );
g_object_set_data( G_OBJECT(icon) , "timer_active" , GINT_TO_POINTER(1) );
return;
-@@ -222,6 +247,19 @@
+@@ -222,6 +266,19 @@
}
@@ -117,7 +155,7 @@ diff -Nur audacious-plugins-2.2-orig/src
static void
si_ui_statusicon_cb_aud_hook_pbstart ( gpointer plentry_gp , gpointer icon )
{
-@@ -238,8 +276,8 @@
+@@ -238,8 +295,8 @@
si_ui_statusicon_cb_aud_hook_tchange ( gpointer plentry_gp , gpointer prevs_gp )
{
si_aud_hook_tchange_prevs_t *prevs = prevs_gp;
@@ -127,7 +165,7 @@ diff -Nur audacious-plugins-2.2-orig/src
gboolean upd_pop = FALSE;
if (pl_entry >= 0)
-@@ -267,6 +305,7 @@
+@@ -267,6 +324,7 @@
/* if filename changes, reset title as well */
g_free(prevs->title);
prevs->title = g_strdup(pl_entry_title);
@@ -135,7 +173,7 @@ diff -Nur audacious-plugins-2.2-orig/src
}
}
else
-@@ -409,7 +448,10 @@
+@@ -409,7 +467,10 @@
G_CALLBACK(si_ui_statusicon_cb_btpress) , NULL );
g_signal_connect( G_OBJECT(si_applet) , "scroll-event" ,
G_CALLBACK(si_ui_statusicon_cb_btscroll) , NULL );
@@ -146,7 +184,7 @@ diff -Nur audacious-plugins-2.2-orig/src
gtk_status_icon_set_visible(si_applet, TRUE);
/* small menu that can be used in place of the audacious standard one */
-@@ -421,7 +463,7 @@
+@@ -421,7 +482,7 @@
si_aud_hook_tchange_prevs->title = NULL;
si_aud_hook_tchange_prevs->filename = NULL;
si_aud_hook_tchange_prevs->applet = si_applet;
@@ -155,7 +193,7 @@ diff -Nur audacious-plugins-2.2-orig/src
return;
}
-@@ -432,7 +474,7 @@
+@@ -432,7 +493,7 @@
GtkWidget *si_smenu = g_object_get_data( G_OBJECT(si_applet) , "smenu" );
si_ui_statusicon_popup_timer_stop( si_applet ); /* just in case the timer is active */
aud_hook_dissociate( "playback begin" , si_ui_statusicon_cb_aud_hook_pbstart );
Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- audacious-plugins.spec 19 Mar 2010 18:19:22 -0000 1.97
+++ audacious-plugins.spec 8 Apr 2010 20:23:48 -0000 1.98
@@ -5,7 +5,7 @@
Name: audacious-plugins
Version: 2.2
-Release: 30%{?dist}
+Release: 31%{?dist}
Summary: Plugins for the Audacious media player
Group: Applications/Multimedia
URL: http://audacious-media-player.org/
@@ -61,7 +61,7 @@ Patch15: audacious-plugins-2.2-streambro
Patch16: audacious-plugins-2.2-scrobbler.patch
# merged upstream with additional patch for 2.3: AUDPLUG-170
Patch17: audacious-plugins-2.2-status.patch
-#
+# merged upstream
Patch18: audacious-plugins-2.2-no-adplugdb.patch
# is this even possible? bz 573075
Patch19: audacious-plugins-2.2-playlist-font-safety.patch
@@ -320,6 +320,10 @@ update-desktop-database &> /dev/null ||
%changelog
+* Thu Apr 8 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-31
+- Merge minor enhancements to the Status Icon patch to improve
+ where it pops up with fast mouse movement.
+
* Fri Mar 19 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-30
- Fix colour array indexing in Scope Mode.
More information about the scm-commits
mailing list