← Back to team overview

ayatana-commits team mailing list archive

[Merge] lp:~ted/indicator-appmenu/qt-integration-fixes into lp:indicator-appmenu

 

Ted Gould has proposed merging lp:~ted/indicator-appmenu/qt-integration-fixes into lp:indicator-appmenu with lp:~ted/indicator-appmenu/ordering as a prerequisite.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)


Increasing timeouts and having mneumonics for QT.
-- 
https://code.launchpad.net/~ted/indicator-appmenu/qt-integration-fixes/+merge/25003
Your team ayatana-commits is subscribed to branch lp:indicator-appmenu.
=== modified file 'src/indicator-appmenu.c'
--- src/indicator-appmenu.c	2010-05-10 14:55:46 +0000
+++ src/indicator-appmenu.c	2010-05-10 14:55:46 +0000
@@ -280,7 +280,7 @@
 		gpointer * params = (gpointer *)g_new(gpointer, 2);
 		params[0] = iapp;
 		params[1] = wm;
-		g_timeout_add(250, switch_timeout, params);
+		g_timeout_add(1250, switch_timeout, params);
 
 		g_signal_emit(G_OBJECT(iapp), signals[WINDOW_REGISTERED], 0, windowid, objectpath, TRUE);
 	} else {

=== modified file 'src/window-menus.c'
--- src/window-menus.c	2010-05-10 14:55:46 +0000
+++ src/window-menus.c	2010-05-10 14:55:46 +0000
@@ -164,7 +164,7 @@
 	priv->menu = dbusmenu_gtkmenu_new((gchar *)dbus_addr, (gchar *)dbus_object);
 
 	/* This is a work around for the demo */
-	g_timeout_add(100, update_array, newmenu);
+	g_timeout_add(1000, update_array, newmenu);
 
 	// TODO: When GTK supports these, use them
 	// g_signal_connect(G_OBJECT(priv->menu), "add",    G_CALLBACK(menu_entry_added),   newmenu);
@@ -229,7 +229,7 @@
 	IndicatorObjectEntry * entry = g_new0(IndicatorObjectEntry, 1);
 
 	/* TODO: Should be a better way for this */
-	entry->label = GTK_LABEL(gtk_label_new(gtk_menu_item_get_label(GTK_MENU_ITEM(widget))));
+	entry->label = GTK_LABEL(gtk_label_new_with_mnemonic(gtk_menu_item_get_label(GTK_MENU_ITEM(widget))));
 	gtk_widget_show(GTK_WIDGET(entry->label));
 	/* TODO: Check for image item */
 	entry->image = NULL;


Follow ups