# HG changeset patch
# User giacomo
# Date 1169032414 28800
# Node ID 829f029fbd037c7bbf71e4862270c4b098668dee
# Parent  5826c77f4acf0d96eb35d4555da37aa6caec1a68
[svn] - status icon plugin: display main menu on right click

diff -r 5826c77f4acf -r 829f029fbd03 ChangeLog
--- a/ChangeLog	Wed Jan 17 00:56:53 2007 -0800
+++ b/ChangeLog	Wed Jan 17 03:13:34 2007 -0800
@@ -1,3 +1,15 @@
+2007-01-17 08:56:53 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [986]
+  - various overflow and security-related fixes from XMMS2 (mainly Juho Vaha-Herttua, et al)
+  
+  trunk/src/aac/mp4ff/mp4ff.c    |    7 -------
+  trunk/src/aac/mp4ff/mp4ff.h    |    2 ++
+  trunk/src/aac/mp4ff/mp4ffint.h |    3 ++-
+  trunk/src/aac/mp4ff/mp4meta.c  |   30 +++++++++++++++++++++++++-----
+  trunk/src/aac/mp4ff/mp4util.c  |   15 +++++++++++----
+  5 files changed, 40 insertions(+), 17 deletions(-)
+
+
 2007-01-17 08:29:28 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [984]
   - remove broken iTunes 4/5 DRM support due to portability issues
diff -r 5826c77f4acf -r 829f029fbd03 src/statusicon/si_ui.c
--- a/src/statusicon/si_ui.c	Wed Jan 17 00:56:53 2007 -0800
+++ b/src/statusicon/si_ui.c	Wed Jan 17 03:13:34 2007 -0800
@@ -26,6 +26,7 @@
 #include <audacious/playlist.h>
 #include <audacious/titlestring.h>
 #include <audacious/ui_fileinfopopup.h>
+#include <audacious/util.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdk.h>
@@ -48,19 +49,6 @@
 }
 
 
-static GtkWidget *
-si_ui_rmenu_create ( GtkWidget * evbox )
-{
-  GtkWidget *menu;
-  GtkWidget *menuitem;
-
-  menu = gtk_menu_new();
-
-  /* gtk_widget_show_all( GTK_WIDGET(menu) ); */
-  return menu;
-}
-
-
 static gboolean
 si_ui_statusicon_cb_btpress ( GtkWidget * evbox , GdkEventButton * event )
 {
@@ -72,16 +60,11 @@
       break;
     }
 
-    /*
     case 3:
     {
-
-      GtkWidget *si_rmenu = GTK_WIDGET(g_object_get_data( G_OBJECT(evbox) , "rmenu" ));
-      gtk_menu_popup( GTK_MENU(si_rmenu) , NULL , NULL ,
-                      NULL , NULL , event->button , event->time );
+      audacious_menu_main_show( event->x_root , event->y_root , 3 , event->time );
       break;
     }
-    */
   }
 
   return FALSE;
@@ -240,7 +223,6 @@
 si_ui_statusicon_show ( void )
 {
   GtkWidget *si_image;
-  GtkWidget *si_rmenu;
   GtkWidget *si_popup;
   GtkTrayIcon *si_applet;
   GtkRequisition req;
@@ -260,10 +242,8 @@
                     G_CALLBACK(si_ui_statusicon_cb_image_sizalloc) , si_applet );
 
   si_evbox = gtk_event_box_new();
-  si_rmenu = si_ui_rmenu_create( si_evbox );
   si_popup = audacious_fileinfopopup_create();
 
-  g_object_set_data( G_OBJECT(si_evbox) , "rmenu" , si_rmenu );
   g_object_set_data( G_OBJECT(si_evbox) , "applet" , si_applet );
 
   g_object_set_data( G_OBJECT(si_evbox) , "timer_id" , GINT_TO_POINTER(0) );
@@ -299,10 +279,8 @@
   if ( si_evbox != NULL )
   {
     GtkTrayIcon *si_applet = g_object_get_data( G_OBJECT(si_evbox) , "applet" );
-    GtkWidget *si_rmenu = g_object_get_data( G_OBJECT(si_evbox) , "rmenu" );
     si_ui_statusicon_popup_timer_stop( si_evbox ); /* just in case the timer is active */
     gtk_widget_destroy( GTK_WIDGET(si_evbox) );
-    gtk_widget_destroy( GTK_WIDGET(si_rmenu) );
     gtk_widget_destroy( GTK_WIDGET(si_applet) );
   }
   return;