evolution r36232 - in branches/kill-bonobo: shell widgets/misc
- From: mbarnes svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution r36232 - in branches/kill-bonobo: shell widgets/misc
- Date: Sun, 31 Aug 2008 12:29:42 +0000 (UTC)
Author: mbarnes
Date: Sun Aug 31 12:29:42 2008
New Revision: 36232
URL: http://svn.gnome.org/viewvc/evolution?rev=36232&view=rev
Log:
Fix some bugs related to the New menu and toolbar button.
Modified:
branches/kill-bonobo/shell/e-shell-window-actions.c
branches/kill-bonobo/widgets/misc/e-menu-tool-button.c
Modified: branches/kill-bonobo/shell/e-shell-window-actions.c
==============================================================================
--- branches/kill-bonobo/shell/e-shell-window-actions.c (original)
+++ branches/kill-bonobo/shell/e-shell-window-actions.c Sun Aug 31 12:29:42 2008
@@ -1256,12 +1256,12 @@
*/
for (iter = *source_list; iter != NULL; iter = iter->next) {
GtkAction *action = iter->data;
- const gchar *view_name;
+ const gchar *module_name;
- view_name = g_object_get_data (
- G_OBJECT (action), "view-name");
+ module_name = g_object_get_data (
+ G_OBJECT (action), "module-name");
- if (view_name != current_view)
+ if (strcmp (module_name, current_view) != 0)
continue;
match_list = g_list_append (match_list, iter);
@@ -1372,9 +1372,11 @@
separator = gtk_separator_menu_item_new ();
new_item_actions = g_list_prepend (new_item_actions, separator);
+ gtk_widget_show (GTK_WIDGET (separator));
separator = gtk_separator_menu_item_new ();
new_source_actions = g_list_prepend (new_source_actions, separator);
+ gtk_widget_show (GTK_WIDGET (separator));
/* Merge everything into one list, reflecting the menu layout. */
Modified: branches/kill-bonobo/widgets/misc/e-menu-tool-button.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-menu-tool-button.c (original)
+++ branches/kill-bonobo/widgets/misc/e-menu-tool-button.c Sun Aug 31 12:29:42 2008
@@ -51,12 +51,10 @@
/* XXX GTK+ 2.12 provides no accessor function. */
children = GTK_MENU_SHELL (menu)->children;
- if (children == NULL || children->next == NULL)
+ if (children == NULL)
return NULL;
- /* Return the /second/ menu item, which turns out to be the first
- * visible item. The first menu item is some kind of placeholder? */
- return GTK_MENU_ITEM (children->next->data);
+ return GTK_MENU_ITEM (children->data);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]