From a7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 21 Jan 2017 19:17:10 +0100 Subject: New upstream version 0.25.3 --- src/editing_tools/EditingTools.c | 24 ++++++++++++------------ src/editing_tools/StraightenTool.c | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src/editing_tools') diff --git a/src/editing_tools/EditingTools.c b/src/editing_tools/EditingTools.c index 05012c9..d1fe68f 100644 --- a/src/editing_tools/EditingTools.c +++ b/src/editing_tools/EditingTools.c @@ -1,4 +1,4 @@ -/* EditingTools.c generated by valac 0.32.1, the Vala compiler +/* EditingTools.c generated by valac 0.34.4, the Vala compiler * generated from EditingTools.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -4264,7 +4264,7 @@ static void editing_tools_photo_canvas_class_init (EditingToolsPhotoCanvasClass #line 103 "/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 103 "/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 4269 "EditingTools.c" } @@ -4931,7 +4931,7 @@ static void editing_tools_editing_tool_class_init (EditingToolsEditingToolClass #line 469 "/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 469 "/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 469 "/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 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" @@ -6769,15 +6769,15 @@ static gchar string_get (const gchar* self, glong index) { gchar result = '\0'; glong _tmp0_ = 0L; gchar _tmp1_ = '\0'; -#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp1_; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 6783 "EditingTools.c" } @@ -13779,7 +13779,7 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool* #line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 13782 "EditingTools.c" - goto __catch20_g_error; + goto __catch22_g_error; } #line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _tmp6_; @@ -13793,8 +13793,8 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool* _g_object_unref0 (_tmp6_); #line 13795 "EditingTools.c" } - goto __finally20; - __catch20_g_error: + goto __finally22; + __catch22_g_error: { GError* err = NULL; GError* _tmp15_ = NULL; @@ -13817,7 +13817,7 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool* return; #line 13819 "EditingTools.c" } - __finally20: + __finally22: #line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" diff --git a/src/editing_tools/StraightenTool.c b/src/editing_tools/StraightenTool.c index cd0a017..9ef9fef 100644 --- a/src/editing_tools/StraightenTool.c +++ b/src/editing_tools/StraightenTool.c @@ -1,4 +1,4 @@ -/* StraightenTool.c generated by valac 0.32.1, the Vala compiler +/* StraightenTool.c generated by valac 0.34.4, the Vala compiler * generated from StraightenTool.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1070,7 +1070,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT #line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1073 "StraightenTool.c" - goto __catch21_g_error; + goto __catch23_g_error; } #line 282 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp14_ = _tmp6_; @@ -1084,8 +1084,8 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT _g_object_unref0 (_tmp6_); #line 1086 "StraightenTool.c" } - goto __finally21; - __catch21_g_error: + goto __finally23; + __catch23_g_error: { GError* e = NULL; EditingToolsPhotoCanvas* _tmp15_ = NULL; @@ -1124,7 +1124,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT _g_error_free0 (e); #line 1126 "StraightenTool.c" } - __finally21: + __finally23: #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" -- cgit v1.2.3