From 2492891f112caac6076ce49721d9d5d78a152c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 15:53:58 +0100 Subject: New upstream version 0.26.4 --- src/tags/TagPage.c | 238 ++++++++++++++++++++++++++--------------------------- 1 file changed, 119 insertions(+), 119 deletions(-) (limited to 'src/tags/TagPage.c') diff --git a/src/tags/TagPage.c b/src/tags/TagPage.c index 6e347f7..efc0340 100644 --- a/src/tags/TagPage.c +++ b/src/tags/TagPage.c @@ -1,4 +1,4 @@ -/* TagPage.c generated by valac 0.34.7, the Vala compiler +/* TagPage.c generated by valac 0.36.6, the Vala compiler * generated from TagPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -730,7 +730,7 @@ GType media_source_get_type (void) G_GNUC_CONST; TagUntagPhotosCommand* tag_untag_photos_command_new (Tag* tag, GeeCollection* sources, gint count, gboolean attach); TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Tag* tag, GeeCollection* sources, gint count, gboolean attach); GType tag_untag_photos_command_get_type (void) G_GNUC_CONST; -static void tag_page_finalize (GObject* obj); +static void tag_page_finalize (GObject * obj); static const GActionEntry TAG_PAGE_entries[4] = {{"DeleteTag", _tag_page_on_delete_tag_gsimple_action_activate_callback}, {"RenameTag", _tag_page_on_rename_tag_gsimple_action_activate_callback}, {"RemoveTagFromPhotos", _tag_page_on_remove_tag_from_photos_gsimple_action_activate_callback}, {"NewChildTagSidebar", _tag_page_on_new_child_tag_sidebar_gsimple_action_activate_callback}}; @@ -787,15 +787,15 @@ static DataView* _media_page_create_thumbnail_create_view (DataSource* source, g TagPage* tag_page_construct (GType object_type, Tag* tag) { TagPage * self = NULL; - Tag* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - Tag* _tmp3_ = NULL; - Tag* _tmp4_ = NULL; - TagSourceCollection* _tmp5_ = NULL; - Tag* _tmp6_ = NULL; - ViewCollection* _tmp7_ = NULL; - ViewCollection* _tmp8_ = NULL; + Tag* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + Tag* _tmp3_; + Tag* _tmp4_; + TagSourceCollection* _tmp5_; + Tag* _tmp6_; + ViewCollection* _tmp7_; + ViewCollection* _tmp8_; #line 10 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_val_if_fail (IS_TAG (tag), NULL); #line 11 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -847,8 +847,8 @@ TagPage* tag_page_new (Tag* tag) { static void tag_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { TagPage * self; - GeeList* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; + GeeList* _tmp0_; + GeeList* _tmp1_; #line 26 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); #line 26 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -867,8 +867,8 @@ static void tag_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_fil Tag* tag_page_get_tag (TagPage* self) { Tag* result = NULL; - Tag* _tmp0_ = NULL; - Tag* _tmp1_ = NULL; + Tag* _tmp0_; + Tag* _tmp1_; #line 31 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_val_if_fail (IS_TAG_PAGE (self), NULL); #line 32 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -887,8 +887,8 @@ static void tag_page_real_get_config_photos_sort (MediaPage* base, gboolean* sor TagPage * self; gboolean _vala_sort_order = FALSE; gint _vala_sort_by = 0; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; gboolean _tmp2_ = FALSE; gint _tmp3_ = 0; #line 35 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -922,10 +922,10 @@ static void tag_page_real_get_config_photos_sort (MediaPage* base, gboolean* sor static void tag_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) { TagPage * self; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gint _tmp3_ = 0; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + gboolean _tmp2_; + gint _tmp3_; #line 39 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); #line 40 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -946,8 +946,8 @@ static void tag_page_real_set_config_photos_sort (MediaPage* base, gboolean sort static void tag_page_real_add_actions (Page* base, GActionMap* map) { TagPage * self; - GActionMap* _tmp0_ = NULL; - GActionMap* _tmp1_ = NULL; + GActionMap* _tmp0_; + GActionMap* _tmp1_; #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" @@ -966,7 +966,7 @@ static void tag_page_real_add_actions (Page* base, GActionMap* map) { static void tag_page_real_remove_actions (Page* base, GActionMap* map) { TagPage * self; - GActionMap* _tmp0_ = NULL; + GActionMap* _tmp0_; #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" @@ -993,9 +993,9 @@ static void tag_page_real_remove_actions (Page* base, GActionMap* map) { entry = entry_collection[entry_it]; #line 995 "TagPage.c" { - GActionMap* _tmp1_ = NULL; - GActionEntry _tmp2_ = {0}; - const gchar* _tmp3_ = NULL; + GActionMap* _tmp1_; + GActionEntry _tmp2_; + const gchar* _tmp3_; #line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp1_ = map; #line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1012,9 +1012,9 @@ static void tag_page_real_remove_actions (Page* base, GActionMap* map) { static void tag_page_on_tags_altered (TagPage* self, GeeMap* map) { - GeeMap* _tmp0_ = NULL; - Tag* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GeeMap* _tmp0_; + Tag* _tmp1_; + gboolean _tmp2_; #line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); #line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1028,15 +1028,15 @@ static void tag_page_on_tags_altered (TagPage* self, GeeMap* map) { #line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala" if (_tmp2_) { #line 1031 "TagPage.c" - Tag* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - ViewCollection* _tmp6_ = NULL; - ViewCollection* _tmp7_ = NULL; - gint _tmp8_ = 0; - ViewCollection* _tmp9_ = NULL; - ViewCollection* _tmp10_ = NULL; - gint _tmp11_ = 0; + Tag* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + ViewCollection* _tmp6_; + ViewCollection* _tmp7_; + gint _tmp8_; + ViewCollection* _tmp9_; + ViewCollection* _tmp10_; + gint _tmp11_; #line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp3_ = self->priv->tag; #line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1072,21 +1072,21 @@ static void tag_page_on_tags_altered (TagPage* self, GeeMap* map) { static void tag_page_real_switched_to (Page* base) { TagPage * self; - Tag* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - Tag* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - Tag* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; + Tag* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + Tag* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + Tag* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; #line 70 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); #line 71 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1145,25 +1145,25 @@ static void tag_page_real_switched_to (Page* base) { static void tag_page_real_update_actions (Page* base, gint selected_count, gint count) { TagPage * self; - Tag* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - Tag* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - Tag* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gint _tmp13_ = 0; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gint _tmp16_ = 0; - gint _tmp17_ = 0; - gint _tmp18_ = 0; + Tag* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + Tag* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + Tag* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gint _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + gint _tmp16_; + gint _tmp17_; + gint _tmp18_; #line 80 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); #line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1230,14 +1230,14 @@ static void tag_page_real_update_actions (Page* base, gint selected_count, gint static void tag_page_on_new_child_tag_sidebar (TagPage* self) { NewChildTagCommand* creation_command = NULL; - Tag* _tmp0_ = NULL; - NewChildTagCommand* _tmp1_ = NULL; - CommandManager* _tmp2_ = NULL; - CommandManager* _tmp3_ = NULL; - LibraryWindow* _tmp4_ = NULL; - LibraryWindow* _tmp5_ = NULL; - Tag* _tmp6_ = NULL; - Tag* _tmp7_ = NULL; + Tag* _tmp0_; + NewChildTagCommand* _tmp1_; + CommandManager* _tmp2_; + CommandManager* _tmp3_; + LibraryWindow* _tmp4_; + LibraryWindow* _tmp5_; + Tag* _tmp6_; + Tag* _tmp7_; #line 99 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); #line 100 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1275,9 +1275,9 @@ static void tag_page_on_new_child_tag_sidebar (TagPage* self) { static void tag_page_on_rename_tag (TagPage* self) { - LibraryWindow* _tmp0_ = NULL; - LibraryWindow* _tmp1_ = NULL; - Tag* _tmp2_ = NULL; + LibraryWindow* _tmp0_; + LibraryWindow* _tmp1_; + Tag* _tmp2_; #line 107 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); #line 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1295,8 +1295,8 @@ static void tag_page_on_rename_tag (TagPage* self) { static void tag_page_on_delete_tag (TagPage* self) { - Tag* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + Tag* _tmp0_; + gboolean _tmp1_; #line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); #line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1306,11 +1306,11 @@ static void tag_page_on_delete_tag (TagPage* self) { #line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala" if (_tmp1_) { #line 1309 "TagPage.c" - CommandManager* _tmp2_ = NULL; - CommandManager* _tmp3_ = NULL; - Tag* _tmp4_ = NULL; - DeleteTagCommand* _tmp5_ = NULL; - DeleteTagCommand* _tmp6_ = NULL; + CommandManager* _tmp2_; + CommandManager* _tmp3_; + Tag* _tmp4_; + DeleteTagCommand* _tmp5_; + DeleteTagCommand* _tmp6_; #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp2_ = app_window_get_command_manager (); #line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1333,10 +1333,10 @@ static void tag_page_on_delete_tag (TagPage* self) { static void tag_page_on_remove_tag_from_photos (TagPage* self) { - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - gint _tmp2_ = 0; - gboolean _tmp3_ = FALSE; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + gint _tmp2_; + gboolean _tmp3_; #line 116 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); #line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1352,18 +1352,18 @@ static void tag_page_on_remove_tag_from_photos (TagPage* self) { #line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" if (_tmp3_) { #line 1355 "TagPage.c" - CommandManager* _tmp4_ = NULL; - CommandManager* _tmp5_ = NULL; - Tag* _tmp6_ = NULL; - ViewCollection* _tmp7_ = NULL; - ViewCollection* _tmp8_ = NULL; - GeeList* _tmp9_ = NULL; - GeeCollection* _tmp10_ = NULL; - ViewCollection* _tmp11_ = NULL; - ViewCollection* _tmp12_ = NULL; - gint _tmp13_ = 0; - TagUntagPhotosCommand* _tmp14_ = NULL; - TagUntagPhotosCommand* _tmp15_ = NULL; + CommandManager* _tmp4_; + CommandManager* _tmp5_; + Tag* _tmp6_; + ViewCollection* _tmp7_; + ViewCollection* _tmp8_; + GeeList* _tmp9_; + GeeCollection* _tmp10_; + ViewCollection* _tmp11_; + ViewCollection* _tmp12_; + gint _tmp13_; + TagUntagPhotosCommand* _tmp14_; + TagUntagPhotosCommand* _tmp15_; #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 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" @@ -1411,19 +1411,19 @@ static void tag_page_class_init (TagPageClass * klass) { #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_type_class_add_private (klass, sizeof (TagPagePrivate)); #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - ((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) tag_page_real_init_collect_ui_filenames; + ((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) tag_page_real_init_collect_ui_filenames; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - ((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) tag_page_real_get_config_photos_sort; + ((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) tag_page_real_get_config_photos_sort; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - ((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) tag_page_real_set_config_photos_sort; + ((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) tag_page_real_set_config_photos_sort; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - ((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) tag_page_real_add_actions; + ((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) tag_page_real_add_actions; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - ((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) tag_page_real_remove_actions; + ((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) tag_page_real_remove_actions; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - ((PageClass *) klass)->switched_to = (void (*)(Page*)) tag_page_real_switched_to; + ((PageClass *) klass)->switched_to = (void (*) (Page *)) tag_page_real_switched_to; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - ((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) tag_page_real_update_actions; + ((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) tag_page_real_update_actions; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" G_OBJECT_CLASS (klass)->finalize = tag_page_finalize; #line 1430 "TagPage.c" @@ -1437,12 +1437,12 @@ static void tag_page_instance_init (TagPage * self) { } -static void tag_page_finalize (GObject* obj) { +static void tag_page_finalize (GObject * obj) { TagPage * self; - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - TagSourceCollection* _tmp2_ = NULL; - guint _tmp3_ = 0U; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + TagSourceCollection* _tmp2_; + guint _tmp3_; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TAG_PAGE, TagPage); #line 22 "/home/jens/Source/shotwell/src/tags/TagPage.vala" -- cgit v1.2.3