diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-11-09 06:55:40 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-11-09 06:55:40 +0100 |
| commit | 71376a8631a4262793351e3431b3bc2df93b15dd (patch) | |
| tree | a7b7313268ffc0e98a0f51e15fb2477b00194458 /src/editing_tools | |
| parent | 524a49de17c1c432b0ad6b16f11e64586bf10e7c (diff) | |
| parent | 7152401783578b56343f578b4ec920998660de33 (diff) | |
Merge tag 'upstream/0.25.0.1'
Upstream version 0.25.0.1
Diffstat (limited to 'src/editing_tools')
| -rw-r--r-- | src/editing_tools/EditingTools.c | 6 | ||||
| -rw-r--r-- | src/editing_tools/StraightenTool.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/editing_tools/EditingTools.c b/src/editing_tools/EditingTools.c index 31a2bf2..bb602a2 100644 --- a/src/editing_tools/EditingTools.c +++ b/src/editing_tools/EditingTools.c @@ -1,4 +1,4 @@ -/* EditingTools.c generated by valac 0.34.1, the Vala compiler +/* EditingTools.c generated by valac 0.34.2, the Vala compiler * generated from EditingTools.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -4260,7 +4260,7 @@ static void editing_tools_photo_canvas_class_init (EditingToolsPhotoCanvasClass #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_new ("new_surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__POINTER_BOXED, G_TYPE_NONE, 2, G_TYPE_POINTER, TYPE_DIMENSIONS); #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_new ("resized_scaled_pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED, G_TYPE_NONE, 3, TYPE_DIMENSIONS, GDK_TYPE_PIXBUF, GDK_TYPE_RECTANGLE); + g_signal_new ("resized_scaled_pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED, G_TYPE_NONE, 3, TYPE_DIMENSIONS, gdk_pixbuf_get_type (), gdk_rectangle_get_type ()); #line 4265 "EditingTools.c" } @@ -4927,7 +4927,7 @@ static void editing_tools_editing_tool_class_init (EditingToolsEditingToolClass #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_new ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_new ("applied", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN, G_TYPE_NONE, 4, TYPE_COMMAND, GDK_TYPE_PIXBUF, TYPE_DIMENSIONS, G_TYPE_BOOLEAN); + g_signal_new ("applied", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN, G_TYPE_NONE, 4, TYPE_COMMAND, gdk_pixbuf_get_type (), TYPE_DIMENSIONS, G_TYPE_BOOLEAN); #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_new ("cancelled", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" diff --git a/src/editing_tools/StraightenTool.c b/src/editing_tools/StraightenTool.c index b36afaf..bf13dcb 100644 --- a/src/editing_tools/StraightenTool.c +++ b/src/editing_tools/StraightenTool.c @@ -1,4 +1,4 @@ -/* StraightenTool.c generated by valac 0.34.1, the Vala compiler +/* StraightenTool.c generated by valac 0.34.2, the Vala compiler * generated from StraightenTool.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. |