From a7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 21 Jan 2017 19:17:10 +0100 Subject: New upstream version 0.25.3 --- src/tags/TagPage.c | 431 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 241 insertions(+), 190 deletions(-) (limited to 'src/tags/TagPage.c') diff --git a/src/tags/TagPage.c b/src/tags/TagPage.c index 8a95878..9c8acc0 100644 --- a/src/tags/TagPage.c +++ b/src/tags/TagPage.c @@ -1,4 +1,4 @@ -/* TagPage.c generated by valac 0.32.1, the Vala compiler +/* TagPage.c generated by valac 0.34.4, the Vala compiler * generated from TagPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -12,9 +12,9 @@ #include #include #include +#include #include #include -#include #define TYPE_PAGE (page_get_type ()) @@ -304,16 +304,6 @@ typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass; typedef struct _ConfigFacade ConfigFacade; typedef struct _ConfigFacadeClass ConfigFacadeClass; -#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_COMMAND (command_get_type ()) #define COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMMAND, Command)) #define COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_COMMAND, CommandClass)) @@ -365,6 +355,16 @@ typedef struct _CommandManager CommandManager; typedef struct _CommandManagerClass CommandManagerClass; #define _command_manager_unref0(var) ((var == NULL) ? NULL : (var = (command_manager_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)) +#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)) @@ -435,7 +435,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); @@ -681,10 +682,10 @@ ConfigFacade* config_facade_get_instance (void); void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by); static void tag_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by); void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by); -static void tag_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 tag_page_real_add_actions (Page* base, GActionMap* map); +void page_add_actions (Page* self, GActionMap* map); +static void tag_page_real_remove_actions (Page* base, GActionMap* map); +void page_remove_actions (Page* self, GActionMap* map); void page_set_page_name (Page* self, const gchar* page_name); void page_update_actions (Page* self, gint selected_count, gint count); gint view_collection_get_selected_count (ViewCollection* self); @@ -713,6 +714,7 @@ gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* app_window_get_command_manager (void); void command_manager_execute (CommandManager* self, Command* command); +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_tag_in_sidebar (LibraryWindow* self, Tag* tag); @@ -735,42 +737,42 @@ static const GActionEntry TAG_PAGE_entries[4] = {{"DeleteTag", _tag_page_on_dele static void _tag_page_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { #line 23 "/home/jens/Source/shotwell/src/tags/TagPage.vala" tag_page_on_tags_altered ((TagPage*) self, items); -#line 739 "TagPage.c" +#line 741 "TagPage.c" } static void _tag_page_on_delete_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala" tag_page_on_delete_tag ((TagPage*) self); -#line 746 "TagPage.c" +#line 748 "TagPage.c" } static void _tag_page_on_rename_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala" tag_page_on_rename_tag ((TagPage*) self); -#line 753 "TagPage.c" +#line 755 "TagPage.c" } static void _tag_page_on_remove_tag_from_photos_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala" tag_page_on_remove_tag_from_photos ((TagPage*) self); -#line 760 "TagPage.c" +#line 762 "TagPage.c" } static void _tag_page_on_new_child_tag_sidebar_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala" tag_page_on_new_child_tag_sidebar ((TagPage*) self); -#line 767 "TagPage.c" +#line 769 "TagPage.c" } static gpointer _g_object_ref0 (gpointer self) { #line 13 "/home/jens/Source/shotwell/src/tags/TagPage.vala" return self ? g_object_ref (self) : NULL; -#line 774 "TagPage.c" +#line 776 "TagPage.c" } @@ -779,7 +781,7 @@ static DataView* _media_page_create_thumbnail_create_view (DataSource* source, g result = media_page_create_thumbnail ((MediaPage*) self, source); #line 16 "/home/jens/Source/shotwell/src/tags/TagPage.vala" return result; -#line 783 "TagPage.c" +#line 785 "TagPage.c" } @@ -832,14 +834,14 @@ TagPage* tag_page_construct (GType object_type, Tag* tag) { checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "TagsContextMenu"); #line 10 "/home/jens/Source/shotwell/src/tags/TagPage.vala" return self; -#line 836 "TagPage.c" +#line 838 "TagPage.c" } TagPage* tag_page_new (Tag* tag) { #line 10 "/home/jens/Source/shotwell/src/tags/TagPage.vala" return tag_page_construct (TYPE_TAG_PAGE, tag); -#line 843 "TagPage.c" +#line 845 "TagPage.c" } @@ -859,7 +861,7 @@ static void tag_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_fil _tmp1_ = ui_filenames; #line 28 "/home/jens/Source/shotwell/src/tags/TagPage.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "tags.ui"); -#line 863 "TagPage.c" +#line 865 "TagPage.c" } @@ -877,7 +879,7 @@ Tag* tag_page_get_tag (TagPage* self) { result = _tmp1_; #line 32 "/home/jens/Source/shotwell/src/tags/TagPage.vala" return result; -#line 881 "TagPage.c" +#line 883 "TagPage.c" } @@ -907,13 +909,13 @@ static void tag_page_real_get_config_photos_sort (MediaPage* base, gboolean* sor if (sort_order) { #line 35 "/home/jens/Source/shotwell/src/tags/TagPage.vala" *sort_order = _vala_sort_order; -#line 911 "TagPage.c" +#line 913 "TagPage.c" } #line 35 "/home/jens/Source/shotwell/src/tags/TagPage.vala" if (sort_by) { #line 35 "/home/jens/Source/shotwell/src/tags/TagPage.vala" *sort_by = _vala_sort_by; -#line 917 "TagPage.c" +#line 919 "TagPage.c" } } @@ -938,27 +940,74 @@ static void tag_page_real_set_config_photos_sort (MediaPage* base, gboolean sort configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_); #line 40 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (_tmp1_); -#line 942 "TagPage.c" +#line 944 "TagPage.c" } -static void tag_page_real_add_actions (Page* base) { +static void tag_page_real_add_actions (Page* base, GActionMap* map) { TagPage * self; - AppWindow* _tmp0_ = NULL; - AppWindow* _tmp1_ = NULL; + GActionMap* _tmp0_ = NULL; + GActionMap* _tmp1_ = NULL; #line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); +#line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + g_return_if_fail (G_IS_ACTION_MAP (map)); #line 51 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - PAGE_CLASS (tag_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page)); -#line 53 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp0_ = app_window_get_instance (); -#line 53 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp1_ = _tmp0_; + _tmp0_ = map; +#line 51 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + PAGE_CLASS (tag_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 53 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), TAG_PAGE_entries, G_N_ELEMENTS (TAG_PAGE_entries), self); + _tmp1_ = map; #line 53 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _g_object_unref0 (_tmp1_); -#line 962 "TagPage.c" + g_action_map_add_action_entries (_tmp1_, TAG_PAGE_entries, G_N_ELEMENTS (TAG_PAGE_entries), self); +#line 964 "TagPage.c" +} + + +static void tag_page_real_remove_actions (Page* base, GActionMap* map) { + TagPage * self; + GActionMap* _tmp0_ = NULL; +#line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); +#line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + g_return_if_fail (G_IS_ACTION_MAP (map)); +#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _tmp0_ = map; +#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + PAGE_CLASS (tag_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 979 "TagPage.c" + { + GActionEntry* entry_collection = NULL; + gint entry_collection_length1 = 0; + gint _entry_collection_size_ = 0; + gint entry_it = 0; +#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + entry_collection = TAG_PAGE_entries; +#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + entry_collection_length1 = G_N_ELEMENTS (TAG_PAGE_entries); +#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + for (entry_it = 0; entry_it < G_N_ELEMENTS (TAG_PAGE_entries); entry_it = entry_it + 1) { +#line 991 "TagPage.c" + GActionEntry entry = {0}; +#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + entry = entry_collection[entry_it]; +#line 995 "TagPage.c" + { + GActionMap* _tmp1_ = NULL; + GActionEntry _tmp2_ = {0}; + const gchar* _tmp3_ = NULL; +#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _tmp1_ = map; +#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _tmp2_ = entry; +#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _tmp3_ = _tmp2_.name; +#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + g_action_map_remove_action (_tmp1_, _tmp3_); +#line 1008 "TagPage.c" + } + } + } } @@ -966,19 +1015,19 @@ static void tag_page_on_tags_altered (TagPage* self, GeeMap* map) { GeeMap* _tmp0_ = NULL; Tag* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); -#line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (GEE_IS_MAP (map)); -#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp0_ = map; -#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp1_ = self->priv->tag; -#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp2_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); -#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala" if (_tmp2_) { -#line 982 "TagPage.c" +#line 1031 "TagPage.c" Tag* _tmp3_ = NULL; gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; @@ -988,35 +1037,35 @@ static void tag_page_on_tags_altered (TagPage* self, GeeMap* map) { ViewCollection* _tmp9_ = NULL; ViewCollection* _tmp10_ = NULL; gint _tmp11_ = 0; -#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp3_ = self->priv->tag; -#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); -#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp5_ = _tmp4_; -#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp5_); -#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp5_); -#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp7_ = _tmp6_; -#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp8_ = view_collection_get_selected_count (_tmp7_); -#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp10_ = _tmp9_; -#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp11_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection)); -#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" page_update_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp8_, _tmp11_); -#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _data_collection_unref0 (_tmp10_); -#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _data_collection_unref0 (_tmp7_); -#line 1020 "TagPage.c" +#line 1069 "TagPage.c" } } @@ -1038,59 +1087,59 @@ static void tag_page_real_switched_to (Page* base) { gchar* _tmp12_ = NULL; gchar* _tmp13_ = NULL; gchar* _tmp14_ = NULL; -#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 70 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); -#line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 71 "/home/jens/Source/shotwell/src/tags/TagPage.vala" PAGE_CLASS (tag_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page)); -#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp0_ = self->priv->tag; -#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp1_ = tag_get_user_visible_name (_tmp0_); -#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp2_ = _tmp1_; -#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp3_ = resources_delete_tag_menu (_tmp2_); -#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp4_ = _tmp3_; -#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala" page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DeleteTag", _tmp4_); -#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp4_); -#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp2_); -#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp5_ = self->priv->tag; -#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp6_ = tag_get_user_visible_name (_tmp5_); -#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp7_ = _tmp6_; -#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp8_ = resources_rename_tag_menu (_tmp7_); -#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp9_ = _tmp8_; -#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RenameTag", _tmp9_); -#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp9_); -#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp7_); -#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp10_ = self->priv->tag; -#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp11_ = tag_get_user_visible_name (_tmp10_); -#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp12_ = _tmp11_; -#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp13_ = resources_untag_photos_menu (_tmp12_, 0); -#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp14_ = _tmp13_; -#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala" page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveTagFromPhotos", _tmp14_); -#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp14_); -#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp12_); -#line 1094 "TagPage.c" +#line 1143 "TagPage.c" } @@ -1115,67 +1164,67 @@ static void tag_page_real_update_actions (Page* base, gint selected_count, gint gint _tmp16_ = 0; gint _tmp17_ = 0; gint _tmp18_ = 0; -#line 73 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 80 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); -#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp0_ = self->priv->tag; -#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp1_ = tag_get_user_visible_name (_tmp0_); -#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp2_ = _tmp1_; -#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp3_ = resources_delete_tag_menu (_tmp2_); -#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp4_ = _tmp3_; -#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala" page_set_action_details (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DeleteTag", _tmp4_, NULL, TRUE); -#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp4_); -#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp2_); -#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp5_ = self->priv->tag; -#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp6_ = tag_get_user_visible_name (_tmp5_); -#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp7_ = _tmp6_; -#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp8_ = resources_rename_tag_menu (_tmp7_); -#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp9_ = _tmp8_; -#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala" page_set_action_details (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RenameTag", _tmp9_, NULL, TRUE); -#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp9_); -#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp7_); -#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp10_ = self->priv->tag; -#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp11_ = tag_get_user_visible_name (_tmp10_); -#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp12_ = _tmp11_; -#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp13_ = selected_count; -#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp14_ = resources_untag_photos_menu (_tmp12_, _tmp13_); -#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp15_ = _tmp14_; -#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp16_ = selected_count; -#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" page_set_action_details (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveTagFromPhotos", _tmp15_, NULL, _tmp16_ > 0); -#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp15_); -#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp12_); -#line 89 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 96 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp17_ = selected_count; -#line 89 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 96 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp18_ = count; -#line 89 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 96 "/home/jens/Source/shotwell/src/tags/TagPage.vala" PAGE_CLASS (tag_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp17_, _tmp18_); -#line 1179 "TagPage.c" +#line 1228 "TagPage.c" } @@ -1189,39 +1238,39 @@ static void tag_page_on_new_child_tag_sidebar (TagPage* self) { LibraryWindow* _tmp5_ = NULL; Tag* _tmp6_ = NULL; Tag* _tmp7_ = NULL; -#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 99 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); -#line 93 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 100 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp0_ = self->priv->tag; -#line 93 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 100 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp1_ = new_child_tag_command_new (_tmp0_); -#line 93 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 100 "/home/jens/Source/shotwell/src/tags/TagPage.vala" creation_command = _tmp1_; -#line 95 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 102 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp2_ = app_window_get_command_manager (); -#line 95 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 102 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp3_ = _tmp2_; -#line 95 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 102 "/home/jens/Source/shotwell/src/tags/TagPage.vala" command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (creation_command, TYPE_COMMAND, Command)); -#line 95 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 102 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _command_manager_unref0 (_tmp3_); -#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp4_ = library_window_get_app (); -#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp5_ = _tmp4_; -#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp6_ = new_child_tag_command_get_created_child (creation_command); -#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp7_ = _tmp6_; -#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala" library_window_rename_tag_in_sidebar (_tmp5_, _tmp7_); -#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (_tmp7_); -#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (_tmp5_); -#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 99 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (creation_command); -#line 1225 "TagPage.c" +#line 1274 "TagPage.c" } @@ -1229,56 +1278,56 @@ static void tag_page_on_rename_tag (TagPage* self) { LibraryWindow* _tmp0_ = NULL; LibraryWindow* _tmp1_ = NULL; Tag* _tmp2_ = NULL; -#line 100 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 107 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); -#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp0_ = library_window_get_app (); -#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp1_ = _tmp0_; -#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp2_ = self->priv->tag; -#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala" library_window_rename_tag_in_sidebar (_tmp1_, _tmp2_); -#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (_tmp1_); -#line 1245 "TagPage.c" +#line 1294 "TagPage.c" } static void tag_page_on_delete_tag (TagPage* self) { Tag* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; -#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); -#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp0_ = self->priv->tag; -#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp1_ = dialogs_confirm_delete_tag (_tmp0_); -#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala" if (_tmp1_) { -#line 1260 "TagPage.c" +#line 1309 "TagPage.c" CommandManager* _tmp2_ = NULL; CommandManager* _tmp3_ = NULL; Tag* _tmp4_ = NULL; DeleteTagCommand* _tmp5_ = NULL; DeleteTagCommand* _tmp6_ = NULL; -#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp2_ = app_window_get_command_manager (); -#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp3_ = _tmp2_; -#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp4_ = self->priv->tag; -#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp5_ = delete_tag_command_new (_tmp4_); -#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp6_ = _tmp5_; -#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command)); -#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (_tmp6_); -#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _command_manager_unref0 (_tmp3_); -#line 1282 "TagPage.c" +#line 1331 "TagPage.c" } } @@ -1288,21 +1337,21 @@ static void tag_page_on_remove_tag_from_photos (TagPage* self) { ViewCollection* _tmp1_ = NULL; gint _tmp2_ = 0; gboolean _tmp3_ = FALSE; -#line 109 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 116 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); -#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp1_ = _tmp0_; -#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp3_ = _tmp2_ > 0; -#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _data_collection_unref0 (_tmp1_); -#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" if (_tmp3_) { -#line 1306 "TagPage.c" +#line 1355 "TagPage.c" CommandManager* _tmp4_ = NULL; CommandManager* _tmp5_ = NULL; Tag* _tmp6_ = NULL; @@ -1315,43 +1364,43 @@ static void tag_page_on_remove_tag_from_photos (TagPage* self) { gint _tmp13_ = 0; TagUntagPhotosCommand* _tmp14_ = NULL; TagUntagPhotosCommand* _tmp15_ = NULL; -#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp5_ = _tmp4_; -#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp6_ = self->priv->tag; -#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp8_ = _tmp7_; -#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp9_ = view_collection_get_selected_sources (_tmp8_); -#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection); -#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp12_ = _tmp11_; -#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp13_ = view_collection_get_selected_count (_tmp12_); -#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp14_ = tag_untag_photos_command_new (_tmp6_, _tmp10_, _tmp13_, FALSE); -#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp15_ = _tmp14_; -#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_COMMAND, Command)); -#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (_tmp15_); -#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _data_collection_unref0 (_tmp12_); -#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (_tmp10_); -#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _data_collection_unref0 (_tmp8_); -#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _command_manager_unref0 (_tmp5_); -#line 1355 "TagPage.c" +#line 1404 "TagPage.c" } } @@ -1369,20 +1418,22 @@ static void tag_page_class_init (TagPageClass * klass) { ((MediaPageClass *) klass)->set_config_photos_sort = tag_page_real_set_config_photos_sort; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" ((PageClass *) klass)->add_actions = tag_page_real_add_actions; +#line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + ((PageClass *) klass)->remove_actions = tag_page_real_remove_actions; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" ((PageClass *) klass)->switched_to = tag_page_real_switched_to; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" ((PageClass *) klass)->update_actions = tag_page_real_update_actions; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" G_OBJECT_CLASS (klass)->finalize = tag_page_finalize; -#line 1379 "TagPage.c" +#line 1430 "TagPage.c" } static void tag_page_instance_init (TagPage * self) { #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self->priv = TAG_PAGE_GET_PRIVATE (self); -#line 1386 "TagPage.c" +#line 1437 "TagPage.c" } @@ -1412,7 +1463,7 @@ static void tag_page_finalize (GObject* obj) { _g_object_unref0 (self->priv->tag); #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" G_OBJECT_CLASS (tag_page_parent_class)->finalize (obj); -#line 1416 "TagPage.c" +#line 1467 "TagPage.c" } -- cgit v1.2.3