Connector tool: make connectors avoid the convex hull of shapes.

[inkscape.git] / src / ege-select-one-action.cpp

diff --git a/src/ege-select-one-action.cpp b/src/ege-select-one-action.cpp
index 463011990b6e8bab969d205f57234a9e61131369..6de22495d0fe0c2f0902f2b2ae8130a353944435 100644 (file)
--- a/src/ege-select-one-action.cpp
+++ b/src/ege-select-one-action.cpp
@@ -44,7 +44,7 @@
 #include <gtk/gtkhbox.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtktoolitem.h>
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
 #include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtkcellrendererpixbuf.h>
 #include <gtk/gtkcelllayout.h>
@@ -577,7 +577,9 @@ GtkWidget* create_tool_item( GtkAction* action )
 
                     if ( act->private_data->iconProperty >= 0 ) {
                         /* TODO get this string to be set instead of hardcoded */
-                        g_object_set( G_OBJECT(obj), "iconSize", act->private_data->iconSize, NULL );
+                        if ( act->private_data->iconSize >= 0 ) {
+                            g_object_set( G_OBJECT(obj), "iconSize", act->private_data->iconSize, NULL );
+                        }
                     }
 
                     ract = GTK_RADIO_ACTION(obj);
@@ -730,7 +732,7 @@ void combo_changed_cb( GtkComboBox* widget, gpointer user_data )
 {
     EgeSelectOneAction* act = EGE_SELECT_ONE_ACTION(user_data);
     gint newActive = gtk_combo_box_get_active(widget);
-    if (newActive != act->private_data->active) {
+    if (newActive != act->private_data->active && newActive != -1) {
         g_object_set( G_OBJECT(act), "active", newActive, NULL );
     }
 }