diff options
| author | Ted Gould <ted@gould.cx> | 2008-10-31 15:06:16 +0000 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2008-10-31 15:06:16 +0000 |
| commit | 7e67d66e7817a9321c4e94b2184a9226b20b396a (patch) | |
| tree | a857d7aae5f544c4243a331e4eb4e4629bbc27a9 /src/dialogs/xml-tree.cpp | |
| parent | Merge from trunk (diff) | |
| download | inkscape-7e67d66e7817a9321c4e94b2184a9226b20b396a.tar.gz inkscape-7e67d66e7817a9321c4e94b2184a9226b20b396a.zip | |
Merge from trunk
(bzr r6887)
Diffstat (limited to 'src/dialogs/xml-tree.cpp')
| -rw-r--r-- | src/dialogs/xml-tree.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/dialogs/xml-tree.cpp b/src/dialogs/xml-tree.cpp index 06103e9b3..2c596bc0e 100644 --- a/src/dialogs/xml-tree.cpp +++ b/src/dialogs/xml-tree.cpp @@ -97,7 +97,8 @@ static SPDocument *current_document = NULL; static gint selected_attr = 0; static Inkscape::XML::Node *selected_repr = NULL; -static void sp_xmltree_desktop_change( Inkscape::Application *inkscape, SPDesktop *desktop, GtkWidget *dialog ); +static void sp_xmltree_desktop_activate( Inkscape::Application *inkscape, SPDesktop *desktop, GtkWidget *dialog ); +static void sp_xmltree_desktop_deactivate( Inkscape::Application *inkscape, SPDesktop *desktop, GtkWidget *dialog ); static void set_tree_desktop(SPDesktop *desktop); static void set_tree_document(SPDocument *document); @@ -612,10 +613,10 @@ void sp_xml_tree_dialog() gtk_widget_hide(text_container); g_signal_connect( G_OBJECT(INKSCAPE), "activate_desktop", - G_CALLBACK(sp_xmltree_desktop_change), dlg); + G_CALLBACK(sp_xmltree_desktop_activate), dlg); g_signal_connect( G_OBJECT(INKSCAPE), "deactivate_desktop", - G_CALLBACK(sp_xmltree_desktop_change), dlg); + G_CALLBACK(sp_xmltree_desktop_deactivate), dlg); g_signal_connect((GObject *) dlg, "key_press_event", (GCallback) sp_xml_tree_key_press, NULL); @@ -650,16 +651,20 @@ static gboolean sp_xml_tree_key_press(GtkWidget */*widget*/, GdkEventKey *event) } -static void sp_xmltree_desktop_change(Inkscape::Application */*inkscape*/, +static void sp_xmltree_desktop_activate(Inkscape::Application */*inkscape*/, SPDesktop *desktop, GtkWidget */*dialog*/ ) { - if (!desktop) { - return; - } set_tree_desktop(desktop); } +static void sp_xmltree_desktop_deactivate(Inkscape::Application */*inkscape*/, + SPDesktop *desktop, + GtkWidget */*dialog*/ ) +{ + set_tree_desktop(NULL); +} + void set_tree_desktop(SPDesktop *desktop) { |