diff options
| author | Andrew Higginson <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
|---|---|---|
| committer | Andrew <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
| commit | 80960b623a99aae1402ab651b2974ef544ed3b03 (patch) | |
| tree | ba49d42c2789e9e11f805e2d5263e10f9fedeef8 /src/ink-action.cpp | |
| parent | try to fix bug (diff) | |
| parent | GDL: Cherry-pick upstream patch 73852 (2011-03-23) - Add missing return value. (diff) | |
| download | inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.tar.gz inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.zip | |
merged with trunk so I can build again...
(bzr r10092.1.36)
Diffstat (limited to 'src/ink-action.cpp')
| -rw-r--r-- | src/ink-action.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/ink-action.cpp b/src/ink-action.cpp index d8673a3ab..d26b038f8 100644 --- a/src/ink-action.cpp +++ b/src/ink-action.cpp @@ -2,12 +2,7 @@ #include <glib/gi18n.h> -#include <gtk/gtkalignment.h> -#include <gtk/gtktooltips.h> -#include <gtk/gtktoolitem.h> -#include <gtk/gtktoggletoolbutton.h> -#include <gtk/gtkcheckmenuitem.h> -#include <gtk/gtkimagemenuitem.h> +#include <gtk/gtk.h> #include "icon-size.h" #include "ink-action.h" @@ -183,7 +178,7 @@ void ink_action_set_property( GObject* obj, guint propId, const GValue *value, G } } -#include <gtk/gtkstock.h> +#include <gtk/gtk.h> static GtkWidget* ink_action_create_menu_item( GtkAction* action ) { @@ -441,9 +436,11 @@ static GtkWidget* ink_toggle_action_create_tool_item( GtkAction* action ) gtk_container_add( GTK_CONTAINER(align), child ); gtk_tool_button_set_icon_widget( button, align ); } else { - gchar *label; - g_object_get (G_OBJECT(action), "short_label", &label, NULL); + gchar *label = 0; + g_object_get( G_OBJECT(action), "short_label", &label, NULL ); gtk_tool_button_set_label( button, label ); + g_free( label ); + label = 0; } } else { // For now trigger a warning but don't do anything else |