C++ cleanup on patch.

[inkscape.git] / src / knot.cpp

diff --git a/src/knot.cpp b/src/knot.cpp
index 04520ed228564c7ab49564ea6673308ca7bf33ea..824f16c3e596766a995a0f7c2756d57ca5d339b8 100644 (file)
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -116,7 +116,7 @@ static void sp_knot_class_init(SPKnotClass *klass)
                                          G_SIGNAL_RUN_FIRST,
                                          G_STRUCT_OFFSET(SPKnotClass, clicked),
                                          NULL, NULL,
-                                         sp_marshal_NONE__UINT,
+                                         g_cclosure_marshal_VOID__UINT,
                                          G_TYPE_NONE, 1,
                                          G_TYPE_UINT);
 
@@ -125,7 +125,7 @@ static void sp_knot_class_init(SPKnotClass *klass)
                                                G_SIGNAL_RUN_FIRST,
                                                G_STRUCT_OFFSET(SPKnotClass, doubleclicked),
                                                NULL, NULL,
-                                               sp_marshal_NONE__UINT,
+                                               g_cclosure_marshal_VOID__UINT,
                                                G_TYPE_NONE, 1,
                                                G_TYPE_UINT);
 
@@ -134,7 +134,7 @@ static void sp_knot_class_init(SPKnotClass *klass)
                                           G_SIGNAL_RUN_FIRST,
                                           G_STRUCT_OFFSET(SPKnotClass, grabbed),
                                           NULL, NULL,
-                                          sp_marshal_NONE__UINT,
+                                          g_cclosure_marshal_VOID__UINT,
                                           G_TYPE_NONE, 1,
                                           G_TYPE_UINT);
 
@@ -143,7 +143,7 @@ static void sp_knot_class_init(SPKnotClass *klass)
                                            G_SIGNAL_RUN_FIRST,
                                            G_STRUCT_OFFSET(SPKnotClass, ungrabbed),
                                            NULL, NULL,
-                                           sp_marshal_NONE__UINT,
+                                           g_cclosure_marshal_VOID__UINT,
                                            G_TYPE_NONE, 1,
                                            G_TYPE_UINT);
 
@@ -447,7 +447,7 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot
 
     g_object_unref(knot);
 
-    return consumed;
+    return consumed || grabbed;
 }
 
 void sp_knot_handler_request_position(GdkEvent *event, SPKnot *knot)