summaryrefslogtreecommitdiff
path: root/src/events
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-21 19:17:10 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-21 19:17:10 +0100
commita7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e (patch)
treed9f86def771c7845f241ec81219b243c70523c60 /src/events
parent66f6a7bd3f7e00022191f16cb0e82a39e7333a76 (diff)
New upstream version 0.25.3upstream/0.25.3
Diffstat (limited to 'src/events')
-rw-r--r--src/events/Branch.c40
-rw-r--r--src/events/EventDirectoryItem.c18
-rw-r--r--src/events/EventPage.c533
-rw-r--r--src/events/EventPage.vala15
-rw-r--r--src/events/Events.c2
-rw-r--r--src/events/EventsDirectoryPage.c947
-rw-r--r--src/events/EventsDirectoryPage.vala13
7 files changed, 842 insertions, 726 deletions
diff --git a/src/events/Branch.c b/src/events/Branch.c
index 193a8ee..ac8b255 100644
--- a/src/events/Branch.c
+++ b/src/events/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.32.1, the Vala compiler
+/* Branch.c generated by valac 0.34.4, the Vala compiler
* generated from Branch.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2140,13 +2140,13 @@ static void events_branch_on_no_event_collection_altered (EventsBranch* self) {
static void g_time_local (time_t time, struct tm* result) {
struct tm _result_ = {0};
struct tm _tmp0_ = {0};
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
localtime_r (&time, &_tmp0_);
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*result = _result_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return;
#line 2152 "Branch.c"
}
@@ -2173,35 +2173,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
gchar* _tmp3_ = NULL;
gint _tmp3__length1 = 0;
gchar* _tmp4_ = NULL;
-#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (format != NULL, NULL);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_new0 (gchar, 64);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer = _tmp0_;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer_length1 = 64;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_buffer_size_ = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = buffer;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1__length1 = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = format;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = buffer;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3__length1 = buffer_length1;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer = (g_free (buffer), NULL);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 2207 "Branch.c"
}
diff --git a/src/events/EventDirectoryItem.c b/src/events/EventDirectoryItem.c
index f63d633..b50047a 100644
--- a/src/events/EventDirectoryItem.c
+++ b/src/events/EventDirectoryItem.c
@@ -1,4 +1,4 @@
-/* EventDirectoryItem.c generated by valac 0.32.1, the Vala compiler
+/* EventDirectoryItem.c generated by valac 0.34.4, the Vala compiler
* generated from EventDirectoryItem.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch51_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 __finally51;
+ __catch51_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:
+ __finally51:
#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 __catch52_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 __finally52;
+ __catch52_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:
+ __finally52:
#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 04ee3ff..7d16d2a 100644
--- a/src/events/EventPage.c
+++ b/src/events/EventPage.c
@@ -1,4 +1,4 @@
-/* EventPage.c generated by valac 0.32.1, the Vala compiler
+/* EventPage.c generated by valac 0.34.4, the Vala compiler
* generated from EventPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -12,9 +12,9 @@
#include <gtk/gtk.h>
#include <stdlib.h>
#include <string.h>
+#include <gio/gio.h>
#include <gee.h>
#include <gdk/gdk.h>
-#include <gio/gio.h>
#include <glib/gi18n-lib.h>
@@ -305,16 +305,6 @@ typedef struct _ViewCollectionClass ViewCollectionClass;
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define _g_free0(var) (var = (g_free (var), NULL))
-#define TYPE_APP_WINDOW (app_window_get_type ())
-#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
-#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
-#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
-#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
-#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
-
-typedef struct _AppWindow AppWindow;
-typedef struct _AppWindowClass AppWindowClass;
-
#define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ())
#define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade))
#define CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
@@ -417,6 +407,16 @@ typedef struct _CommandManagerClass CommandManagerClass;
typedef struct _MediaSource MediaSource;
typedef struct _MediaSourceClass MediaSourceClass;
+#define TYPE_APP_WINDOW (app_window_get_type ())
+#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
+#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
+#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
+#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
+#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
+
+typedef struct _AppWindow AppWindow;
+typedef struct _AppWindowClass AppWindowClass;
+
#define TYPE_LIBRARY_WINDOW (library_window_get_type ())
#define LIBRARY_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_LIBRARY_WINDOW, LibraryWindow))
#define LIBRARY_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_LIBRARY_WINDOW, LibraryWindowClass))
@@ -536,7 +536,8 @@ struct _PageClass {
void (*ready) (Page* self);
void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
- void (*add_actions) (Page* self);
+ void (*add_actions) (Page* self, GActionMap* map);
+ void (*remove_actions) (Page* self, GActionMap* map);
void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -829,10 +830,10 @@ gint view_collection_get_selected_count (ViewCollection* self);
gboolean page_on_app_key_pressed (Page* self, GdkEventKey* event);
static void event_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static void event_page_real_add_actions (Page* base);
-void page_add_actions (Page* self);
-GType app_window_get_type (void) G_GNUC_CONST;
-AppWindow* app_window_get_instance (void);
+static void event_page_real_add_actions (Page* base, GActionMap* map);
+void page_add_actions (Page* self, GActionMap* map);
+static void event_page_real_remove_actions (Page* base, GActionMap* map);
+void page_remove_actions (Page* self, GActionMap* map);
static void event_page_real_init_actions (Page* base, gint selected_count, gint count);
void page_init_actions (Page* self, gint selected_count, gint count);
static void event_page_real_update_actions (Page* base, gint selected_count, gint count);
@@ -879,6 +880,7 @@ GType media_source_get_type (void) G_GNUC_CONST;
gboolean event_set_primary_source (Event* self, MediaSource* source);
DataView* view_collection_get_selected_at (ViewCollection* self, gint index);
DataSource* data_view_get_source (DataView* self);
+GType app_window_get_type (void) G_GNUC_CONST;
GType library_window_get_type (void) G_GNUC_CONST;
LibraryWindow* library_window_get_app (void);
void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event);
@@ -935,35 +937,35 @@ static const GActionEntry EVENT_PAGE_entries[3] = {{"MakePrimary", _event_page_o
static void _event_page_on_events_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
#line 40 "/home/jens/Source/shotwell/src/events/EventPage.vala"
event_page_on_events_altered ((EventPage*) self, items);
-#line 939 "EventPage.c"
+#line 941 "EventPage.c"
}
static void _event_page_on_make_primary_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 50 "/home/jens/Source/shotwell/src/events/EventPage.vala"
event_page_on_make_primary ((EventPage*) self);
-#line 946 "EventPage.c"
+#line 948 "EventPage.c"
}
static void _event_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 50 "/home/jens/Source/shotwell/src/events/EventPage.vala"
event_page_on_rename ((EventPage*) self);
-#line 953 "EventPage.c"
+#line 955 "EventPage.c"
}
static void _media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 50 "/home/jens/Source/shotwell/src/events/EventPage.vala"
media_page_on_edit_comment ((MediaPage*) self);
-#line 960 "EventPage.c"
+#line 962 "EventPage.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 13 "/home/jens/Source/shotwell/src/events/EventPage.vala"
return self ? g_object_ref (self) : NULL;
-#line 967 "EventPage.c"
+#line 969 "EventPage.c"
}
@@ -972,7 +974,7 @@ static DataView* _media_page_create_thumbnail_create_view (DataSource* source, g
result = media_page_create_thumbnail ((MediaPage*) self, source);
#line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala"
return result;
-#line 976 "EventPage.c"
+#line 978 "EventPage.c"
}
@@ -1018,21 +1020,21 @@ EventPage* event_page_construct (GType object_type, Event* page_event) {
#line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_data_collection_unref0 (_tmp7_);
#line 16 "/home/jens/Source/shotwell/src/events/EventPage.vala"
- checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "/EventContextMenu");
+ checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "EventContextMenu");
#line 18 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp8_ = event_global;
#line 18 "/home/jens/Source/shotwell/src/events/EventPage.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _event_page_on_events_altered_data_collection_items_altered, self, 0);
#line 10 "/home/jens/Source/shotwell/src/events/EventPage.vala"
return self;
-#line 1029 "EventPage.c"
+#line 1031 "EventPage.c"
}
EventPage* event_page_new (Event* page_event) {
#line 10 "/home/jens/Source/shotwell/src/events/EventPage.vala"
return event_page_construct (TYPE_EVENT_PAGE, page_event);
-#line 1036 "EventPage.c"
+#line 1038 "EventPage.c"
}
@@ -1050,7 +1052,7 @@ Event* event_page_get_event (EventPage* self) {
result = _tmp1_;
#line 22 "/home/jens/Source/shotwell/src/events/EventPage.vala"
return result;
-#line 1054 "EventPage.c"
+#line 1056 "EventPage.c"
}
@@ -1074,7 +1076,7 @@ static gboolean event_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
_tmp2_ = gdk_keyval_name (_tmp1_);
#line 30 "/home/jens/Source/shotwell/src/events/EventPage.vala"
if (g_strcmp0 (_tmp2_, "F2") == 0) {
-#line 1078 "EventPage.c"
+#line 1080 "EventPage.c"
ViewCollection* _tmp3_ = NULL;
ViewCollection* _tmp4_ = NULL;
gint _tmp5_ = 0;
@@ -1095,7 +1097,7 @@ static gboolean event_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
result = TRUE;
#line 32 "/home/jens/Source/shotwell/src/events/EventPage.vala"
return result;
-#line 1099 "EventPage.c"
+#line 1101 "EventPage.c"
}
}
#line 36 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1106,7 +1108,7 @@ static gboolean event_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
result = _tmp8_;
#line 36 "/home/jens/Source/shotwell/src/events/EventPage.vala"
return result;
-#line 1110 "EventPage.c"
+#line 1112 "EventPage.c"
}
@@ -1126,27 +1128,74 @@ static void event_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_f
_tmp1_ = ui_filenames;
#line 47 "/home/jens/Source/shotwell/src/events/EventPage.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "event.ui");
-#line 1130 "EventPage.c"
+#line 1132 "EventPage.c"
}
-static void event_page_real_add_actions (Page* base) {
+static void event_page_real_add_actions (Page* base, GActionMap* map) {
EventPage * self;
- AppWindow* _tmp0_ = NULL;
- AppWindow* _tmp1_ = NULL;
+ GActionMap* _tmp0_ = NULL;
+ GActionMap* _tmp1_ = NULL;
#line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
+#line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+ g_return_if_fail (G_IS_ACTION_MAP (map));
#line 57 "/home/jens/Source/shotwell/src/events/EventPage.vala"
- PAGE_CLASS (event_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page));
-#line 59 "/home/jens/Source/shotwell/src/events/EventPage.vala"
- _tmp0_ = app_window_get_instance ();
-#line 59 "/home/jens/Source/shotwell/src/events/EventPage.vala"
- _tmp1_ = _tmp0_;
+ _tmp0_ = map;
+#line 57 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+ PAGE_CLASS (event_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_);
#line 59 "/home/jens/Source/shotwell/src/events/EventPage.vala"
- g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), EVENT_PAGE_entries, G_N_ELEMENTS (EVENT_PAGE_entries), self);
+ _tmp1_ = map;
#line 59 "/home/jens/Source/shotwell/src/events/EventPage.vala"
- _g_object_unref0 (_tmp1_);
-#line 1150 "EventPage.c"
+ g_action_map_add_action_entries (_tmp1_, EVENT_PAGE_entries, G_N_ELEMENTS (EVENT_PAGE_entries), self);
+#line 1152 "EventPage.c"
+}
+
+
+static void event_page_real_remove_actions (Page* base, GActionMap* map) {
+ EventPage * self;
+ GActionMap* _tmp0_ = NULL;
+#line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
+#line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+ g_return_if_fail (G_IS_ACTION_MAP (map));
+#line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+ _tmp0_ = map;
+#line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+ PAGE_CLASS (event_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_);
+#line 1167 "EventPage.c"
+ {
+ GActionEntry* entry_collection = NULL;
+ gint entry_collection_length1 = 0;
+ gint _entry_collection_size_ = 0;
+ gint entry_it = 0;
+#line 64 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+ entry_collection = EVENT_PAGE_entries;
+#line 64 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+ entry_collection_length1 = G_N_ELEMENTS (EVENT_PAGE_entries);
+#line 64 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+ for (entry_it = 0; entry_it < G_N_ELEMENTS (EVENT_PAGE_entries); entry_it = entry_it + 1) {
+#line 1179 "EventPage.c"
+ GActionEntry entry = {0};
+#line 64 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+ entry = entry_collection[entry_it];
+#line 1183 "EventPage.c"
+ {
+ GActionMap* _tmp1_ = NULL;
+ GActionEntry _tmp2_ = {0};
+ const gchar* _tmp3_ = NULL;
+#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+ _tmp1_ = map;
+#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+ _tmp2_ = entry;
+#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+ _tmp3_ = _tmp2_.name;
+#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+ g_action_map_remove_action (_tmp1_, _tmp3_);
+#line 1196 "EventPage.c"
+ }
+ }
+ }
}
@@ -1154,15 +1203,15 @@ static void event_page_real_init_actions (Page* base, gint selected_count, gint
EventPage * self;
gint _tmp0_ = 0;
gint _tmp1_ = 0;
-#line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 69 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
-#line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp0_ = selected_count;
-#line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp1_ = count;
-#line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala"
PAGE_CLASS (event_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_, _tmp1_);
-#line 1166 "EventPage.c"
+#line 1215 "EventPage.c"
}
@@ -1171,23 +1220,23 @@ static void event_page_real_update_actions (Page* base, gint selected_count, gin
gint _tmp0_ = 0;
gint _tmp1_ = 0;
gint _tmp2_ = 0;
-#line 66 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 73 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
-#line 67 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp0_ = selected_count;
-#line 67 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/events/EventPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MakePrimary", _tmp0_ == 1);
-#line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 77 "/home/jens/Source/shotwell/src/events/EventPage.vala"
page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToEvent", FALSE);
-#line 72 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp1_ = selected_count;
-#line 72 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp2_ = count;
-#line 72 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
PAGE_CLASS (event_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp1_, _tmp2_);
-#line 76 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 83 "/home/jens/Source/shotwell/src/events/EventPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditEventComment", TRUE);
-#line 1191 "EventPage.c"
+#line 1240 "EventPage.c"
}
@@ -1199,31 +1248,31 @@ static void event_page_real_get_config_photos_sort (MediaPage* base, gboolean* s
ConfigFacade* _tmp1_ = NULL;
gboolean _tmp2_ = FALSE;
gint _tmp3_ = 0;
-#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
-#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp0_ = config_facade_get_instance ();
-#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp1_ = _tmp0_;
-#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
configuration_facade_get_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), &_tmp2_, &_tmp3_);
-#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_vala_sort_order = _tmp2_;
-#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_vala_sort_by = _tmp3_;
-#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_g_object_unref0 (_tmp1_);
-#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
if (sort_order) {
-#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
*sort_order = _vala_sort_order;
-#line 1221 "EventPage.c"
+#line 1270 "EventPage.c"
}
-#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
if (sort_by) {
-#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
*sort_by = _vala_sort_by;
-#line 1227 "EventPage.c"
+#line 1276 "EventPage.c"
}
}
@@ -1234,21 +1283,21 @@ static void event_page_real_set_config_photos_sort (MediaPage* base, gboolean so
ConfigFacade* _tmp1_ = NULL;
gboolean _tmp2_ = FALSE;
gint _tmp3_ = 0;
-#line 83 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
-#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp0_ = config_facade_get_instance ();
-#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp1_ = _tmp0_;
-#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp2_ = sort_order;
-#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp3_ = sort_by;
-#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
-#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_g_object_unref0 (_tmp1_);
-#line 1252 "EventPage.c"
+#line 1301 "EventPage.c"
}
@@ -1256,33 +1305,33 @@ static void event_page_on_events_altered (EventPage* self, GeeMap* map) {
GeeMap* _tmp0_ = NULL;
Event* _tmp1_ = NULL;
gboolean _tmp2_ = FALSE;
-#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
g_return_if_fail (IS_EVENT_PAGE (self));
-#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
g_return_if_fail (GEE_IS_MAP (map));
-#line 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp0_ = map;
-#line 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp1_ = self->priv->page_event;
-#line 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp2_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
-#line 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala"
if (_tmp2_) {
-#line 1272 "EventPage.c"
+#line 1321 "EventPage.c"
Event* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
-#line 89 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp3_ = self->priv->page_event;
-#line 89 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 89 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp5_ = _tmp4_;
-#line 89 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp5_);
-#line 89 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_g_free0 (_tmp5_);
-#line 1286 "EventPage.c"
+#line 1335 "EventPage.c"
}
}
@@ -1293,21 +1342,21 @@ static void event_page_real_on_edit_comment (MediaPage* base) {
ViewCollection* _tmp1_ = NULL;
gint _tmp2_ = 0;
gboolean _tmp3_ = FALSE;
-#line 92 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
-#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp1_ = _tmp0_;
-#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp3_ = _tmp2_ == 0;
-#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_data_collection_unref0 (_tmp1_);
-#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
if (_tmp3_) {
-#line 1311 "EventPage.c"
+#line 1360 "EventPage.c"
EditCommentDialog* edit_comment_dialog = NULL;
Event* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
@@ -1325,69 +1374,69 @@ static void event_page_real_on_edit_comment (MediaPage* base) {
CommandManager* _tmp15_ = NULL;
CommandManager* _tmp16_ = NULL;
EditEventCommentCommand* _tmp17_ = NULL;
-#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp4_ = self->priv->page_event;
-#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp5_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_EVENT_SOURCE, EventSource));
-#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp6_ = _tmp5_;
-#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp7_ = edit_comment_dialog_new (_tmp6_, TRUE);
-#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp8_ = _tmp7_;
-#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_g_free0 (_tmp6_);
-#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
edit_comment_dialog = _tmp8_;
-#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp9_ = edit_comment_dialog;
-#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp10_ = edit_comment_dialog_execute (_tmp9_);
-#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/events/EventPage.vala"
new_comment = _tmp10_;
-#line 97 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp11_ = new_comment;
-#line 97 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/events/EventPage.vala"
if (_tmp11_ == NULL) {
-#line 98 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_g_free0 (new_comment);
-#line 98 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 98 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala"
return;
-#line 1359 "EventPage.c"
+#line 1408 "EventPage.c"
}
-#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp12_ = self->priv->page_event;
-#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp13_ = new_comment;
-#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp14_ = edit_event_comment_command_new (_tmp12_, _tmp13_);
-#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala"
command = _tmp14_;
-#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp15_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp16_ = _tmp15_;
-#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp17_ = command;
-#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
command_manager_execute (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_COMMAND, Command));
-#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_command_manager_unref0 (_tmp16_);
-#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_g_object_unref0 (command);
-#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_g_free0 (new_comment);
-#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
return;
-#line 1387 "EventPage.c"
+#line 1436 "EventPage.c"
}
-#line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
MEDIA_PAGE_CLASS (event_page_parent_class)->on_edit_comment (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_MEDIA_PAGE, MediaPage));
-#line 1391 "EventPage.c"
+#line 1440 "EventPage.c"
}
@@ -1403,47 +1452,47 @@ static void event_page_on_make_primary (EventPage* self) {
DataView* _tmp8_ = NULL;
DataSource* _tmp9_ = NULL;
MediaSource* _tmp10_ = NULL;
-#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 115 "/home/jens/Source/shotwell/src/events/EventPage.vala"
g_return_if_fail (IS_EVENT_PAGE (self));
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp1_ = _tmp0_;
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp3_ = _tmp2_ != 1;
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_data_collection_unref0 (_tmp1_);
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
if (_tmp3_) {
-#line 110 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/events/EventPage.vala"
return;
-#line 1423 "EventPage.c"
+#line 1472 "EventPage.c"
}
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp4_ = self->priv->page_event;
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp6_ = _tmp5_;
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp7_ = view_collection_get_selected_at (_tmp6_, 0);
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp8_ = _tmp7_;
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp9_ = data_view_get_source (_tmp8_);
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
event_set_primary_source (_tmp4_, _tmp10_);
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_g_object_unref0 (_tmp10_);
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_g_object_unref0 (_tmp8_);
-#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_data_collection_unref0 (_tmp6_);
-#line 1447 "EventPage.c"
+#line 1496 "EventPage.c"
}
@@ -1451,19 +1500,19 @@ static void event_page_on_rename (EventPage* self) {
LibraryWindow* _tmp0_ = NULL;
LibraryWindow* _tmp1_ = NULL;
Event* _tmp2_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 122 "/home/jens/Source/shotwell/src/events/EventPage.vala"
g_return_if_fail (IS_EVENT_PAGE (self));
-#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp0_ = library_window_get_app ();
-#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp1_ = _tmp0_;
-#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp2_ = self->priv->page_event;
-#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala"
library_window_rename_event_in_sidebar (_tmp1_, _tmp2_);
-#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_g_object_unref0 (_tmp1_);
-#line 1467 "EventPage.c"
+#line 1516 "EventPage.c"
}
@@ -1479,6 +1528,8 @@ static void event_page_class_init (EventPageClass * klass) {
#line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
((PageClass *) klass)->add_actions = event_page_real_add_actions;
#line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+ ((PageClass *) klass)->remove_actions = event_page_real_remove_actions;
+#line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
((PageClass *) klass)->init_actions = event_page_real_init_actions;
#line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
((PageClass *) klass)->update_actions = event_page_real_update_actions;
@@ -1490,14 +1541,14 @@ static void event_page_class_init (EventPageClass * klass) {
((MediaPageClass *) klass)->on_edit_comment = event_page_real_on_edit_comment;
#line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
G_OBJECT_CLASS (klass)->finalize = event_page_finalize;
-#line 1494 "EventPage.c"
+#line 1545 "EventPage.c"
}
static void event_page_instance_init (EventPage * self) {
#line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self->priv = EVENT_PAGE_GET_PRIVATE (self);
-#line 1501 "EventPage.c"
+#line 1552 "EventPage.c"
}
@@ -1527,7 +1578,7 @@ static void event_page_finalize (GObject* obj) {
_g_object_unref0 (self->priv->page_event);
#line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
G_OBJECT_CLASS (event_page_parent_class)->finalize (obj);
-#line 1531 "EventPage.c"
+#line 1582 "EventPage.c"
}
@@ -1559,56 +1610,56 @@ NoEventPage* no_event_page_construct (GType object_type) {
Alteration* _tmp10_ = NULL;
ViewCollectionMonitor* _tmp11_ = NULL;
ViewCollectionMonitor* _tmp12_ = NULL;
-#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = (NoEventPage*) collection_page_construct (object_type, NO_EVENT_PAGE_NAME);
-#line 141 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 148 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp0_ = no_event_page_no_event_view_manager_new (self);
-#line 141 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 148 "/home/jens/Source/shotwell/src/events/EventPage.vala"
filter = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_MANAGER, ViewManager);
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp2_ = _tmp1_;
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp3_ = library_photo_global;
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp4_ = no_event_page_no_event_page_alteration;
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp5_ = view_collection_monitor_source_collection (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_COLLECTION, SourceCollection), filter, _tmp4_, NULL, NULL, NULL);
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp6_ = _tmp5_;
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_view_collection_monitor_unref0 (_tmp6_);
-#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_data_collection_unref0 (_tmp2_);
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp8_ = _tmp7_;
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp9_ = video_global;
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp10_ = no_event_page_no_event_page_alteration;
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp11_ = view_collection_monitor_source_collection (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_SOURCE_COLLECTION, SourceCollection), filter, _tmp10_, NULL, NULL, NULL);
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp12_ = _tmp11_;
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_view_collection_monitor_unref0 (_tmp12_);
-#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_data_collection_unref0 (_tmp8_);
-#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 145 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_view_manager_unref0 (filter);
-#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 145 "/home/jens/Source/shotwell/src/events/EventPage.vala"
return self;
-#line 1605 "EventPage.c"
+#line 1656 "EventPage.c"
}
NoEventPage* no_event_page_new (void) {
-#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 145 "/home/jens/Source/shotwell/src/events/EventPage.vala"
return no_event_page_construct (TYPE_NO_EVENT_PAGE);
-#line 1612 "EventPage.c"
+#line 1663 "EventPage.c"
}
@@ -1620,31 +1671,31 @@ static void no_event_page_real_get_config_photos_sort (MediaPage* base, gboolean
ConfigFacade* _tmp1_ = NULL;
gboolean _tmp2_ = FALSE;
gint _tmp3_ = 0;
-#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NO_EVENT_PAGE, NoEventPage);
-#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp0_ = config_facade_get_instance ();
-#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp1_ = _tmp0_;
-#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
configuration_facade_get_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), &_tmp2_, &_tmp3_);
-#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_vala_sort_order = _tmp2_;
-#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_vala_sort_by = _tmp3_;
-#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_g_object_unref0 (_tmp1_);
-#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
if (sort_order) {
-#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
*sort_order = _vala_sort_order;
-#line 1642 "EventPage.c"
+#line 1693 "EventPage.c"
}
-#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
if (sort_by) {
-#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
*sort_by = _vala_sort_by;
-#line 1648 "EventPage.c"
+#line 1699 "EventPage.c"
}
}
@@ -1655,43 +1706,43 @@ static void no_event_page_real_set_config_photos_sort (MediaPage* base, gboolean
ConfigFacade* _tmp1_ = NULL;
gboolean _tmp2_ = FALSE;
gint _tmp3_ = 0;
-#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 157 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NO_EVENT_PAGE, NoEventPage);
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp0_ = config_facade_get_instance ();
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp1_ = _tmp0_;
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp2_ = sort_order;
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp3_ = sort_by;
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_g_object_unref0 (_tmp1_);
-#line 1673 "EventPage.c"
+#line 1724 "EventPage.c"
}
static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_construct (GType object_type, NoEventPage* page) {
NoEventPageNoEventViewManager* self = NULL;
NoEventPage* _tmp0_ = NULL;
-#line 125 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
g_return_val_if_fail (IS_NO_EVENT_PAGE (page), NULL);
-#line 126 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 133 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp0_ = page;
-#line 126 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 133 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = (NoEventPageNoEventViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage));
-#line 125 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
return self;
-#line 1688 "EventPage.c"
+#line 1739 "EventPage.c"
}
static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_new (NoEventPage* page) {
-#line 125 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
return no_event_page_no_event_view_manager_construct (NO_EVENT_PAGE_TYPE_NO_EVENT_VIEW_MANAGER, page);
-#line 1695 "EventPage.c"
+#line 1746 "EventPage.c"
}
@@ -1702,46 +1753,46 @@ static gboolean no_event_page_no_event_view_manager_real_include_in_view (ViewMa
DataSource* _tmp1_ = NULL;
EventID _tmp2_ = {0};
gint64 _tmp3_ = 0LL;
-#line 130 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 137 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, NO_EVENT_PAGE_TYPE_NO_EVENT_VIEW_MANAGER, NoEventPageNoEventViewManager);
-#line 130 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 137 "/home/jens/Source/shotwell/src/events/EventPage.vala"
g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp1_ = source;
-#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
media_source_get_event_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp2_);
-#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp3_ = _tmp2_.id;
-#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
if (_tmp3_ != EVENT_ID_INVALID) {
-#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp0_ = FALSE;
-#line 1720 "EventPage.c"
+#line 1771 "EventPage.c"
} else {
DataSource* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
-#line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp4_ = source;
-#line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp5_ = VIEW_MANAGER_CLASS (no_event_page_no_event_view_manager_parent_class)->include_in_view (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManager), TYPE_VIEW_MANAGER, ViewManager), _tmp4_);
-#line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp0_ = _tmp5_;
-#line 1730 "EventPage.c"
+#line 1781 "EventPage.c"
}
-#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
result = _tmp0_;
-#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
return result;
-#line 1736 "EventPage.c"
+#line 1787 "EventPage.c"
}
static void no_event_page_no_event_view_manager_class_init (NoEventPageNoEventViewManagerClass * klass) {
-#line 124 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
no_event_page_no_event_view_manager_parent_class = g_type_class_peek_parent (klass);
-#line 124 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
((ViewManagerClass *) klass)->include_in_view = no_event_page_no_event_view_manager_real_include_in_view;
-#line 1745 "EventPage.c"
+#line 1796 "EventPage.c"
}
@@ -1763,19 +1814,19 @@ static GType no_event_page_no_event_view_manager_get_type (void) {
static void no_event_page_class_init (NoEventPageClass * klass) {
Alteration* _tmp0_ = NULL;
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
no_event_page_parent_class = g_type_class_peek_parent (klass);
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
((MediaPageClass *) klass)->get_config_photos_sort = no_event_page_real_get_config_photos_sort;
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
((MediaPageClass *) klass)->set_config_photos_sort = no_event_page_real_set_config_photos_sort;
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
G_OBJECT_CLASS (klass)->finalize = no_event_page_finalize;
-#line 136 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp0_ = alteration_new ("metadata", "event");
-#line 136 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
no_event_page_no_event_page_alteration = _tmp0_;
-#line 1779 "EventPage.c"
+#line 1830 "EventPage.c"
}
@@ -1785,11 +1836,11 @@ static void no_event_page_instance_init (NoEventPage * self) {
static void no_event_page_finalize (GObject* obj) {
NoEventPage * self;
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NO_EVENT_PAGE, NoEventPage);
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
G_OBJECT_CLASS (no_event_page_parent_class)->finalize (obj);
-#line 1793 "EventPage.c"
+#line 1844 "EventPage.c"
}
diff --git a/src/events/EventPage.vala b/src/events/EventPage.vala
index 8b271d1..960eee8 100644
--- a/src/events/EventPage.vala
+++ b/src/events/EventPage.vala
@@ -13,7 +13,7 @@ public class EventPage : CollectionPage {
this.page_event = page_event;
page_event.mirror_photos(get_view(), create_thumbnail);
- init_page_context_menu("/EventContextMenu");
+ init_page_context_menu("EventContextMenu");
Event.global.items_altered.connect(on_events_altered);
}
@@ -53,10 +53,17 @@ public class EventPage : CollectionPage {
{ "EditEventComment", on_edit_comment }
};
- protected override void add_actions () {
- base.add_actions ();
+ protected override void add_actions(GLib.ActionMap map) {
+ base.add_actions(map);
- AppWindow.get_instance ().add_action_entries (entries, this);
+ map.add_action_entries(entries, this);
+ }
+
+ protected override void remove_actions(GLib.ActionMap map) {
+ base.remove_actions(map);
+ foreach (var entry in entries) {
+ map.remove_action(entry.name);
+ }
}
protected override void init_actions(int selected_count, int count) {
diff --git a/src/events/Events.c b/src/events/Events.c
index d99ab32..6c6dc44 100644
--- a/src/events/Events.c
+++ b/src/events/Events.c
@@ -1,4 +1,4 @@
-/* Events.c generated by valac 0.32.1, the Vala compiler
+/* Events.c generated by valac 0.34.4, the Vala compiler
* generated from Events.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/events/EventsDirectoryPage.c b/src/events/EventsDirectoryPage.c
index bf6b264..c31c92e 100644
--- a/src/events/EventsDirectoryPage.c
+++ b/src/events/EventsDirectoryPage.c
@@ -1,4 +1,4 @@
-/* EventsDirectoryPage.c generated by valac 0.32.1, the Vala compiler
+/* EventsDirectoryPage.c generated by valac 0.34.4, the Vala compiler
* generated from EventsDirectoryPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -12,9 +12,9 @@
#include <gtk/gtk.h>
#include <stdlib.h>
#include <string.h>
+#include <gio/gio.h>
#include <gee.h>
#include <gdk/gdk.h>
-#include <gio/gio.h>
#include <glib/gi18n-lib.h>
#include <time.h>
#include <cairo.h>
@@ -353,6 +353,7 @@ typedef struct _CheckerboardItemPrivate CheckerboardItemPrivate;
#define TYPE_DIMENSIONS (dimensions_get_type ())
typedef struct _Dimensions Dimensions;
typedef struct _EventDirectoryItemPrivate EventDirectoryItemPrivate;
+#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)))
#define TYPE_APP_WINDOW (app_window_get_type ())
#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
@@ -363,7 +364,6 @@ typedef struct _EventDirectoryItemPrivate EventDirectoryItemPrivate;
typedef struct _AppWindow AppWindow;
typedef struct _AppWindowClass AppWindowClass;
-#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)))
#define TYPE_LIBRARY_WINDOW (library_window_get_type ())
#define LIBRARY_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_LIBRARY_WINDOW, LibraryWindow))
@@ -583,7 +583,8 @@ struct _PageClass {
void (*ready) (Page* self);
void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
- void (*add_actions) (Page* self);
+ void (*add_actions) (Page* self, GActionMap* map);
+ void (*remove_actions) (Page* self, GActionMap* map);
void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -996,11 +997,11 @@ time_t event_source_get_start_time (EventSource* self);
static gint64 events_directory_page_event_descending_comparator (void* a, void* b);
static gint64 _events_directory_page_event_ascending_comparator_comparator (void* a, void* b, gpointer self);
static gint64 _events_directory_page_event_descending_comparator_comparator (void* a, void* b, gpointer self);
-static void events_directory_page_real_add_actions (Page* base);
-void page_add_actions (Page* self);
-GType app_window_get_type (void) G_GNUC_CONST;
-AppWindow* app_window_get_instance (void);
+static void events_directory_page_real_add_actions (Page* base, GActionMap* map);
+void page_add_actions (Page* self, GActionMap* map);
static GVariant* _variant_new14 (gboolean value);
+static void events_directory_page_real_remove_actions (Page* base, GActionMap* map);
+void page_remove_actions (Page* self, GActionMap* map);
static void events_directory_page_real_init_actions (Page* base, gint selected_count, gint count);
void page_init_actions (Page* self, gint selected_count, gint count);
static void events_directory_page_real_update_actions (Page* base, gint selected_count, gint count);
@@ -1010,6 +1011,7 @@ void page_update_actions (Page* self, gint selected_count, gint count);
static gchar* events_directory_page_real_get_view_empty_message (CheckerboardPage* base);
static gchar* events_directory_page_real_get_filter_no_match_message (CheckerboardPage* base);
static void events_directory_page_real_on_item_activated (CheckerboardPage* base, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers);
+GType app_window_get_type (void) G_GNUC_CONST;
GType library_window_get_type (void) G_GNUC_CONST;
LibraryWindow* library_window_get_app (void);
void library_window_switch_to_event (LibraryWindow* self, Event* event);
@@ -1130,42 +1132,42 @@ static const GActionEntry EVENTS_DIRECTORY_PAGE_entries[4] = {{"Rename", _events
static void _events_directory_page_on_sort_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self) {
#line 77 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
events_directory_page_on_sort_changed ((EventsDirectoryPage*) self, _sender, value);
-#line 1134 "EventsDirectoryPage.c"
+#line 1136 "EventsDirectoryPage.c"
}
static void _events_directory_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
events_directory_page_on_rename ((EventsDirectoryPage*) self);
-#line 1141 "EventsDirectoryPage.c"
+#line 1143 "EventsDirectoryPage.c"
}
static void _events_directory_page_on_merge_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
events_directory_page_on_merge ((EventsDirectoryPage*) self);
-#line 1148 "EventsDirectoryPage.c"
+#line 1150 "EventsDirectoryPage.c"
}
static void _events_directory_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
events_directory_page_on_edit_comment ((EventsDirectoryPage*) self);
-#line 1155 "EventsDirectoryPage.c"
+#line 1157 "EventsDirectoryPage.c"
}
static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
page_on_action_toggle ((Page*) self, action, parameter);
-#line 1162 "EventsDirectoryPage.c"
+#line 1164 "EventsDirectoryPage.c"
}
static void _events_directory_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
#line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
events_directory_page_on_display_comments ((EventsDirectoryPage*) self, action, value);
-#line 1169 "EventsDirectoryPage.c"
+#line 1171 "EventsDirectoryPage.c"
}
@@ -1174,14 +1176,14 @@ static gboolean _events_directory_page_event_comparator_predicate_comparator_pre
result = events_directory_page_event_comparator_predicate (object, alteration);
#line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 1178 "EventsDirectoryPage.c"
+#line 1180 "EventsDirectoryPage.c"
}
static gpointer _view_manager_ref0 (gpointer self) {
#line 59 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return self ? view_manager_ref (self) : NULL;
-#line 1185 "EventsDirectoryPage.c"
+#line 1187 "EventsDirectoryPage.c"
}
@@ -1336,7 +1338,7 @@ EventsDirectoryPage* events_directory_page_construct (GType object_type, const g
_g_object_unref0 (toolbar);
#line 45 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return self;
-#line 1340 "EventsDirectoryPage.c"
+#line 1342 "EventsDirectoryPage.c"
}
@@ -1356,7 +1358,7 @@ static void events_directory_page_real_init_collect_ui_filenames (Page* base, Ge
_tmp1_ = ui_filenames;
#line 83 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
PAGE_CLASS (events_directory_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp1_);
-#line 1360 "EventsDirectoryPage.c"
+#line 1362 "EventsDirectoryPage.c"
}
@@ -1376,7 +1378,7 @@ gboolean events_directory_page_event_comparator_predicate (DataObject* object, A
result = _tmp1_;
#line 87 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 1380 "EventsDirectoryPage.c"
+#line 1382 "EventsDirectoryPage.c"
}
@@ -1410,7 +1412,7 @@ static gint64 events_directory_page_event_ascending_comparator (void* a, void* b
result = (gint64) (start_a - start_b);
#line 94 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 1414 "EventsDirectoryPage.c"
+#line 1416 "EventsDirectoryPage.c"
}
@@ -1429,7 +1431,7 @@ static gint64 events_directory_page_event_descending_comparator (void* a, void*
result = _tmp2_;
#line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 1433 "EventsDirectoryPage.c"
+#line 1435 "EventsDirectoryPage.c"
}
@@ -1438,7 +1440,7 @@ static gint64 _events_directory_page_event_ascending_comparator_comparator (void
result = events_directory_page_event_ascending_comparator (a, b);
#line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 1442 "EventsDirectoryPage.c"
+#line 1444 "EventsDirectoryPage.c"
}
@@ -1447,7 +1449,7 @@ static gint64 _events_directory_page_event_descending_comparator_comparator (voi
result = events_directory_page_event_descending_comparator (a, b);
#line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 1451 "EventsDirectoryPage.c"
+#line 1453 "EventsDirectoryPage.c"
}
@@ -1458,7 +1460,7 @@ static Comparator events_directory_page_get_event_comparator (gboolean ascending
_tmp0_ = ascending;
#line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
if (_tmp0_) {
-#line 1462 "EventsDirectoryPage.c"
+#line 1464 "EventsDirectoryPage.c"
Comparator _tmp1_ = NULL;
void* _tmp1__target = NULL;
GDestroyNotify _tmp1__target_destroy_notify = NULL;
@@ -1476,7 +1478,7 @@ static Comparator events_directory_page_get_event_comparator (gboolean ascending
result = _tmp1_;
#line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 1480 "EventsDirectoryPage.c"
+#line 1482 "EventsDirectoryPage.c"
} else {
Comparator _tmp2_ = NULL;
void* _tmp2__target = NULL;
@@ -1495,7 +1497,7 @@ static Comparator events_directory_page_get_event_comparator (gboolean ascending
result = _tmp2_;
#line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 1499 "EventsDirectoryPage.c"
+#line 1501 "EventsDirectoryPage.c"
}
}
@@ -1503,14 +1505,14 @@ static Comparator events_directory_page_get_event_comparator (gboolean ascending
static GVariant* _variant_new14 (gboolean value) {
#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 1507 "EventsDirectoryPage.c"
+#line 1509 "EventsDirectoryPage.c"
}
-static void events_directory_page_real_add_actions (Page* base) {
+static void events_directory_page_real_add_actions (Page* base, GActionMap* map) {
EventsDirectoryPage * self;
- AppWindow* _tmp0_ = NULL;
- AppWindow* _tmp1_ = NULL;
+ GActionMap* _tmp0_ = NULL;
+ GActionMap* _tmp1_ = NULL;
gboolean display_comments = FALSE;
ConfigFacade* _tmp2_ = NULL;
ConfigFacade* _tmp3_ = NULL;
@@ -1521,16 +1523,16 @@ static void events_directory_page_real_add_actions (Page* base) {
GVariant* _tmp8_ = NULL;
#line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
+#line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+ g_return_if_fail (G_IS_ACTION_MAP (map));
#line 118 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- PAGE_CLASS (events_directory_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page));
-#line 119 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- _tmp0_ = app_window_get_instance ();
-#line 119 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- _tmp1_ = _tmp0_;
+ _tmp0_ = map;
+#line 118 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+ PAGE_CLASS (events_directory_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
#line 119 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), EVENTS_DIRECTORY_PAGE_entries, G_N_ELEMENTS (EVENTS_DIRECTORY_PAGE_entries), self);
+ _tmp1_ = map;
#line 119 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- _g_object_unref0 (_tmp1_);
+ g_action_map_add_action_entries (_tmp1_, EVENTS_DIRECTORY_PAGE_entries, G_N_ELEMENTS (EVENTS_DIRECTORY_PAGE_entries), self);
#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp2_ = config_facade_get_instance ();
#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1555,7 +1557,54 @@ static void events_directory_page_real_add_actions (Page* base) {
_g_variant_unref0 (_tmp8_);
#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (_tmp7_);
-#line 1559 "EventsDirectoryPage.c"
+#line 1561 "EventsDirectoryPage.c"
+}
+
+
+static void events_directory_page_real_remove_actions (Page* base, GActionMap* map) {
+ EventsDirectoryPage * self;
+ GActionMap* _tmp0_ = NULL;
+#line 125 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
+#line 125 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+ g_return_if_fail (G_IS_ACTION_MAP (map));
+#line 126 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+ _tmp0_ = map;
+#line 126 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+ PAGE_CLASS (events_directory_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
+#line 1576 "EventsDirectoryPage.c"
+ {
+ GActionEntry* entry_collection = NULL;
+ gint entry_collection_length1 = 0;
+ gint _entry_collection_size_ = 0;
+ gint entry_it = 0;
+#line 127 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+ entry_collection = EVENTS_DIRECTORY_PAGE_entries;
+#line 127 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+ entry_collection_length1 = G_N_ELEMENTS (EVENTS_DIRECTORY_PAGE_entries);
+#line 127 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+ for (entry_it = 0; entry_it < G_N_ELEMENTS (EVENTS_DIRECTORY_PAGE_entries); entry_it = entry_it + 1) {
+#line 1588 "EventsDirectoryPage.c"
+ GActionEntry entry = {0};
+#line 127 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+ entry = entry_collection[entry_it];
+#line 1592 "EventsDirectoryPage.c"
+ {
+ GActionMap* _tmp1_ = NULL;
+ GActionEntry _tmp2_ = {0};
+ const gchar* _tmp3_ = NULL;
+#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+ _tmp1_ = map;
+#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+ _tmp2_ = entry;
+#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+ _tmp3_ = _tmp2_.name;
+#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+ g_action_map_remove_action (_tmp1_, _tmp3_);
+#line 1605 "EventsDirectoryPage.c"
+ }
+ }
+ }
}
@@ -1566,33 +1615,33 @@ static void events_directory_page_real_init_actions (Page* base, gint selected_c
GSimpleAction* action = NULL;
GAction* _tmp2_ = NULL;
GSimpleAction* _tmp3_ = NULL;
-#line 125 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 132 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 126 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 133 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = selected_count;
-#line 126 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 133 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = count;
-#line 126 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 133 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
PAGE_CLASS (events_directory_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_, _tmp1_);
-#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSortEvents");
-#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL;
-#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
if (_tmp3_ == NULL) {
-#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (_tmp2_);
-#line 1586 "EventsDirectoryPage.c"
+#line 1635 "EventsDirectoryPage.c"
}
-#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
action = _tmp3_;
-#line 129 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 136 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_vala_assert (action != NULL, "action != null");
-#line 130 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 137 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_signal_connect_object (action, "change-state", (GCallback) _events_directory_page_on_sort_changed_g_simple_action_change_state, self, 0);
-#line 125 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 132 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (action);
-#line 1596 "EventsDirectoryPage.c"
+#line 1645 "EventsDirectoryPage.c"
}
@@ -1603,29 +1652,29 @@ static void events_directory_page_real_update_actions (Page* base, gint selected
gint _tmp2_ = 0;
gint _tmp3_ = 0;
gint _tmp4_ = 0;
-#line 133 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 140 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 134 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 141 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = selected_count;
-#line 134 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 141 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Merge", _tmp0_ > 1);
-#line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 142 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Merge", TRUE);
-#line 136 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = selected_count;
-#line 136 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rename", _tmp1_ == 1);
-#line 137 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 144 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp2_ = selected_count;
-#line 137 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 144 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditComment", _tmp2_ == 1);
-#line 139 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 146 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp3_ = selected_count;
-#line 139 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 146 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp4_ = count;
-#line 139 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 146 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
PAGE_CLASS (events_directory_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp3_, _tmp4_);
-#line 1629 "EventsDirectoryPage.c"
+#line 1678 "EventsDirectoryPage.c"
}
@@ -1634,17 +1683,17 @@ static gchar* events_directory_page_real_get_view_empty_message (CheckerboardPag
gchar* result = NULL;
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 142 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = _ ("No events");
-#line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
result = _tmp1_;
-#line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 1648 "EventsDirectoryPage.c"
+#line 1697 "EventsDirectoryPage.c"
}
@@ -1653,24 +1702,24 @@ static gchar* events_directory_page_real_get_filter_no_match_message (Checkerboa
gchar* result = NULL;
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 146 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 147 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = _ ("No events found");
-#line 147 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 147 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
result = _tmp1_;
-#line 147 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 1667 "EventsDirectoryPage.c"
+#line 1716 "EventsDirectoryPage.c"
}
static gpointer _g_object_ref0 (gpointer self) {
-#line 152 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return self ? g_object_ref (self) : NULL;
-#line 1674 "EventsDirectoryPage.c"
+#line 1723 "EventsDirectoryPage.c"
}
@@ -1682,31 +1731,31 @@ static void events_directory_page_real_on_item_activated (CheckerboardPage* base
LibraryWindow* _tmp2_ = NULL;
LibraryWindow* _tmp3_ = NULL;
Event* _tmp4_ = NULL;
-#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_if_fail (modifiers != NULL);
-#line 152 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = item;
-#line 152 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem));
-#line 152 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
event = _tmp1_;
-#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp2_ = library_window_get_app ();
-#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp3_ = _tmp2_;
-#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp4_ = event->event;
-#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
library_window_switch_to_event (_tmp3_, _tmp4_);
-#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (_tmp3_);
-#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (event);
-#line 1710 "EventsDirectoryPage.c"
+#line 1759 "EventsDirectoryPage.c"
}
@@ -1723,45 +1772,45 @@ static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GS
GDestroyNotify _tmp7__target_destroy_notify = NULL;
GSimpleAction* _tmp8_ = NULL;
GVariant* _tmp9_ = NULL;
-#line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
-#line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = _tmp0_;
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp2_ = value;
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp3_ = g_variant_get_string (_tmp2_, NULL);
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp6_ = events_directory_page_get_event_comparator (g_strcmp0 (_tmp3_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0, &_tmp4_, &_tmp5_);
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp7_ = _tmp6_;
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp7__target = _tmp4_;
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp7__target_destroy_notify = _tmp5_;
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), _tmp7_, _tmp4_, _events_directory_page_event_comparator_predicate_comparator_predicate, NULL);
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
(_tmp7__target_destroy_notify == NULL) ? NULL : (_tmp7__target_destroy_notify (_tmp7__target), NULL);
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp7_ = NULL;
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp7__target = NULL;
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp7__target_destroy_notify = NULL;
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_data_collection_unref0 (_tmp1_);
-#line 161 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp8_ = action;
-#line 161 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp9_ = value;
-#line 161 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_simple_action_set_state (_tmp8_, _tmp9_);
-#line 1765 "EventsDirectoryPage.c"
+#line 1814 "EventsDirectoryPage.c"
}
@@ -1794,101 +1843,101 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) {
CommandManager* _tmp21_ = NULL;
CommandManager* _tmp22_ = NULL;
RenameEventCommand* _tmp23_ = NULL;
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
-#line 166 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 166 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = _tmp0_;
-#line 166 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 166 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp3_ = _tmp2_ != 1;
-#line 166 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_data_collection_unref0 (_tmp1_);
-#line 166 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
if (_tmp3_) {
-#line 167 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 174 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return;
-#line 1814 "EventsDirectoryPage.c"
+#line 1863 "EventsDirectoryPage.c"
}
-#line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp5_ = _tmp4_;
-#line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
-#line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_data_collection_unref0 (_tmp5_);
-#line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
item = _tmp7_;
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp8_ = item;
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp9_ = _tmp8_->event;
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp10_ = event_get_raw_name (_tmp9_);
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp11_ = _tmp10_;
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp12_ = event_rename_dialog_new (_tmp11_);
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp13_ = _tmp12_;
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_free0 (_tmp11_);
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
rename_dialog = _tmp13_;
-#line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 179 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp14_ = rename_dialog;
-#line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 179 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp15_ = event_rename_dialog_execute (_tmp14_);
-#line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 179 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
new_name = _tmp15_;
-#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp16_ = new_name;
-#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
if (_tmp16_ == NULL) {
-#line 174 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 181 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_free0 (new_name);
-#line 174 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 181 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_text_entry_dialog_mediator_unref0 (rename_dialog);
-#line 174 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 181 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (item);
-#line 174 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 181 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return;
-#line 1862 "EventsDirectoryPage.c"
+#line 1911 "EventsDirectoryPage.c"
}
-#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp17_ = item;
-#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp18_ = _tmp17_->event;
-#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp19_ = new_name;
-#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp20_ = rename_event_command_new (_tmp18_, _tmp19_);
-#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
command = _tmp20_;
-#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp22_ = _tmp21_;
-#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp23_ = command;
-#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
-#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_command_manager_unref0 (_tmp22_);
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (command);
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_free0 (new_name);
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_text_entry_dialog_mediator_unref0 (rename_dialog);
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (item);
-#line 1892 "EventsDirectoryPage.c"
+#line 1941 "EventsDirectoryPage.c"
}
@@ -1921,101 +1970,101 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
CommandManager* _tmp21_ = NULL;
CommandManager* _tmp22_ = NULL;
EditEventCommentCommand* _tmp23_ = NULL;
-#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
-#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = _tmp0_;
-#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp3_ = _tmp2_ != 1;
-#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_data_collection_unref0 (_tmp1_);
-#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
if (_tmp3_) {
-#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 190 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return;
-#line 1941 "EventsDirectoryPage.c"
+#line 1990 "EventsDirectoryPage.c"
}
-#line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp5_ = _tmp4_;
-#line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
-#line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_data_collection_unref0 (_tmp5_);
-#line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
item = _tmp7_;
-#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp8_ = item;
-#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp9_ = _tmp8_->event;
-#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp10_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_EVENT_SOURCE, EventSource));
-#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp11_ = _tmp10_;
-#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp12_ = edit_comment_dialog_new (_tmp11_, FALSE);
-#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp13_ = _tmp12_;
-#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_free0 (_tmp11_);
-#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
edit_comment_dialog = _tmp13_;
-#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp14_ = edit_comment_dialog;
-#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp15_ = edit_comment_dialog_execute (_tmp14_);
-#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
new_comment = _tmp15_;
-#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp16_ = new_comment;
-#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
if (_tmp16_ == NULL) {
-#line 190 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_free0 (new_comment);
-#line 190 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 190 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (item);
-#line 190 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return;
-#line 1989 "EventsDirectoryPage.c"
+#line 2038 "EventsDirectoryPage.c"
}
-#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp17_ = item;
-#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp18_ = _tmp17_->event;
-#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp19_ = new_comment;
-#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp20_ = edit_event_comment_command_new (_tmp18_, _tmp19_);
-#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
command = _tmp20_;
-#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp22_ = _tmp21_;
-#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp23_ = command;
-#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
-#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_command_manager_unref0 (_tmp22_);
-#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (command);
-#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_free0 (new_comment);
-#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (item);
-#line 2019 "EventsDirectoryPage.c"
+#line 2068 "EventsDirectoryPage.c"
}
@@ -2034,55 +2083,55 @@ static void events_directory_page_on_merge (EventsDirectoryPage* self) {
CommandManager* _tmp10_ = NULL;
CommandManager* _tmp11_ = NULL;
MergeEventsCommand* _tmp12_ = NULL;
-#line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = _tmp0_;
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp3_ = _tmp2_ <= 1;
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_data_collection_unref0 (_tmp1_);
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
if (_tmp3_) {
-#line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 205 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return;
-#line 2054 "EventsDirectoryPage.c"
+#line 2103 "EventsDirectoryPage.c"
}
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp5_ = _tmp4_;
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp7_ = _tmp6_;
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp8_ = merge_events_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp9_ = _tmp8_;
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (_tmp7_);
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_data_collection_unref0 (_tmp5_);
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
command = _tmp9_;
-#line 201 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 201 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp11_ = _tmp10_;
-#line 201 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp12_ = command;
-#line 201 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 201 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_command_manager_unref0 (_tmp11_);
-#line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (command);
-#line 2086 "EventsDirectoryPage.c"
+#line 2135 "EventsDirectoryPage.c"
}
@@ -2094,40 +2143,40 @@ static void events_directory_page_on_display_comments (EventsDirectoryPage* self
ConfigFacade* _tmp3_ = NULL;
GSimpleAction* _tmp4_ = NULL;
GVariant* _tmp5_ = NULL;
-#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
-#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 205 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = value;
-#line 205 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 205 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
display = _tmp1_;
-#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
checkerboard_page_set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display);
-#line 209 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 216 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp2_ = config_facade_get_instance ();
-#line 209 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 216 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp3_ = _tmp2_;
-#line 209 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 216 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
configuration_facade_set_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
-#line 209 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 216 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (_tmp3_);
-#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp4_ = action;
-#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp5_ = value;
-#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 2124 "EventsDirectoryPage.c"
+#line 2173 "EventsDirectoryPage.c"
}
static gpointer _view_filter_ref0 (gpointer self) {
-#line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return self ? view_filter_ref (self) : NULL;
-#line 2131 "EventsDirectoryPage.c"
+#line 2180 "EventsDirectoryPage.c"
}
@@ -2136,17 +2185,17 @@ static SearchViewFilter* events_directory_page_real_get_search_view_filter (Chec
SearchViewFilter* result = NULL;
EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_ = NULL;
SearchViewFilter* _tmp1_ = NULL;
-#line 214 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 221 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = self->priv->search_filter;
-#line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
result = _tmp1_;
-#line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2150 "EventsDirectoryPage.c"
+#line 2199 "EventsDirectoryPage.c"
}
@@ -2167,7 +2216,7 @@ static DataView* events_directory_page_event_directory_manager_real_create_view
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
#line 10 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2171 "EventsDirectoryPage.c"
+#line 2220 "EventsDirectoryPage.c"
}
@@ -2177,14 +2226,14 @@ EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_
self = (EventsDirectoryPageEventDirectoryManager*) view_manager_construct (object_type);
#line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return self;
-#line 2181 "EventsDirectoryPage.c"
+#line 2230 "EventsDirectoryPage.c"
}
EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_manager_new (void) {
#line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return events_directory_page_event_directory_manager_construct (EVENTS_DIRECTORY_PAGE_TYPE_EVENT_DIRECTORY_MANAGER);
-#line 2188 "EventsDirectoryPage.c"
+#line 2237 "EventsDirectoryPage.c"
}
@@ -2193,7 +2242,7 @@ static void events_directory_page_event_directory_manager_class_init (EventsDire
events_directory_page_event_directory_manager_parent_class = g_type_class_peek_parent (klass);
#line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
((ViewManagerClass *) klass)->create_view = events_directory_page_event_directory_manager_real_create_view;
-#line 2197 "EventsDirectoryPage.c"
+#line 2246 "EventsDirectoryPage.c"
}
@@ -2222,7 +2271,7 @@ static guint events_directory_page_events_directory_search_view_filter_real_get_
result = (guint) SEARCH_FILTER_CRITERIA_TEXT;
#line 16 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2226 "EventsDirectoryPage.c"
+#line 2275 "EventsDirectoryPage.c"
}
@@ -2230,19 +2279,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
gboolean result = FALSE;
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 2246 "EventsDirectoryPage.c"
+#line 2295 "EventsDirectoryPage.c"
}
@@ -2288,7 +2337,7 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
result = TRUE;
#line 22 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2292 "EventsDirectoryPage.c"
+#line 2341 "EventsDirectoryPage.c"
}
#line 24 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp5_ = view;
@@ -2314,11 +2363,11 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
_g_object_unref0 (source);
#line 27 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2318 "EventsDirectoryPage.c"
+#line 2367 "EventsDirectoryPage.c"
}
#line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp12_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp11_);
-#line 2322 "EventsDirectoryPage.c"
+#line 2371 "EventsDirectoryPage.c"
{
gchar** word_collection = NULL;
gint word_collection_length1 = 0;
@@ -2330,11 +2379,11 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
word_collection_length1 = _tmp11_;
#line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
for (word_it = 0; word_it < _tmp11_; word_it = word_it + 1) {
-#line 2334 "EventsDirectoryPage.c"
+#line 2383 "EventsDirectoryPage.c"
const gchar* word = NULL;
#line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
word = word_collection[word_it];
-#line 2338 "EventsDirectoryPage.c"
+#line 2387 "EventsDirectoryPage.c"
{
const gchar* _tmp13_ = NULL;
const gchar* _tmp14_ = NULL;
@@ -2353,7 +2402,7 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
_g_object_unref0 (source);
#line 32 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2357 "EventsDirectoryPage.c"
+#line 2406 "EventsDirectoryPage.c"
}
}
}
@@ -2364,7 +2413,7 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
_g_object_unref0 (source);
#line 35 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2368 "EventsDirectoryPage.c"
+#line 2417 "EventsDirectoryPage.c"
}
@@ -2374,14 +2423,14 @@ static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page
self = (EventsDirectoryPageEventsDirectorySearchViewFilter*) search_view_filter_construct (object_type);
#line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return self;
-#line 2378 "EventsDirectoryPage.c"
+#line 2427 "EventsDirectoryPage.c"
}
static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page_events_directory_search_view_filter_new (void) {
#line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return events_directory_page_events_directory_search_view_filter_construct (EVENTS_DIRECTORY_PAGE_TYPE_EVENTS_DIRECTORY_SEARCH_VIEW_FILTER);
-#line 2385 "EventsDirectoryPage.c"
+#line 2434 "EventsDirectoryPage.c"
}
@@ -2392,7 +2441,7 @@ static void events_directory_page_events_directory_search_view_filter_class_init
((SearchViewFilterClass *) klass)->get_criteria = events_directory_page_events_directory_search_view_filter_real_get_criteria;
#line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
((ViewFilterClass *) klass)->predicate = events_directory_page_events_directory_search_view_filter_real_predicate;
-#line 2396 "EventsDirectoryPage.c"
+#line 2445 "EventsDirectoryPage.c"
}
@@ -2422,6 +2471,8 @@ static void events_directory_page_class_init (EventsDirectoryPageClass * klass)
#line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
((PageClass *) klass)->add_actions = events_directory_page_real_add_actions;
#line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+ ((PageClass *) klass)->remove_actions = events_directory_page_real_remove_actions;
+#line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
((PageClass *) klass)->init_actions = events_directory_page_real_init_actions;
#line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
((PageClass *) klass)->update_actions = events_directory_page_real_update_actions;
@@ -2435,7 +2486,7 @@ static void events_directory_page_class_init (EventsDirectoryPageClass * klass)
((CheckerboardPageClass *) klass)->get_search_view_filter = events_directory_page_real_get_search_view_filter;
#line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
G_OBJECT_CLASS (klass)->finalize = events_directory_page_finalize;
-#line 2439 "EventsDirectoryPage.c"
+#line 2490 "EventsDirectoryPage.c"
}
@@ -2447,7 +2498,7 @@ static void events_directory_page_instance_init (EventsDirectoryPage * self) {
_tmp0_ = events_directory_page_events_directory_search_view_filter_new ();
#line 43 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self->priv->search_filter = _tmp0_;
-#line 2451 "EventsDirectoryPage.c"
+#line 2502 "EventsDirectoryPage.c"
}
@@ -2469,7 +2520,7 @@ static void events_directory_page_finalize (GObject* obj) {
if (_tmp1_ == NULL) {
#line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (_tmp0_);
-#line 2473 "EventsDirectoryPage.c"
+#line 2524 "EventsDirectoryPage.c"
}
#line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
action = _tmp1_;
@@ -2491,7 +2542,7 @@ static void events_directory_page_finalize (GObject* obj) {
_view_filter_unref0 (self->priv->search_filter);
#line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
G_OBJECT_CLASS (events_directory_page_parent_class)->finalize (obj);
-#line 2495 "EventsDirectoryPage.c"
+#line 2546 "EventsDirectoryPage.c"
}
@@ -2514,39 +2565,39 @@ MasterEventsDirectoryPage* master_events_directory_page_construct (GType object_
EventSourceCollection* _tmp2_ = NULL;
GeeCollection* _tmp3_ = NULL;
GeeCollection* _tmp4_ = NULL;
-#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = events_directory_page_event_directory_manager_new ();
-#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = _tmp0_;
-#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp2_ = event_global;
-#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp3_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection));
-#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = (MasterEventsDirectoryPage*) events_directory_page_construct (object_type, MASTER_EVENTS_DIRECTORY_PAGE_NAME, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_VIEW_MANAGER, ViewManager), _tmp4_);
-#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (_tmp4_);
-#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_view_manager_unref0 (_tmp1_);
-#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 229 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return self;
-#line 2536 "EventsDirectoryPage.c"
+#line 2587 "EventsDirectoryPage.c"
}
MasterEventsDirectoryPage* master_events_directory_page_new (void) {
-#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 229 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return master_events_directory_page_construct (TYPE_MASTER_EVENTS_DIRECTORY_PAGE);
-#line 2543 "EventsDirectoryPage.c"
+#line 2594 "EventsDirectoryPage.c"
}
static void master_events_directory_page_class_init (MasterEventsDirectoryPageClass * klass) {
-#line 219 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 226 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
master_events_directory_page_parent_class = g_type_class_peek_parent (klass);
-#line 2550 "EventsDirectoryPage.c"
+#line 2601 "EventsDirectoryPage.c"
}
@@ -2590,37 +2641,37 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
gchar* _tmp3_ = NULL;
gint _tmp3__length1 = 0;
gchar* _tmp4_ = NULL;
-#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (format != NULL, NULL);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_new0 (gchar, 64);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer = _tmp0_;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer_length1 = 64;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_buffer_size_ = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = buffer;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1__length1 = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = format;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = buffer;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3__length1 = buffer_length1;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer = (g_free (buffer), NULL);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 2624 "EventsDirectoryPage.c"
+#line 2675 "EventsDirectoryPage.c"
}
@@ -2633,71 +2684,71 @@ SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type,
struct tm _tmp7_ = {0};
SubEventsDirectoryPageSubEventDirectoryManager* _tmp8_ = NULL;
SubEventsDirectoryPageSubEventDirectoryManager* _tmp9_ = NULL;
-#line 280 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_val_if_fail (time != NULL, NULL);
-#line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = type;
-#line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED) {
-#line 2643 "EventsDirectoryPage.c"
+#line 2694 "EventsDirectoryPage.c"
gchar* _tmp1_ = NULL;
-#line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = g_strdup (SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME);
-#line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_free0 (page_name);
-#line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
page_name = _tmp1_;
-#line 2651 "EventsDirectoryPage.c"
+#line 2702 "EventsDirectoryPage.c"
} else {
const gchar* _tmp2_ = NULL;
SubEventsDirectoryPageDirectoryType _tmp3_ = 0;
gchar* _tmp4_ = NULL;
-#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp3_ = type;
-#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
if (_tmp3_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR) {
-#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT;
-#line 2662 "EventsDirectoryPage.c"
+#line 2713 "EventsDirectoryPage.c"
} else {
-#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT;
-#line 2666 "EventsDirectoryPage.c"
+#line 2717 "EventsDirectoryPage.c"
}
-#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp4_ = g_time_format (time, _tmp2_);
-#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_free0 (page_name);
-#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
page_name = _tmp4_;
-#line 2674 "EventsDirectoryPage.c"
+#line 2725 "EventsDirectoryPage.c"
}
-#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp5_ = page_name;
-#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp6_ = type;
-#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp7_ = *time;
-#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp8_ = sub_events_directory_page_sub_event_directory_manager_new (_tmp6_, &_tmp7_);
-#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp9_ = _tmp8_;
-#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = (SubEventsDirectoryPage*) events_directory_page_construct (object_type, _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_VIEW_MANAGER, ViewManager), NULL);
-#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_view_manager_unref0 (_tmp9_);
-#line 280 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_free0 (page_name);
-#line 280 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return self;
-#line 2694 "EventsDirectoryPage.c"
+#line 2745 "EventsDirectoryPage.c"
}
SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) {
-#line 280 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return sub_events_directory_page_construct (TYPE_SUB_EVENTS_DIRECTORY_PAGE, type, time);
-#line 2701 "EventsDirectoryPage.c"
+#line 2752 "EventsDirectoryPage.c"
}
@@ -2705,17 +2756,17 @@ gint sub_events_directory_page_get_month (SubEventsDirectoryPage* self) {
gint result = 0;
ViewManager* _tmp0_ = NULL;
gint _tmp1_ = 0;
-#line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0);
-#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage)->view_manager;
-#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = sub_events_directory_page_sub_event_directory_manager_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager));
-#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
result = _tmp1_;
-#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2719 "EventsDirectoryPage.c"
+#line 2770 "EventsDirectoryPage.c"
}
@@ -2723,17 +2774,17 @@ gint sub_events_directory_page_get_year (SubEventsDirectoryPage* self) {
gint result = 0;
ViewManager* _tmp0_ = NULL;
gint _tmp1_ = 0;
-#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0);
-#line 296 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage)->view_manager;
-#line 296 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = sub_events_directory_page_sub_event_directory_manager_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager));
-#line 296 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
result = _tmp1_;
-#line 296 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2737 "EventsDirectoryPage.c"
+#line 2788 "EventsDirectoryPage.c"
}
@@ -2741,17 +2792,17 @@ SubEventsDirectoryPageDirectoryType sub_events_directory_page_get_event_director
SubEventsDirectoryPageDirectoryType result = 0;
ViewManager* _tmp0_ = NULL;
SubEventsDirectoryPageDirectoryType _tmp1_ = 0;
-#line 299 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0);
-#line 300 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage)->view_manager;
-#line 300 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager));
-#line 300 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
result = _tmp1_;
-#line 300 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2755 "EventsDirectoryPage.c"
+#line 2806 "EventsDirectoryPage.c"
}
@@ -2761,60 +2812,60 @@ static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page
SubEventsDirectoryPageDirectoryType _tmp3_ = 0;
struct tm _tmp4_ = {0};
gint _tmp5_ = 0;
-#line 243 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 250 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_val_if_fail (time != NULL, NULL);
-#line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = (SubEventsDirectoryPageSubEventDirectoryManager*) events_directory_page_event_directory_manager_construct (object_type);
-#line 246 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = type;
-#line 246 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) {
-#line 2773 "EventsDirectoryPage.c"
+#line 2824 "EventsDirectoryPage.c"
struct tm _tmp1_ = {0};
gint _tmp2_ = 0;
-#line 247 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = *time;
-#line 247 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp2_ = _tmp1_.tm_mon;
-#line 247 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self->priv->month = _tmp2_;
-#line 2782 "EventsDirectoryPage.c"
+#line 2833 "EventsDirectoryPage.c"
}
-#line 248 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp3_ = type;
-#line 248 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self->priv->type = _tmp3_;
-#line 249 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp4_ = *time;
-#line 249 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp5_ = _tmp4_.tm_year;
-#line 249 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self->priv->year = _tmp5_;
-#line 243 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 250 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return self;
-#line 2796 "EventsDirectoryPage.c"
+#line 2847 "EventsDirectoryPage.c"
}
static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) {
-#line 243 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 250 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return sub_events_directory_page_sub_event_directory_manager_construct (SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, type, time);
-#line 2803 "EventsDirectoryPage.c"
+#line 2854 "EventsDirectoryPage.c"
}
static void g_time_local (time_t time, struct tm* result) {
struct tm _result_ = {0};
struct tm _tmp0_ = {0};
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
localtime_r (&time, &_tmp0_);
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*result = _result_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return;
-#line 2818 "EventsDirectoryPage.c"
+#line 2869 "EventsDirectoryPage.c"
}
@@ -2833,162 +2884,162 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
struct tm _tmp7_ = {0};
gint _tmp8_ = 0;
gint _tmp9_ = 0;
-#line 252 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager);
-#line 252 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = source;
-#line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = VIEW_MANAGER_CLASS (sub_events_directory_page_sub_event_directory_manager_parent_class)->include_in_view (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, EVENTS_DIRECTORY_PAGE_TYPE_EVENT_DIRECTORY_MANAGER, EventsDirectoryPageEventDirectoryManager), TYPE_VIEW_MANAGER, ViewManager), _tmp0_);
-#line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
if (!_tmp1_) {
-#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
result = FALSE;
-#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2851 "EventsDirectoryPage.c"
+#line 2902 "EventsDirectoryPage.c"
}
-#line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp2_ = source;
-#line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EVENT_SOURCE, EventSource));
-#line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
event = _tmp3_;
-#line 257 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp4_ = event;
-#line 257 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp5_ = event_source_get_start_time (_tmp4_);
-#line 257 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_time_local (_tmp5_, &_tmp6_);
-#line 257 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
event_time = _tmp6_;
-#line 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp7_ = event_time;
-#line 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp8_ = _tmp7_.tm_year;
-#line 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp9_ = self->priv->year;
-#line 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
if (_tmp8_ == _tmp9_) {
-#line 2875 "EventsDirectoryPage.c"
+#line 2926 "EventsDirectoryPage.c"
SubEventsDirectoryPageDirectoryType _tmp10_ = 0;
-#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp10_ = self->priv->type;
-#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
if (_tmp10_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) {
-#line 2881 "EventsDirectoryPage.c"
+#line 2932 "EventsDirectoryPage.c"
struct tm _tmp11_ = {0};
gint _tmp12_ = 0;
gint _tmp13_ = 0;
-#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp11_ = event_time;
-#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp12_ = _tmp11_.tm_mon;
-#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp13_ = self->priv->month;
-#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
result = _tmp12_ == _tmp13_;
-#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (event);
-#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2897 "EventsDirectoryPage.c"
+#line 2948 "EventsDirectoryPage.c"
}
-#line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 269 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
result = TRUE;
-#line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 269 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (event);
-#line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 269 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2905 "EventsDirectoryPage.c"
+#line 2956 "EventsDirectoryPage.c"
}
-#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
result = FALSE;
-#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (event);
-#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2913 "EventsDirectoryPage.c"
+#line 2964 "EventsDirectoryPage.c"
}
static gint sub_events_directory_page_sub_event_directory_manager_get_month (SubEventsDirectoryPageSubEventDirectoryManager* self) {
gint result = 0;
gint _tmp0_ = 0;
-#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 274 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_val_if_fail (SUB_EVENTS_DIRECTORY_PAGE_IS_SUB_EVENT_DIRECTORY_MANAGER (self), 0);
-#line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 275 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = self->priv->month;
-#line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 275 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
result = _tmp0_;
-#line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 275 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2928 "EventsDirectoryPage.c"
+#line 2979 "EventsDirectoryPage.c"
}
static gint sub_events_directory_page_sub_event_directory_manager_get_year (SubEventsDirectoryPageSubEventDirectoryManager* self) {
gint result = 0;
gint _tmp0_ = 0;
-#line 271 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 278 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_val_if_fail (SUB_EVENTS_DIRECTORY_PAGE_IS_SUB_EVENT_DIRECTORY_MANAGER (self), 0);
-#line 272 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = self->priv->year;
-#line 272 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
result = _tmp0_;
-#line 272 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2943 "EventsDirectoryPage.c"
+#line 2994 "EventsDirectoryPage.c"
}
static SubEventsDirectoryPageDirectoryType sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (SubEventsDirectoryPageSubEventDirectoryManager* self) {
SubEventsDirectoryPageDirectoryType result = 0;
SubEventsDirectoryPageDirectoryType _tmp0_ = 0;
-#line 275 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_val_if_fail (SUB_EVENTS_DIRECTORY_PAGE_IS_SUB_EVENT_DIRECTORY_MANAGER (self), 0);
-#line 276 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = self->priv->type;
-#line 276 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
result = _tmp0_;
-#line 276 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2958 "EventsDirectoryPage.c"
+#line 3009 "EventsDirectoryPage.c"
}
static void sub_events_directory_page_sub_event_directory_manager_class_init (SubEventsDirectoryPageSubEventDirectoryManagerClass * klass) {
-#line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
sub_events_directory_page_sub_event_directory_manager_parent_class = g_type_class_peek_parent (klass);
-#line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
((ViewManagerClass *) klass)->finalize = sub_events_directory_page_sub_event_directory_manager_finalize;
-#line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_type_class_add_private (klass, sizeof (SubEventsDirectoryPageSubEventDirectoryManagerPrivate));
-#line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
((ViewManagerClass *) klass)->include_in_view = sub_events_directory_page_sub_event_directory_manager_real_include_in_view;
-#line 2971 "EventsDirectoryPage.c"
+#line 3022 "EventsDirectoryPage.c"
}
static void sub_events_directory_page_sub_event_directory_manager_instance_init (SubEventsDirectoryPageSubEventDirectoryManager * self) {
-#line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self->priv = SUB_EVENTS_DIRECTORY_PAGE_SUB_EVENT_DIRECTORY_MANAGER_GET_PRIVATE (self);
-#line 239 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self->priv->month = 0;
-#line 240 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self->priv->year = 0;
-#line 2982 "EventsDirectoryPage.c"
+#line 3033 "EventsDirectoryPage.c"
}
static void sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager* obj) {
SubEventsDirectoryPageSubEventDirectoryManager * self;
-#line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager);
-#line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
VIEW_MANAGER_CLASS (sub_events_directory_page_sub_event_directory_manager_parent_class)->finalize (obj);
-#line 2992 "EventsDirectoryPage.c"
+#line 3043 "EventsDirectoryPage.c"
}
@@ -3005,9 +3056,9 @@ static GType sub_events_directory_page_sub_event_directory_manager_get_type (voi
static void sub_events_directory_page_class_init (SubEventsDirectoryPageClass * klass) {
-#line 227 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 234 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
sub_events_directory_page_parent_class = g_type_class_peek_parent (klass);
-#line 3011 "EventsDirectoryPage.c"
+#line 3062 "EventsDirectoryPage.c"
}
diff --git a/src/events/EventsDirectoryPage.vala b/src/events/EventsDirectoryPage.vala
index af20d99..4650fd2 100644
--- a/src/events/EventsDirectoryPage.vala
+++ b/src/events/EventsDirectoryPage.vala
@@ -114,14 +114,21 @@ public abstract class EventsDirectoryPage : CheckerboardPage {
{ "ViewComment", on_action_toggle, null, "false", on_display_comments }
};
- protected override void add_actions () {
- base.add_actions ();
- AppWindow.get_instance ().add_action_entries (entries, this);
+ protected override void add_actions (GLib.ActionMap map) {
+ base.add_actions (map);
+ map.add_action_entries (entries, this);
var display_comments = Config.Facade.get_instance().get_display_event_comments();
get_action ("ViewComment").change_state (display_comments);
}
+ protected override void remove_actions(GLib.ActionMap map) {
+ base.remove_actions(map);
+ foreach (var entry in entries) {
+ map.remove_action(entry.name);
+ }
+ }
+
protected override void init_actions(int selected_count, int count) {
base.init_actions(selected_count, count);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 12:55:26 +0000