diff options
| author | Nathan Hurst <njh@njhurst.com> | 2010-04-29 04:54:37 +0000 |
|---|---|---|
| committer | Nathan Hurst <njh@thestral> | 2010-04-29 04:54:37 +0000 |
| commit | d1f3fa05f8230e081907888d71d506c3a8f71563 (patch) | |
| tree | c22e5698952327955c82ad7574ef5311a4a2ec38 /src | |
| parent | Translations. inkscape.pot and French translation update. (diff) | |
| download | inkscape-d1f3fa05f8230e081907888d71d506c3a8f71563.tar.gz inkscape-d1f3fa05f8230e081907888d71d506c3a8f71563.zip | |
moved some marshalling functions to generic glib calls
(bzr r9389)
Diffstat (limited to 'src')
| -rw-r--r-- | src/helper/sp-marshal.list | 9 | ||||
| -rw-r--r-- | src/inkscape.cpp | 16 | ||||
| -rw-r--r-- | src/knot.cpp | 8 | ||||
| -rw-r--r-- | src/widgets/sp-xmlview-attr-list.cpp | 2 |
4 files changed, 13 insertions, 22 deletions
diff --git a/src/helper/sp-marshal.list b/src/helper/sp-marshal.list index 15ddb1ec4..1dc4dd65c 100644 --- a/src/helper/sp-marshal.list +++ b/src/helper/sp-marshal.list @@ -1,14 +1,5 @@ # marshallers for sodipodi -NONE:NONE -NONE:UINT -NONE:POINTER -NONE:POINTER,BOOLEAN NONE:POINTER,UINT -NONE:POINTER,DOUBLE -NONE:DOUBLE,DOUBLE -NONE:STRING,BOOL -BOOLEAN:NONE -BOOLEAN:UINT BOOLEAN:POINTER BOOLEAN:POINTER,UINT BOOLEAN:POINTER,POINTER diff --git a/src/inkscape.cpp b/src/inkscape.cpp index d0f9a11fc..d876be6ec 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -56,7 +56,7 @@ using Inkscape::Extension::Internal::PrintWin32; #include "extension/init.h" #include "extension/output.h" #include "extension/system.h" -#include "helper/sp-marshal.h" +//#include "helper/sp-marshal.h" #include "inkscape-private.h" #include "io/sys.h" #include "message-stack.h" @@ -193,7 +193,7 @@ inkscape_class_init (Inkscape::ApplicationClass * klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (Inkscape::ApplicationClass, modify_selection), NULL, NULL, - sp_marshal_NONE__POINTER_UINT, + g_cclosure_marshal_VOID__UINT_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_UINT); inkscape_signals[CHANGE_SELECTION] = g_signal_new ("change_selection", @@ -201,7 +201,7 @@ inkscape_class_init (Inkscape::ApplicationClass * klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (Inkscape::ApplicationClass, change_selection), NULL, NULL, - sp_marshal_NONE__POINTER, + g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); inkscape_signals[CHANGE_SUBSELECTION] = g_signal_new ("change_subselection", @@ -209,7 +209,7 @@ inkscape_class_init (Inkscape::ApplicationClass * klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (Inkscape::ApplicationClass, change_subselection), NULL, NULL, - sp_marshal_NONE__POINTER, + g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); inkscape_signals[SET_SELECTION] = g_signal_new ("set_selection", @@ -217,7 +217,7 @@ inkscape_class_init (Inkscape::ApplicationClass * klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (Inkscape::ApplicationClass, set_selection), NULL, NULL, - sp_marshal_NONE__POINTER, + g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); inkscape_signals[SET_EVENTCONTEXT] = g_signal_new ("set_eventcontext", @@ -225,7 +225,7 @@ inkscape_class_init (Inkscape::ApplicationClass * klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (Inkscape::ApplicationClass, set_eventcontext), NULL, NULL, - sp_marshal_NONE__POINTER, + g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); inkscape_signals[ACTIVATE_DESKTOP] = g_signal_new ("activate_desktop", @@ -233,7 +233,7 @@ inkscape_class_init (Inkscape::ApplicationClass * klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (Inkscape::ApplicationClass, activate_desktop), NULL, NULL, - sp_marshal_NONE__POINTER, + g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); inkscape_signals[DEACTIVATE_DESKTOP] = g_signal_new ("deactivate_desktop", @@ -241,7 +241,7 @@ inkscape_class_init (Inkscape::ApplicationClass * klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (Inkscape::ApplicationClass, deactivate_desktop), NULL, NULL, - sp_marshal_NONE__POINTER, + g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); inkscape_signals[SHUTDOWN_SIGNAL] = g_signal_new ("shut_down", diff --git a/src/knot.cpp b/src/knot.cpp index 04520ed22..10672e048 100644 --- 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); diff --git a/src/widgets/sp-xmlview-attr-list.cpp b/src/widgets/sp-xmlview-attr-list.cpp index 008ad4970..535a4b534 100644 --- a/src/widgets/sp-xmlview-attr-list.cpp +++ b/src/widgets/sp-xmlview-attr-list.cpp @@ -115,7 +115,7 @@ sp_xmlview_attr_list_class_init (SPXMLViewAttrListClass * klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (SPXMLViewAttrListClass, row_changed), NULL, NULL, - sp_marshal_NONE__UINT, + g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT); } |