callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't crash if menu or toolbar positions can't be found. (#396161, Hans

Browse Source 
2007-01-13  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkuimanager.c: Don't crash if menu or toolbar
        positions can't be found.  (#396161, Hans Breuer)



svn path=/trunk/; revision=17147
This commit is contained in:
Matthias Clasen 2007-01-14 05:31:46 +00:00 committed by Matthias Clasen
parent cf909ca006
commit a6fe55fdc3
2 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-01-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkuimanager.c: Don't crash if menu or toolbar
positions can't be found. (#396161, Hans Breuer)
2007-01-13 Matthias Clasen <mclasen@redhat.com> 2007-01-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkselection.c (_gtk_selection_request): Plug * gtk/gtkselection.c (_gtk_selection_request): Plug

62
gtk/gtkuimanager.c
View File

@ -1850,9 +1850,12 @@ find_menu_position (GNode *node,
else else
prev_child = NODE_INFO (sibling)->proxy; prev_child = NODE_INFO (sibling)->proxy;
g_return_val_if_fail (GTK_IS_WIDGET (prev_child), FALSE); if (!GTK_IS_WIDGET (prev_child))
return FALSE;
menushell = gtk_widget_get_parent (prev_child); menushell = gtk_widget_get_parent (prev_child);
g_return_val_if_fail (GTK_IS_MENU_SHELL (menushell), FALSE); if (!GTK_IS_MENU_SHELL (menushell))
return FALSE;
pos = g_list_index (GTK_MENU_SHELL (menushell)->children, prev_child) + 1; pos = g_list_index (GTK_MENU_SHELL (menushell)->children, prev_child) + 1;
} }
@ -1915,9 +1918,12 @@ find_toolbar_position (GNode *node,
else else
prev_child = NODE_INFO (sibling)->proxy; prev_child = NODE_INFO (sibling)->proxy;
g_return_val_if_fail (GTK_IS_WIDGET (prev_child), FALSE); if (!GTK_IS_WIDGET (prev_child))
return FALSE;
toolbar = gtk_widget_get_parent (prev_child); toolbar = gtk_widget_get_parent (prev_child);
g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), FALSE); if (!GTK_IS_TOOLBAR (toolbar))
return FALSE;
pos = gtk_toolbar_get_item_index (GTK_TOOLBAR (toolbar), pos = gtk_toolbar_get_item_index (GTK_TOOLBAR (toolbar),
GTK_TOOL_ITEM (prev_child)) + 1; GTK_TOOL_ITEM (prev_child)) + 1;
@ -2437,16 +2443,18 @@ update_node (GtkUIManager *self,
gtk_menu_item_set_submenu (GTK_MENU_ITEM (info->proxy), NULL); gtk_menu_item_set_submenu (GTK_MENU_ITEM (info->proxy), NULL);
gtk_action_connect_proxy (action, info->proxy); gtk_action_connect_proxy (action, info->proxy);
} }
g_signal_connect (info->proxy, "notify::visible",
G_CALLBACK (update_smart_separators), NULL); if (info->proxy)
if (in_popup) {
{ g_signal_connect (info->proxy, "notify::visible",
/* don't show accels in popups */ G_CALLBACK (update_smart_separators), NULL);
GtkWidget *label = GTK_BIN (info->proxy)->child; if (in_popup)
g_object_set (label, {
"accel-closure", NULL, /* don't show accels in popups */
NULL); GtkWidget *label = GTK_BIN (info->proxy)->child;
} g_object_set (label, "accel-closure", NULL, NULL);
}
}
break; break;
case NODE_TYPE_TOOLITEM: case NODE_TYPE_TOOLITEM:
@ -2487,19 +2495,21 @@ update_node (GtkUIManager *self,
gtk_action_connect_proxy (action, info->proxy); gtk_action_connect_proxy (action, info->proxy);
} }
/* FIXME: we must re-set the tooltip, since tooltips on toolitems can't be if (info->proxy)
* set before the toolitem is added to the toolbar. {
*/ /* FIXME: we must re-set the tooltip, since tooltips on
{ * toolitems can't be set before the toolitem is added
gchar *tooltip; * to the toolbar.
*/
gchar *tooltip;
g_object_get (G_OBJECT (action), "tooltip", &tooltip, NULL); g_object_get (G_OBJECT (action), "tooltip", &tooltip, NULL);
g_object_set (G_OBJECT (action), "tooltip", tooltip, NULL); g_object_set (G_OBJECT (action), "tooltip", tooltip, NULL);
g_free (tooltip); g_free (tooltip);
}
g_signal_connect (info->proxy, "notify::visible",
g_signal_connect (info->proxy, "notify::visible", G_CALLBACK (update_smart_separators), NULL);
G_CALLBACK (update_smart_separators), NULL); }
break; break;
case NODE_TYPE_SEPARATOR: case NODE_TYPE_SEPARATOR:
if (NODE_INFO (node->parent)->type == NODE_TYPE_TOOLBAR || if (NODE_INFO (node->parent)->type == NODE_TYPE_TOOLBAR ||