Re: [Bluez-devel] [PATCH] Implement browse callback in the applet

Bastien Nocera
2007-07-24T21:54:24Z

[-- Attachment #1: Type: text/plain, Size: 632 bytes --]

On Tue, 2007-07-24 at 23:19 +0200, Marcel Holtmann wrote:
> Hi Bastien,
>
> > The patch implements the browse callback for the applet. It hardcodes
> > the use of nautilus, but we should probably also check for nautilus in
> > the obexftp_available().
> >
> > It also fixes a popup menu being created _each time_ someone
> > right-clicks on the bluetooth applet.
>
> can you split this into two patches. They are both two independent
> things.

I guess the actual browse menu item implementation will have to wait for
the other patches to be done. This patch should apply with some fuzz.

--
Bastien Nocera <hadess@hadess.net>

[-- Attachment #2: bluez-gnome-fix-menu-leak.patch --]
[-- Type: text/x-patch, Size: 1769 bytes --]

Index: main.c
===================================================================
RCS file: /cvsroot/bluez/gnome/applet/main.c,v
retrieving revision 1.67
diff -u -p -r1.67 main.c
--- main.c 24 Jul 2007 15:19:33 -0000 1.67
+++ main.c 24 Jul 2007 16:43:26 -0000
@@ -1507,9 +1555,13 @@ static void activate_callback(GObject *w
static void popup_callback(GObject *widget, guint button,
guint activate_time, gpointer user_data)
{
- GtkWidget *menu;
+ static GtkWidget *menu = NULL;
+ static GtkWidget *browse_item = NULL;
GtkWidget *item;

+ if (menu != NULL)
+ goto popup;
+
menu = gtk_menu_new();

item = gtk_image_menu_item_new_from_stock(GTK_STOCK_PREFERENCES, NULL);
@@ -1528,14 +1580,11 @@ static void popup_callback(GObject *widg
gtk_widget_show(item);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);

- item = gtk_image_menu_item_new_with_label(_("Browse device..."));
- g_signal_connect(item, "activate",
+ browse_item = gtk_image_menu_item_new_with_label(_("Browse device..."));
+ g_signal_connect(browse_item, "activate",
G_CALLBACK(browse_callback), NULL);
- gtk_widget_show(item);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-
- gtk_widget_set_sensitive(item, obexftp_available() &&
- attached_adapters() > 0);
+ gtk_widget_show(browse_item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), browse_item);

#if 0
item = gtk_separator_menu_item_new();
@@ -1549,6 +1598,10 @@ static void popup_callback(GObject *widg
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
#endif

+popup:
+ gtk_widget_set_sensitive(browse_item, obexftp_available() &&