procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-04 09:53:25 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

app: don't leak a string returned by g_object_get(), and some cleanup

Browse source
This commit is contained in:
Michael Natterer 2010-06-12 18:45:02 +02:00
parent 88250391b0
commit 4da97f95c9
1 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app/widgets/gimpdockbook.c
View file

@ -178,7 +178,8 @@ static const GtkTargetEntry dialog_target_table[] = { GIMP_TARGET_DIALOG };
/* List of candidates for the automatic style, starting with the /* List of candidates for the automatic style, starting with the
* biggest first * biggest first
*/ */
static GimpTabStyle gimp_tab_style_candidates[] = { static GimpTabStyle gimp_tab_style_candidates[] =
{
GIMP_TAB_STYLE_PREVIEW_BLURB, GIMP_TAB_STYLE_PREVIEW_BLURB,
GIMP_TAB_STYLE_PREVIEW_NAME, GIMP_TAB_STYLE_PREVIEW_NAME,
GIMP_TAB_STYLE_PREVIEW, GIMP_TAB_STYLE_PREVIEW,
@ -474,8 +475,7 @@ gimp_dockbook_show_menu (GimpDockbook *dockbook)
GimpDockable *dockable = NULL; GimpDockable *dockable = NULL;
gint page_num = -1; gint page_num = -1;
dockbook_ui_manager = dockbook_ui_manager = gimp_dockbook_get_ui_manager (dockbook);
gimp_dockbook_get_ui_manager (dockbook);
if (! dockbook_ui_manager) if (! dockbook_ui_manager)
return FALSE; return FALSE;
@ -494,7 +494,7 @@ gimp_dockbook_show_menu (GimpDockbook *dockbook)
dockable = GIMP_DOCKABLE (gtk_notebook_get_nth_page (GTK_NOTEBOOK (dockbook), dockable = GIMP_DOCKABLE (gtk_notebook_get_nth_page (GTK_NOTEBOOK (dockbook),
page_num)); page_num));
if (!dockable ) if (! dockable)
return FALSE; return FALSE;
dialog_ui_manager = gimp_dockable_get_menu (dockable, dialog_ui_manager = gimp_dockable_get_menu (dockable,
@ -503,9 +503,9 @@ gimp_dockbook_show_menu (GimpDockbook *dockbook)
if (dialog_ui_manager && dialog_ui_path) if (dialog_ui_manager && dialog_ui_path)
{ {
GtkWidget *child_menu_widget; GtkWidget *child_menu_widget;
GtkAction *child_menu_action; GtkAction *child_menu_action;
const gchar *label; gchar *label;
child_menu_widget = child_menu_widget =
gtk_ui_manager_get_widget (GTK_UI_MANAGER (dialog_ui_manager), gtk_ui_manager_get_widget (GTK_UI_MANAGER (dialog_ui_manager),
@ -539,12 +539,15 @@ gimp_dockbook_show_menu (GimpDockbook *dockbook)
"visible", TRUE, "visible", TRUE,
NULL); NULL);
g_free (label);
if (gimp_dockable_get_stock_id (dockable)) if (gimp_dockable_get_stock_id (dockable))
{ {
if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default (),
gimp_dockable_get_stock_id (dockable))) gimp_dockable_get_stock_id (dockable)))
{ {
gtk_action_set_icon_name (parent_menu_action, gimp_dockable_get_stock_id (dockable)); gtk_action_set_icon_name (parent_menu_action,
gimp_dockable_get_stock_id (dockable));
} }
} }
@ -594,9 +597,9 @@ gimp_dockbook_show_menu (GimpDockbook *dockbook)
static void static void
gimp_dockbook_menu_end (GimpDockable *dockable) gimp_dockbook_menu_end (GimpDockable *dockable)
{ {
GimpUIManager *dialog_ui_manager; GimpUIManager *dialog_ui_manager;
const gchar *dialog_ui_path; const gchar *dialog_ui_path;
gpointer dialog_popup_data; gpointer dialog_popup_data;
dialog_ui_manager = gimp_dockable_get_menu (dockable, dialog_ui_manager = gimp_dockable_get_menu (dockable,
&dialog_ui_path, &dialog_ui_path,
@ -612,7 +615,7 @@ gimp_dockbook_menu_end (GimpDockable *dockable)
gtk_menu_detach (GTK_MENU (child_menu_widget)); gtk_menu_detach (GTK_MENU (child_menu_widget));
} }
/* release gimp_dockable_show_menu()'s references */ /* release gimp_dockbook_show_menu()'s references */
g_object_set_data (G_OBJECT (dockable), GIMP_DOCKABLE_DETACH_REF_KEY, NULL); g_object_set_data (G_OBJECT (dockable), GIMP_DOCKABLE_DETACH_REF_KEY, NULL);
g_object_unref (dockable); g_object_unref (dockable);
} }