From: bryce Date: Fri, 23 Feb 2007 06:04:58 +0000 (+0000) Subject: Disabling transientize callback - it's currently causing some data loss X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9336a24ccde2bdbbe7d3bd069e29b2cce87cb4be;p=inkscape.git Disabling transientize callback - it's currently causing some data loss when switching between windows. --- diff --git a/src/dialogs/stroke-style.cpp b/src/dialogs/stroke-style.cpp index b0b510a01..58505df97 100644 --- a/src/dialogs/stroke-style.cpp +++ b/src/dialogs/stroke-style.cpp @@ -184,14 +184,6 @@ sp_stroke_style_widget_change_subselection ( Inkscape::Application *inkscape, sp_stroke_style_paint_update (spw); } -static void -sp_stroke_style_widget_transientize_callback(Inkscape::Application *inkscape, - SPDesktop *desktop, - SPWidget *spw ) -{ - ink_markers_menu_update(spw); -} - /** * Gets the active stroke style property, then sets the appropriate color, alpha, gradient, * pattern, etc. for the paint-selector. @@ -567,6 +559,16 @@ sp_stroke_radio_button(GtkWidget *tb, char const *icon, } +static void +sp_stroke_style_widget_transientize_callback(Inkscape::Application *inkscape, + SPDesktop *desktop, + SPWidget *spw ) +{ +// TODO: Either of these will cause crashes sometimes +// sp_stroke_style_line_update( SP_WIDGET(spw), desktop ? sp_desktop_selection(desktop) : NULL); +// ink_markers_menu_update(spw); +} + /** * Creates a copy of the marker named mname, determines its visible and renderable * area in menu_id's bounding box, and then renders it. This allows us to fill in @@ -906,6 +908,7 @@ sp_marker_select(GtkOptionMenu *mnu, GtkWidget *spw) // Also update the marker dropdown menus, so the document's markers // show up at the top of the menu +// sp_stroke_style_line_update( SP_WIDGET(spw), desktop ? sp_desktop_selection(desktop) : NULL); ink_markers_menu_update(SP_WIDGET(spw)); Inkscape::Selection *selection = sp_desktop_selection(desktop); @@ -1864,7 +1867,6 @@ ink_extract_marker_name(gchar const *n) gchar* b = g_strdup(p); b[c] = '\0'; - SPDesktop *desktop = inkscape_active_desktop(); SPDocument *doc = sp_desktop_document(desktop); SPObject *marker = doc->getObjectById(b);