From 72e3d4c55a6569d966059f762824c38d06055871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 29 Oct 2016 23:24:31 +0200 Subject: New upstream version 0.25.0 --- src/events/EventDirectoryItem.c | 16 ++++++++-------- src/events/EventPage.c | 4 ++-- src/events/EventsDirectoryPage.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/events') diff --git a/src/events/EventDirectoryItem.c b/src/events/EventDirectoryItem.c index 5f70718..c15f5e7 100644 --- a/src/events/EventDirectoryItem.c +++ b/src/events/EventDirectoryItem.c @@ -1155,7 +1155,7 @@ static void event_directory_item_real_exposed (CheckerboardItem* base) { #line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1158 "EventDirectoryItem.c" - goto __catch49_g_error; + goto __catch50_g_error; } #line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp1_); @@ -1163,8 +1163,8 @@ static void event_directory_item_real_exposed (CheckerboardItem* base) { _g_object_unref0 (_tmp1_); #line 1165 "EventDirectoryItem.c" } - goto __finally49; - __catch49_g_error: + goto __finally50; + __catch50_g_error: { GError* err = NULL; Event* _tmp8_ = NULL; @@ -1194,7 +1194,7 @@ static void event_directory_item_real_exposed (CheckerboardItem* base) { _g_error_free0 (err); #line 1196 "EventDirectoryItem.c" } - __finally49: + __finally50: #line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -1321,7 +1321,7 @@ static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) { #line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1324 "EventDirectoryItem.c" - goto __catch50_g_error; + goto __catch51_g_error; } #line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp5_); @@ -1329,8 +1329,8 @@ static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) { _g_object_unref0 (_tmp5_); #line 1331 "EventDirectoryItem.c" } - goto __finally50; - __catch50_g_error: + goto __finally51; + __catch51_g_error: { GError* err = NULL; Event* _tmp9_ = NULL; @@ -1360,7 +1360,7 @@ static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) { _g_error_free0 (err); #line 1362 "EventDirectoryItem.c" } - __finally50: + __finally51: #line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" diff --git a/src/events/EventPage.c b/src/events/EventPage.c index 492b7a6..0c1e86a 100644 --- a/src/events/EventPage.c +++ b/src/events/EventPage.c @@ -836,9 +836,9 @@ static void _event_page_on_make_primary_gtk_action_callback (GtkAction* action, static void _vala_array_add130 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); static void event_page_on_rename (EventPage* self); static void _event_page_on_rename_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_RENAME_EVENT_MENU _ ("Re_name Event...") +#define RESOURCES_RENAME_EVENT_MENU _ ("Re_name Event…") static void _vala_array_add131 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_EDIT_EVENT_COMMENT_MENU _ ("Edit Event _Comment...") +#define RESOURCES_EDIT_EVENT_COMMENT_MENU _ ("Edit Event _Comment…") void media_page_on_edit_comment (MediaPage* self); static void _media_page_on_edit_comment_gtk_action_callback (GtkAction* action, gpointer self); static void _vala_array_add132 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); diff --git a/src/events/EventsDirectoryPage.c b/src/events/EventsDirectoryPage.c index f4f08e0..a009036 100644 --- a/src/events/EventsDirectoryPage.c +++ b/src/events/EventsDirectoryPage.c @@ -992,14 +992,14 @@ GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length #define TRANSLATABLE "translatable" static void events_directory_page_on_rename (EventsDirectoryPage* self); static void _events_directory_page_on_rename_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_RENAME_EVENT_MENU _ ("Re_name Event...") +#define RESOURCES_RENAME_EVENT_MENU _ ("Re_name Event…") static void _vala_array_add126 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); #define RESOURCES_MERGE_TOOLTIP _ ("Combine events into a single event") static void events_directory_page_on_merge (EventsDirectoryPage* self); static void _events_directory_page_on_merge_gtk_action_callback (GtkAction* action, gpointer self); #define RESOURCES_MERGE_MENU _ ("_Merge Events") static void _vala_array_add127 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_EDIT_COMMENT_MENU _ ("Edit _Comment...") +#define RESOURCES_EDIT_COMMENT_MENU _ ("Edit _Comment…") void events_directory_page_on_edit_comment (EventsDirectoryPage* self); static void _events_directory_page_on_edit_comment_gtk_action_callback (GtkAction* action, gpointer self); static void _vala_array_add128 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -- cgit v1.2.3