diff options
Diffstat (limited to 'cut-n-paste/toolbar-editor')
4 files changed, 8 insertions, 7 deletions
diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c index 91a065ed..e4c2f570 100644 --- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c +++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c @@ -541,7 +541,6 @@ configure_item_cursor (GtkToolItem *item, } } - static void configure_item_tooltip (GtkToolItem *item) { @@ -557,7 +556,6 @@ configure_item_tooltip (GtkToolItem *item) } } - static void connect_widget_signals (GtkWidget *proxy, EggEditableToolbar *etoolbar) { diff --git a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c index 312b9128..cb07011f 100644 --- a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c +++ b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c @@ -36,7 +36,6 @@ static const GtkTargetEntry source_drag_types[] = { {EGG_TOOLBAR_ITEM_TYPE, GTK_TARGET_SAME_APP, 0}, }; - static void egg_toolbar_editor_finalize (GObject *object); static void update_editor_sheet (EggToolbarEditor *editor); @@ -150,6 +149,11 @@ egg_toolbar_editor_disconnect_model (EggToolbarEditor *t) { handler = priv->sig_handlers[i]; +#if GLIB_CHECK_VERSION(2,62,0) + if ((handler == 0) || !g_signal_handler_is_connected (model, handler)) + continue; + g_clear_signal_handler (&handler, model); +#else if (handler != 0) { if (g_signal_handler_is_connected (model, handler)) @@ -159,6 +163,7 @@ egg_toolbar_editor_disconnect_model (EggToolbarEditor *t) priv->sig_handlers[i] = 0; } +#endif } } diff --git a/cut-n-paste/toolbar-editor/egg-toolbar-editor.h b/cut-n-paste/toolbar-editor/egg-toolbar-editor.h index e5a10b0a..13154808 100644 --- a/cut-n-paste/toolbar-editor/egg-toolbar-editor.h +++ b/cut-n-paste/toolbar-editor/egg-toolbar-editor.h @@ -34,7 +34,6 @@ typedef struct EggToolbarEditorClass EggToolbarEditorClass; #define EGG_IS_TOOLBAR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TOOLBAR_EDITOR)) #define EGG_TOOLBAR_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TOOLBAR_EDITOR, EggToolbarEditorClass)) - typedef struct EggToolbarEditor EggToolbarEditor; typedef struct EggToolbarEditorPrivate EggToolbarEditorPrivate; @@ -51,7 +50,6 @@ struct EggToolbarEditorClass GtkBoxClass parent_class; }; - GType egg_toolbar_editor_get_type (void); GtkWidget *egg_toolbar_editor_new (GtkUIManager *manager, EggToolbarsModel *model); diff --git a/cut-n-paste/toolbar-editor/egg-toolbars-model.c b/cut-n-paste/toolbar-editor/egg-toolbars-model.c index f3cc8022..cede0c70 100644 --- a/cut-n-paste/toolbar-editor/egg-toolbars-model.c +++ b/cut-n-paste/toolbar-editor/egg-toolbars-model.c @@ -27,7 +27,9 @@ #include <unistd.h> #include <string.h> +#include <libxml/parser.h> #include <libxml/tree.h> +#include <libxml/xmlsave.h> #include <gdk/gdk.h> static void egg_toolbars_model_finalize (GObject *object); @@ -213,7 +215,6 @@ is_unique (EggToolbarsModel *model, EggToolbarsItem *idata2; GNode *toolbar, *item; - for(toolbar = g_node_first_child (model->priv->toolbars); toolbar != NULL; toolbar = g_node_next_sibling (toolbar)) { @@ -330,7 +331,6 @@ egg_toolbars_model_set_flags (EggToolbarsModel *model, 0, toolbar_position); } - char * egg_toolbars_model_get_data (EggToolbarsModel *model, GdkAtom type, |