diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-15 20:38:57 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-15 20:38:57 +0100 |
| commit | f1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (patch) | |
| tree | a1f2ab30332a6383b0677bfcc2aec687b98851d6 /src/searches | |
| parent | f8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff) | |
| parent | ede50c561ec9811704821a9ea0f04c3d6c20b5af (diff) | |
Merge branch 'release/0.26.4-1'0.26.4-1
Diffstat (limited to 'src/searches')
| -rw-r--r-- | src/searches/Branch.c | 311 | ||||
| -rw-r--r-- | src/searches/Branch.vala | 2 | ||||
| -rw-r--r-- | src/searches/SavedSearchDialog.c | 2798 | ||||
| -rw-r--r-- | src/searches/SavedSearchPage.c | 138 | ||||
| -rw-r--r-- | src/searches/SearchBoolean.c | 2345 | ||||
| -rw-r--r-- | src/searches/Searches.c | 2 |
6 files changed, 2731 insertions, 2865 deletions
diff --git a/src/searches/Branch.c b/src/searches/Branch.c index cce6434..a1664ff 100644 --- a/src/searches/Branch.c +++ b/src/searches/Branch.c @@ -1,4 +1,4 @@ -/* Branch.c generated by valac 0.34.7, the Vala compiler +/* Branch.c generated by valac 0.36.6, the Vala compiler * generated from Branch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -479,12 +479,12 @@ struct _SearchesSidebarEntryPrivate { static gpointer searches_branch_parent_class = NULL; static gpointer searches_header_parent_class = NULL; -static SidebarContextableIface* searches_header_sidebar_contextable_parent_iface = NULL; +static SidebarContextableIface * searches_header_sidebar_contextable_parent_iface = NULL; static gpointer searches_sidebar_entry_parent_class = NULL; static gchar* searches_sidebar_entry_single_search_icon; static gchar* searches_sidebar_entry_single_search_icon = NULL; -static SidebarRenameableEntryIface* searches_sidebar_entry_sidebar_renameable_entry_parent_iface = NULL; -static SidebarDestroyableEntryIface* searches_sidebar_entry_sidebar_destroyable_entry_parent_iface = NULL; +static SidebarRenameableEntryIface * searches_sidebar_entry_sidebar_renameable_entry_parent_iface = NULL; +static SidebarDestroyableEntryIface * searches_sidebar_entry_sidebar_destroyable_entry_parent_iface = NULL; GType sidebar_branch_get_type (void) G_GNUC_CONST; GType searches_branch_get_type (void) G_GNUC_CONST; @@ -532,7 +532,7 @@ SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, Saved void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator); SidebarEntry* sidebar_branch_get_root (SidebarBranch* self); void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry); -static void searches_branch_finalize (GObject* obj); +static void searches_branch_finalize (GObject * obj); GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST; GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST; GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST; @@ -556,7 +556,7 @@ GType application_get_type (void) G_GNUC_CONST; Application* application_get_instance (void); void application_panic (Application* self); static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event); -static void searches_header_finalize (GObject* obj); +static void searches_header_finalize (GObject * obj); GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST; GType page_get_type (void) G_GNUC_CONST; GType sidebar_page_representative_get_type (void) G_GNUC_CONST; @@ -602,7 +602,7 @@ gboolean dialogs_confirm_delete_saved_search (SavedSearch* search); DeleteSavedSearchCommand* delete_saved_search_command_new (SavedSearch* search); DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_type, SavedSearch* search); GType delete_saved_search_command_get_type (void) G_GNUC_CONST; -static void searches_sidebar_entry_finalize (GObject* obj); +static void searches_sidebar_entry_finalize (GObject * obj); static void _searches_branch_on_saved_search_added_saved_search_table_search_added (SavedSearchTable* _sender, SavedSearch* search, gpointer self) { @@ -630,12 +630,12 @@ static gint _searches_branch_comparator_gcompare_func (gconstpointer a, gconstpo SearchesBranch* searches_branch_construct (GType object_type) { SearchesBranch * self = NULL; - SearchesHeader* _tmp0_ = NULL; - SearchesHeader* _tmp1_ = NULL; - SavedSearchTable* _tmp13_ = NULL; - SavedSearchTable* _tmp14_ = NULL; - SavedSearchTable* _tmp15_ = NULL; - SavedSearchTable* _tmp16_ = NULL; + SearchesHeader* _tmp0_; + SearchesHeader* _tmp1_; + SavedSearchTable* _tmp13_; + SavedSearchTable* _tmp14_; + SavedSearchTable* _tmp15_; + SavedSearchTable* _tmp16_; #line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala" _tmp0_ = searches_header_new (); #line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -647,12 +647,12 @@ SearchesBranch* searches_branch_construct (GType object_type) { #line 648 "Branch.c" { GeeIterator* _search_it = NULL; - SavedSearchTable* _tmp2_ = NULL; - SavedSearchTable* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; - GeeCollection* _tmp5_ = NULL; - GeeIterator* _tmp6_ = NULL; - GeeIterator* _tmp7_ = NULL; + SavedSearchTable* _tmp2_; + SavedSearchTable* _tmp3_; + GeeCollection* _tmp4_; + GeeCollection* _tmp5_; + GeeIterator* _tmp6_; + GeeIterator* _tmp7_; #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala" _tmp2_ = saved_search_table_get_instance (); #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -674,12 +674,12 @@ SearchesBranch* searches_branch_construct (GType object_type) { #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala" while (TRUE) { #line 677 "Branch.c" - GeeIterator* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; + GeeIterator* _tmp8_; + gboolean _tmp9_; SavedSearch* search = NULL; - GeeIterator* _tmp10_ = NULL; - gpointer _tmp11_ = NULL; - SavedSearch* _tmp12_ = NULL; + GeeIterator* _tmp10_; + gpointer _tmp11_; + SavedSearch* _tmp12_; #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala" _tmp8_ = _search_it; #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -739,9 +739,9 @@ SearchesBranch* searches_branch_new (void) { SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch* self, SavedSearch* search) { SearchesSidebarEntry* result = NULL; - GeeHashMap* _tmp0_ = NULL; - SavedSearch* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; + GeeHashMap* _tmp0_; + SavedSearch* _tmp1_; + gpointer _tmp2_; #line 32 "/home/jens/Source/shotwell/src/searches/Branch.vala" g_return_val_if_fail (SEARCHES_IS_BRANCH (self), NULL); #line 32 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -762,13 +762,13 @@ SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch static gint searches_branch_comparator (SidebarEntry* a, SidebarEntry* b) { gint result = 0; - SidebarEntry* _tmp0_ = NULL; - SidebarEntry* _tmp1_ = NULL; - SidebarEntry* _tmp2_ = NULL; - SavedSearch* _tmp3_ = NULL; - SidebarEntry* _tmp4_ = NULL; - SavedSearch* _tmp5_ = NULL; - gint _tmp6_ = 0; + SidebarEntry* _tmp0_; + SidebarEntry* _tmp1_; + SidebarEntry* _tmp2_; + SavedSearch* _tmp3_; + SidebarEntry* _tmp4_; + SavedSearch* _tmp5_; + gint _tmp6_; #line 36 "/home/jens/Source/shotwell/src/searches/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 36 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -805,12 +805,12 @@ static gint searches_branch_comparator (SidebarEntry* a, SidebarEntry* b) { static void searches_branch_on_saved_search_added (SearchesBranch* self, SavedSearch* search) { SearchesSidebarEntry* entry = NULL; - SavedSearch* _tmp0_ = NULL; - SearchesSidebarEntry* _tmp1_ = NULL; - GeeHashMap* _tmp2_ = NULL; - SavedSearch* _tmp3_ = NULL; - SidebarEntry* _tmp4_ = NULL; - SidebarEntry* _tmp5_ = NULL; + SavedSearch* _tmp0_; + SearchesSidebarEntry* _tmp1_; + GeeHashMap* _tmp2_; + SavedSearch* _tmp3_; + SidebarEntry* _tmp4_; + SidebarEntry* _tmp5_; #line 44 "/home/jens/Source/shotwell/src/searches/Branch.vala" g_return_if_fail (SEARCHES_IS_BRANCH (self)); #line 44 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -845,13 +845,13 @@ static void searches_branch_on_saved_search_added (SearchesBranch* self, SavedSe static void searches_branch_on_saved_search_removed (SearchesBranch* self, SavedSearch* search) { SearchesSidebarEntry* entry = NULL; - GeeHashMap* _tmp0_ = NULL; - SavedSearch* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; + GeeHashMap* _tmp0_; + SavedSearch* _tmp1_; + gpointer _tmp2_; gboolean is_removed = FALSE; - GeeHashMap* _tmp3_ = NULL; - SavedSearch* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + GeeHashMap* _tmp3_; + SavedSearch* _tmp4_; + gboolean _tmp5_; #line 51 "/home/jens/Source/shotwell/src/searches/Branch.vala" g_return_if_fail (SEARCHES_IS_BRANCH (self)); #line 51 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -898,7 +898,7 @@ static void searches_branch_class_init (SearchesBranchClass * klass) { static void searches_branch_instance_init (SearchesBranch * self) { - GeeHashMap* _tmp0_ = NULL; + GeeHashMap* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala" self->priv = SEARCHES_BRANCH_GET_PRIVATE (self); #line 8 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -909,14 +909,14 @@ static void searches_branch_instance_init (SearchesBranch * self) { } -static void searches_branch_finalize (GObject* obj) { +static void searches_branch_finalize (GObject * obj) { SearchesBranch * self; - SavedSearchTable* _tmp0_ = NULL; - SavedSearchTable* _tmp1_ = NULL; - guint _tmp2_ = 0U; - SavedSearchTable* _tmp3_ = NULL; - SavedSearchTable* _tmp4_ = NULL; - guint _tmp5_ = 0U; + SavedSearchTable* _tmp0_; + SavedSearchTable* _tmp1_; + guint _tmp2_; + SavedSearchTable* _tmp3_; + SavedSearchTable* _tmp4_; + guint _tmp5_; #line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_BRANCH, SearchesBranch); #line 28 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -961,35 +961,32 @@ GType searches_branch_get_type (void) { SearchesHeader* searches_header_construct (GType object_type) { SearchesHeader * self = NULL; - const gchar* _tmp0_ = NULL; #line 68 "/home/jens/Source/shotwell/src/searches/Branch.vala" - _tmp0_ = _ ("Saved Searches"); -#line 68 "/home/jens/Source/shotwell/src/searches/Branch.vala" - self = (SearchesHeader*) sidebar_header_construct (object_type, _tmp0_, TRUE); + self = (SearchesHeader*) sidebar_header_construct (object_type, _ ("Saved Searches"), TRUE); #line 69 "/home/jens/Source/shotwell/src/searches/Branch.vala" searches_header_setup_context_menu (self); #line 67 "/home/jens/Source/shotwell/src/searches/Branch.vala" return self; -#line 974 "Branch.c" +#line 971 "Branch.c" } SearchesHeader* searches_header_new (void) { #line 67 "/home/jens/Source/shotwell/src/searches/Branch.vala" return searches_header_construct (SEARCHES_TYPE_HEADER); -#line 981 "Branch.c" +#line 978 "Branch.c" } static gpointer _g_object_ref0 (gpointer self) { #line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala" return self ? g_object_ref (self) : NULL; -#line 988 "Branch.c" +#line 985 "Branch.c" } static void searches_header_setup_context_menu (SearchesHeader* self) { - GtkBuilder* _tmp0_ = NULL; + GtkBuilder* _tmp0_; GError * _inner_error_ = NULL; #line 72 "/home/jens/Source/shotwell/src/searches/Branch.vala" g_return_if_fail (SEARCHES_IS_HEADER (self)); @@ -999,17 +996,17 @@ static void searches_header_setup_context_menu (SearchesHeader* self) { _g_object_unref0 (self->priv->builder); #line 73 "/home/jens/Source/shotwell/src/searches/Branch.vala" self->priv->builder = _tmp0_; -#line 1003 "Branch.c" +#line 1000 "Branch.c" { - GtkBuilder* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + GtkBuilder* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; GMenuModel* model = NULL; - GtkBuilder* _tmp4_ = NULL; - GObject* _tmp5_ = NULL; - GMenuModel* _tmp6_ = NULL; - GMenuModel* _tmp7_ = NULL; - GtkMenu* _tmp8_ = NULL; + GtkBuilder* _tmp4_; + GObject* _tmp5_; + GMenuModel* _tmp6_; + GMenuModel* _tmp7_; + GtkMenu* _tmp8_; #line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala" _tmp1_ = self->priv->builder; #line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -1022,8 +1019,8 @@ static void searches_header_setup_context_menu (SearchesHeader* self) { _g_free0 (_tmp3_); #line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1026 "Branch.c" - goto __catch76_g_error; +#line 1023 "Branch.c" + goto __catch77_g_error; } #line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala" _tmp4_ = self->priv->builder; @@ -1045,18 +1042,18 @@ static void searches_header_setup_context_menu (SearchesHeader* self) { self->priv->context_menu = _tmp8_; #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala" _g_object_unref0 (model); -#line 1049 "Branch.c" +#line 1046 "Branch.c" } - goto __finally76; - __catch76_g_error: + goto __finally77; + __catch77_g_error: { GError* _error_ = NULL; - GError* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - Application* _tmp13_ = NULL; - Application* _tmp14_ = NULL; + GError* _tmp9_; + const gchar* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + Application* _tmp13_; + Application* _tmp14_; #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala" _error_ = _inner_error_; #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -1083,9 +1080,9 @@ static void searches_header_setup_context_menu (SearchesHeader* self) { _application_unref0 (_tmp14_); #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala" _g_error_free0 (_error_); -#line 1087 "Branch.c" +#line 1084 "Branch.c" } - __finally76: + __finally77: #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -1094,7 +1091,7 @@ static void searches_header_setup_context_menu (SearchesHeader* self) { g_clear_error (&_inner_error_); #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala" return; -#line 1098 "Branch.c" +#line 1095 "Branch.c" } } @@ -1102,8 +1099,8 @@ static void searches_header_setup_context_menu (SearchesHeader* self) { static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event) { SearchesHeader * self; GtkMenu* result = NULL; - GtkMenu* _tmp0_ = NULL; - GtkMenu* _tmp1_ = NULL; + GtkMenu* _tmp0_; + GtkMenu* _tmp1_; #line 85 "/home/jens/Source/shotwell/src/searches/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_HEADER, SearchesHeader); #line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -1114,7 +1111,7 @@ static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextabl result = _tmp1_; #line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala" return result; -#line 1118 "Branch.c" +#line 1115 "Branch.c" } @@ -1125,7 +1122,7 @@ static void searches_header_class_init (SearchesHeaderClass * klass) { g_type_class_add_private (klass, sizeof (SearchesHeaderPrivate)); #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala" G_OBJECT_CLASS (klass)->finalize = searches_header_finalize; -#line 1129 "Branch.c" +#line 1126 "Branch.c" } @@ -1133,8 +1130,8 @@ static void searches_header_sidebar_contextable_interface_init (SidebarContextab #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala" searches_header_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface); #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala" - iface->get_sidebar_context_menu = (GtkMenu* (*)(SidebarContextable*, GdkEventButton*)) searches_header_real_get_sidebar_context_menu; -#line 1138 "Branch.c" + iface->get_sidebar_context_menu = (GtkMenu* (*) (SidebarContextable *, GdkEventButton*)) searches_header_real_get_sidebar_context_menu; +#line 1135 "Branch.c" } @@ -1143,11 +1140,11 @@ static void searches_header_instance_init (SearchesHeader * self) { self->priv = SEARCHES_HEADER_GET_PRIVATE (self); #line 65 "/home/jens/Source/shotwell/src/searches/Branch.vala" self->priv->context_menu = NULL; -#line 1147 "Branch.c" +#line 1144 "Branch.c" } -static void searches_header_finalize (GObject* obj) { +static void searches_header_finalize (GObject * obj) { SearchesHeader * self; #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_HEADER, SearchesHeader); @@ -1157,7 +1154,7 @@ static void searches_header_finalize (GObject* obj) { _g_object_unref0 (self->priv->context_menu); #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala" G_OBJECT_CLASS (searches_header_parent_class)->finalize (obj); -#line 1161 "Branch.c" +#line 1158 "Branch.c" } @@ -1177,8 +1174,8 @@ GType searches_header_get_type (void) { SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, SavedSearch* search) { SearchesSidebarEntry * self = NULL; - SavedSearch* _tmp0_ = NULL; - SavedSearch* _tmp1_ = NULL; + SavedSearch* _tmp0_; + SavedSearch* _tmp1_; #line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala" g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL); #line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -1193,14 +1190,14 @@ SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, Saved self->priv->search = _tmp1_; #line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala" return self; -#line 1197 "Branch.c" +#line 1194 "Branch.c" } SearchesSidebarEntry* searches_sidebar_entry_new (SavedSearch* search) { #line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala" return searches_sidebar_entry_construct (SEARCHES_TYPE_SIDEBAR_ENTRY, search); -#line 1204 "Branch.c" +#line 1201 "Branch.c" } @@ -1214,8 +1211,8 @@ void searches_sidebar_entry_terminate (void) { SavedSearch* searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self) { SavedSearch* result = NULL; - SavedSearch* _tmp0_ = NULL; - SavedSearch* _tmp1_ = NULL; + SavedSearch* _tmp0_; + SavedSearch* _tmp1_; #line 106 "/home/jens/Source/shotwell/src/searches/Branch.vala" g_return_val_if_fail (SEARCHES_IS_SIDEBAR_ENTRY (self), NULL); #line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -1226,15 +1223,15 @@ SavedSearch* searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self result = _tmp1_; #line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala" return result; -#line 1230 "Branch.c" +#line 1227 "Branch.c" } static gchar* searches_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { SearchesSidebarEntry * self; gchar* result = NULL; - SavedSearch* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + SavedSearch* _tmp0_; + gchar* _tmp1_; #line 110 "/home/jens/Source/shotwell/src/searches/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry); #line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -1245,15 +1242,15 @@ static gchar* searches_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEnt result = _tmp1_; #line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala" return result; -#line 1249 "Branch.c" +#line 1246 "Branch.c" } static gchar* searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { SearchesSidebarEntry * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 114 "/home/jens/Source/shotwell/src/searches/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry); #line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -1264,15 +1261,15 @@ static gchar* searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEnt result = _tmp1_; #line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala" return result; -#line 1268 "Branch.c" +#line 1265 "Branch.c" } static Page* searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) { SearchesSidebarEntry * self; Page* result = NULL; - SavedSearch* _tmp0_ = NULL; - SavedSearchPage* _tmp1_ = NULL; + SavedSearch* _tmp0_; + SavedSearchPage* _tmp1_; #line 118 "/home/jens/Source/shotwell/src/searches/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry); #line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -1285,7 +1282,7 @@ static Page* searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* ba result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); #line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala" return result; -#line 1289 "Branch.c" +#line 1286 "Branch.c" } @@ -1298,17 +1295,17 @@ static gboolean searches_sidebar_entry_real_is_user_renameable (SidebarRenameabl result = TRUE; #line 123 "/home/jens/Source/shotwell/src/searches/Branch.vala" return result; -#line 1302 "Branch.c" +#line 1299 "Branch.c" } static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name) { SearchesSidebarEntry * self; - SavedSearchTable* _tmp0_ = NULL; - SavedSearchTable* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; + SavedSearchTable* _tmp0_; + SavedSearchTable* _tmp1_; + const gchar* _tmp2_; + gboolean _tmp3_; + gboolean _tmp4_; #line 126 "/home/jens/Source/shotwell/src/searches/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry); #line 126 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -1327,13 +1324,13 @@ static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, co _saved_search_table_unref0 (_tmp1_); #line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala" if (_tmp4_) { -#line 1331 "Branch.c" - CommandManager* _tmp5_ = NULL; - CommandManager* _tmp6_ = NULL; - SavedSearch* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - RenameSavedSearchCommand* _tmp9_ = NULL; - RenameSavedSearchCommand* _tmp10_ = NULL; +#line 1328 "Branch.c" + CommandManager* _tmp5_; + CommandManager* _tmp6_; + SavedSearch* _tmp7_; + const gchar* _tmp8_; + RenameSavedSearchCommand* _tmp9_; + RenameSavedSearchCommand* _tmp10_; #line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala" _tmp5_ = app_window_get_command_manager (); #line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -1352,13 +1349,13 @@ static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, co _g_object_unref0 (_tmp10_); #line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala" _command_manager_unref0 (_tmp6_); -#line 1356 "Branch.c" +#line 1353 "Branch.c" } else { - const gchar* _tmp11_ = NULL; - SavedSearch* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; + const gchar* _tmp11_; + SavedSearch* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + gboolean _tmp15_; #line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala" _tmp11_ = new_name; #line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -1373,10 +1370,10 @@ static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, co _g_free0 (_tmp14_); #line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala" if (_tmp15_) { -#line 1377 "Branch.c" - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; +#line 1374 "Branch.c" + const gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; #line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala" _tmp16_ = new_name; #line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -1387,7 +1384,7 @@ static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, co app_window_error_message (_tmp18_, NULL); #line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala" _g_free0 (_tmp18_); -#line 1391 "Branch.c" +#line 1388 "Branch.c" } } } @@ -1395,8 +1392,8 @@ static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, co static void searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base) { SearchesSidebarEntry * self; - SavedSearch* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SavedSearch* _tmp0_; + gboolean _tmp1_; #line 133 "/home/jens/Source/shotwell/src/searches/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry); #line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -1405,12 +1402,12 @@ static void searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* _tmp1_ = dialogs_confirm_delete_saved_search (_tmp0_); #line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala" if (_tmp1_) { -#line 1409 "Branch.c" - CommandManager* _tmp2_ = NULL; - CommandManager* _tmp3_ = NULL; - SavedSearch* _tmp4_ = NULL; - DeleteSavedSearchCommand* _tmp5_ = NULL; - DeleteSavedSearchCommand* _tmp6_ = NULL; +#line 1406 "Branch.c" + CommandManager* _tmp2_; + CommandManager* _tmp3_; + SavedSearch* _tmp4_; + DeleteSavedSearchCommand* _tmp5_; + DeleteSavedSearchCommand* _tmp6_; #line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala" _tmp2_ = app_window_get_command_manager (); #line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala" @@ -1427,30 +1424,30 @@ static void searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* _g_object_unref0 (_tmp6_); #line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala" _command_manager_unref0 (_tmp3_); -#line 1431 "Branch.c" +#line 1428 "Branch.c" } } static void searches_sidebar_entry_class_init (SearchesSidebarEntryClass * klass) { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala" searches_sidebar_entry_parent_class = g_type_class_peek_parent (klass); #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala" g_type_class_add_private (klass, sizeof (SearchesSidebarEntryPrivate)); #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) searches_sidebar_entry_real_get_sidebar_name; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) searches_sidebar_entry_real_get_sidebar_name; #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) searches_sidebar_entry_real_get_sidebar_icon; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) searches_sidebar_entry_real_get_sidebar_icon; #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) searches_sidebar_entry_real_create_page; + ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) searches_sidebar_entry_real_create_page; #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala" G_OBJECT_CLASS (klass)->finalize = searches_sidebar_entry_finalize; #line 92 "/home/jens/Source/shotwell/src/searches/Branch.vala" - _tmp0_ = g_strdup ("find"); + _tmp0_ = g_strdup ("edit-find"); #line 92 "/home/jens/Source/shotwell/src/searches/Branch.vala" searches_sidebar_entry_single_search_icon = _tmp0_; -#line 1454 "Branch.c" +#line 1451 "Branch.c" } @@ -1458,10 +1455,10 @@ static void searches_sidebar_entry_sidebar_renameable_entry_interface_init (Side #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala" searches_sidebar_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala" - iface->is_user_renameable = (gboolean (*)(SidebarRenameableEntry*)) searches_sidebar_entry_real_is_user_renameable; + iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) searches_sidebar_entry_real_is_user_renameable; #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala" - iface->rename = (void (*)(SidebarRenameableEntry*, const gchar*)) searches_sidebar_entry_real_rename; -#line 1465 "Branch.c" + iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) searches_sidebar_entry_real_rename; +#line 1462 "Branch.c" } @@ -1469,19 +1466,19 @@ static void searches_sidebar_entry_sidebar_destroyable_entry_interface_init (Sid #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala" searches_sidebar_entry_sidebar_destroyable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala" - iface->destroy_source = (void (*)(SidebarDestroyableEntry*)) searches_sidebar_entry_real_destroy_source; -#line 1474 "Branch.c" + iface->destroy_source = (void (*) (SidebarDestroyableEntry *)) searches_sidebar_entry_real_destroy_source; +#line 1471 "Branch.c" } static void searches_sidebar_entry_instance_init (SearchesSidebarEntry * self) { #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala" self->priv = SEARCHES_SIDEBAR_ENTRY_GET_PRIVATE (self); -#line 1481 "Branch.c" +#line 1478 "Branch.c" } -static void searches_sidebar_entry_finalize (GObject* obj) { +static void searches_sidebar_entry_finalize (GObject * obj) { SearchesSidebarEntry * self; #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry); @@ -1489,7 +1486,7 @@ static void searches_sidebar_entry_finalize (GObject* obj) { _g_object_unref0 (self->priv->search); #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala" G_OBJECT_CLASS (searches_sidebar_entry_parent_class)->finalize (obj); -#line 1493 "Branch.c" +#line 1490 "Branch.c" } diff --git a/src/searches/Branch.vala b/src/searches/Branch.vala index 1c4ee90..3b54acf 100644 --- a/src/searches/Branch.vala +++ b/src/searches/Branch.vala @@ -89,7 +89,7 @@ public class Searches.Header : Sidebar.Header, Sidebar.Contextable { public class Searches.SidebarEntry : Sidebar.SimplePageEntry, Sidebar.RenameableEntry, Sidebar.DestroyableEntry { - private static string single_search_icon = "find"; + private static string single_search_icon = "edit-find"; private SavedSearch search; diff --git a/src/searches/SavedSearchDialog.c b/src/searches/SavedSearchDialog.c index 5050916..86fd417 100644 --- a/src/searches/SavedSearchDialog.c +++ b/src/searches/SavedSearchDialog.c @@ -1,4 +1,4 @@ -/* SavedSearchDialog.c generated by valac 0.34.7, the Vala compiler +/* SavedSearchDialog.c generated by valac 0.36.6, the Vala compiler * generated from SavedSearchDialog.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -191,6 +191,12 @@ typedef struct _SavedSearchDialogSearchRowRatingClass SavedSearchDialogSearchRow typedef struct _SavedSearchDialogSearchRowDate SavedSearchDialogSearchRowDate; typedef struct _SavedSearchDialogSearchRowDateClass SavedSearchDialogSearchRowDateClass; typedef struct _SavedSearchDialogParamSpecSearchRowContainer SavedSearchDialogParamSpecSearchRowContainer; +enum { + SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_REMOVE_SIGNAL, + SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL, + SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_LAST_SIGNAL +}; +static guint saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_LAST_SIGNAL] = {0}; typedef struct _SavedSearchDialogSearchRowPrivate SavedSearchDialogSearchRowPrivate; typedef struct _SavedSearchDialogParamSpecSearchRow SavedSearchDialogParamSpecSearchRow; typedef struct _SavedSearchDialogSearchRowTextPrivate SavedSearchDialogSearchRowTextPrivate; @@ -278,7 +284,7 @@ typedef struct _SavedSearchDialogSearchRowDatePrivate SavedSearchDialogSearchRow typedef struct _SearchConditionDate SearchConditionDate; typedef struct _SearchConditionDateClass SearchConditionDateClass; -typedef struct _Block9Data Block9Data; +typedef struct _Block10Data Block10Data; typedef struct _ParamSpecSavedSearchDialog ParamSpecSavedSearchDialog; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } @@ -534,7 +540,7 @@ typedef enum { SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET } SearchConditionDateContext; -struct _Block9Data { +struct _Block10Data { int _ref_count_; SavedSearchDialogSearchRowDate* self; GtkDialog* d; @@ -680,7 +686,7 @@ static GType saved_search_dialog_search_row_date_get_type (void) G_GNUC_CONST G_ static SearchCondition* saved_search_dialog_search_row_get_search_condition (SavedSearchDialogSearchRow* self); static gboolean saved_search_dialog_search_row_is_complete (SavedSearchDialogSearchRow* self); static void g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void saved_search_dialog_search_row_container_finalize (SavedSearchDialogSearchRowContainer* obj); +static void saved_search_dialog_search_row_container_finalize (SavedSearchDialogSearchRowContainer * obj); enum { SAVED_SEARCH_DIALOG_SEARCH_ROW_DUMMY_PROPERTY }; @@ -689,7 +695,7 @@ static SearchCondition* saved_search_dialog_search_row_real_get_search_condition static void saved_search_dialog_search_row_real_populate (SavedSearchDialogSearchRow* self, SearchCondition* sc); static gboolean saved_search_dialog_search_row_real_is_complete (SavedSearchDialogSearchRow* self); static SavedSearchDialogSearchRow* saved_search_dialog_search_row_construct (GType object_type); -static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow* obj); +static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow * obj); #define SAVED_SEARCH_DIALOG_SEARCH_ROW_TEXT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowTextPrivate)) enum { SAVED_SEARCH_DIALOG_SEARCH_ROW_TEXT_DUMMY_PROPERTY @@ -708,7 +714,7 @@ static void saved_search_dialog_search_row_text_real_populate (SavedSearchDialog SearchConditionTextContext search_condition_text_get_context (SearchConditionText* self); const gchar* search_condition_text_get_text (SearchConditionText* self); static gboolean saved_search_dialog_search_row_text_real_is_complete (SavedSearchDialogSearchRow* base); -static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearchRow* obj); +static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearchRow * obj); #define SAVED_SEARCH_DIALOG_SEARCH_ROW_MEDIA_TYPE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaTypePrivate)) enum { SAVED_SEARCH_DIALOG_SEARCH_ROW_MEDIA_TYPE_DUMMY_PROPERTY @@ -726,7 +732,7 @@ static void saved_search_dialog_search_row_media_type_real_populate (SavedSearch SearchConditionMediaTypeContext search_condition_media_type_get_context (SearchConditionMediaType* self); SearchConditionMediaTypeMediaType search_condition_media_type_get_media_type (SearchConditionMediaType* self); static gboolean saved_search_dialog_search_row_media_type_real_is_complete (SavedSearchDialogSearchRow* base); -static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialogSearchRow* obj); +static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialogSearchRow * obj); #define SAVED_SEARCH_DIALOG_SEARCH_ROW_MODIFIED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModifiedPrivate)) enum { SAVED_SEARCH_DIALOG_SEARCH_ROW_MODIFIED_DUMMY_PROPERTY @@ -744,7 +750,7 @@ static void saved_search_dialog_search_row_modified_real_populate (SavedSearchDi SearchConditionModifiedState search_condition_modified_get_state (SearchConditionModified* self); SearchConditionModifiedContext search_condition_modified_get_context (SearchConditionModified* self); static gboolean saved_search_dialog_search_row_modified_real_is_complete (SavedSearchDialogSearchRow* base); -static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogSearchRow* obj); +static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogSearchRow * obj); #define SAVED_SEARCH_DIALOG_SEARCH_ROW_FLAGGED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlaggedPrivate)) enum { SAVED_SEARCH_DIALOG_SEARCH_ROW_FLAGGED_DUMMY_PROPERTY @@ -760,7 +766,7 @@ SearchConditionFlagged* search_condition_flagged_construct (GType object_type, S static void saved_search_dialog_search_row_flagged_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc); SearchConditionFlaggedState search_condition_flagged_get_state (SearchConditionFlagged* self); static gboolean saved_search_dialog_search_row_flagged_real_is_complete (SavedSearchDialogSearchRow* base); -static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSearchRow* obj); +static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSearchRow * obj); #define SAVED_SEARCH_DIALOG_SEARCH_ROW_RATING_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRatingPrivate)) enum { SAVED_SEARCH_DIALOG_SEARCH_ROW_RATING_DUMMY_PROPERTY @@ -779,7 +785,7 @@ static void saved_search_dialog_search_row_rating_real_populate (SavedSearchDial SearchConditionRatingContext search_condition_rating_get_context (SearchConditionRating* self); Rating search_condition_rating_get_rating (SearchConditionRating* self); static gboolean saved_search_dialog_search_row_rating_real_is_complete (SavedSearchDialogSearchRow* base); -static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSearchRow* obj); +static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSearchRow * obj); #define SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDatePrivate)) enum { SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DUMMY_PROPERTY @@ -808,37 +814,37 @@ GDateTime* search_condition_date_get_date_one (SearchConditionDate* self); GDateTime* search_condition_date_get_date_two (SearchConditionDate* self); static gboolean saved_search_dialog_search_row_date_real_is_complete (SavedSearchDialogSearchRow* base); static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialogSearchRowDate* self, GtkCalendar* cal); -static Block9Data* block9_data_ref (Block9Data* _data9_); -static void block9_data_unref (void * _userdata_); +static Block10Data* block10_data_ref (Block10Data* _data10_); +static void block10_data_unref (void * _userdata_); #define RESOURCES_CANCEL_LABEL _ ("_Cancel") #define RESOURCES_OK_LABEL _ ("_OK") -static void __lambda12_ (SavedSearchDialogSearchRowDate* self); -static void ___lambda12__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self); -static void __lambda13_ (Block9Data* _data9_); -static void ___lambda13__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self); -static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearchRow* obj); -static void saved_search_dialog_finalize (SavedSearchDialog* obj); +static void __lambda13_ (SavedSearchDialogSearchRowDate* self); +static void ___lambda13__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self); +static void __lambda14_ (Block10Data* _data10_); +static void ___lambda14__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self); +static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearchRow * obj); +static void saved_search_dialog_finalize (SavedSearchDialog * obj); static void _saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_on_title_changed ((SavedSearchDialog*) self); -#line 827 "SavedSearchDialog.c" +#line 833 "SavedSearchDialog.c" } SavedSearchDialog* saved_search_dialog_construct (GType object_type) { SavedSearchDialog* self = NULL; - GtkEntry* _tmp0_ = NULL; - SavedSearchTable* _tmp1_ = NULL; - SavedSearchTable* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GtkEntry* _tmp5_ = NULL; - GeeArrayList* _tmp6_ = NULL; - gpointer _tmp7_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp8_ = NULL; - GtkDialog* _tmp9_ = NULL; + GtkEntry* _tmp0_; + SavedSearchTable* _tmp1_; + SavedSearchTable* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GtkEntry* _tmp5_; + GeeArrayList* _tmp6_; + gpointer _tmp7_; + SavedSearchDialogSearchRowContainer* _tmp8_; + GtkDialog* _tmp9_; #line 648 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = (SavedSearchDialog*) g_type_create_instance (object_type); #line 649 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -883,39 +889,39 @@ SavedSearchDialog* saved_search_dialog_construct (GType object_type) { saved_search_dialog_set_valid (self, FALSE); #line 648 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 887 "SavedSearchDialog.c" +#line 893 "SavedSearchDialog.c" } SavedSearchDialog* saved_search_dialog_new (void) { #line 648 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_construct (TYPE_SAVED_SEARCH_DIALOG); -#line 894 "SavedSearchDialog.c" +#line 900 "SavedSearchDialog.c" } static gpointer _g_object_ref0 (gpointer self) { #line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self ? g_object_ref (self) : NULL; -#line 901 "SavedSearchDialog.c" +#line 907 "SavedSearchDialog.c" } SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_type, SavedSearch* saved_search) { SavedSearchDialog* self = NULL; - SavedSearch* _tmp0_ = NULL; - SavedSearch* _tmp1_ = NULL; - GtkDialog* _tmp2_ = NULL; - GtkComboBoxText* _tmp3_ = NULL; - SavedSearch* _tmp4_ = NULL; - SearchOperator _tmp5_ = 0; - GtkEntry* _tmp6_ = NULL; - SavedSearch* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - GeeArrayList* _tmp24_ = NULL; - gint _tmp25_ = 0; - gint _tmp26_ = 0; + SavedSearch* _tmp0_; + SavedSearch* _tmp1_; + GtkDialog* _tmp2_; + GtkComboBoxText* _tmp3_; + SavedSearch* _tmp4_; + SearchOperator _tmp5_; + GtkEntry* _tmp6_; + SavedSearch* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + GeeArrayList* _tmp24_; + gint _tmp25_; + gint _tmp26_; #line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (IS_SAVED_SEARCH (saved_search), NULL); #line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -956,15 +962,15 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ gtk_entry_set_text (_tmp6_, _tmp9_); #line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_free0 (_tmp9_); -#line 960 "SavedSearchDialog.c" +#line 966 "SavedSearchDialog.c" { GeeList* _sc_list = NULL; - SavedSearch* _tmp10_ = NULL; - GeeList* _tmp11_ = NULL; + SavedSearch* _tmp10_; + GeeList* _tmp11_; gint _sc_size = 0; - GeeList* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; + GeeList* _tmp12_; + gint _tmp13_; + gint _tmp14_; gint _sc_index = 0; #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = saved_search; @@ -984,17 +990,17 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ _sc_index = -1; #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" while (TRUE) { -#line 988 "SavedSearchDialog.c" - gint _tmp15_ = 0; - gint _tmp16_ = 0; - gint _tmp17_ = 0; +#line 994 "SavedSearchDialog.c" + gint _tmp15_; + gint _tmp16_; + gint _tmp17_; SearchCondition* sc = NULL; - GeeList* _tmp18_ = NULL; - gint _tmp19_ = 0; - gpointer _tmp20_ = NULL; - SearchCondition* _tmp21_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp22_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp23_ = NULL; + GeeList* _tmp18_; + gint _tmp19_; + gpointer _tmp20_; + SearchCondition* _tmp21_; + SavedSearchDialogSearchRowContainer* _tmp22_; + SavedSearchDialogSearchRowContainer* _tmp23_; #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp15_ = _sc_index; #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1007,7 +1013,7 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ if (!(_tmp16_ < _tmp17_)) { #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 1011 "SavedSearchDialog.c" +#line 1017 "SavedSearchDialog.c" } #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp18_ = _sc_list; @@ -1029,11 +1035,11 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ _saved_search_dialog_search_row_container_unref0 (_tmp23_); #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (sc); -#line 1033 "SavedSearchDialog.c" +#line 1039 "SavedSearchDialog.c" } #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_sc_list); -#line 1037 "SavedSearchDialog.c" +#line 1043 "SavedSearchDialog.c" } #line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp24_ = self->priv->row_list; @@ -1043,10 +1049,10 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ _tmp26_ = _tmp25_; #line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp26_ == 1) { -#line 1047 "SavedSearchDialog.c" - GeeArrayList* _tmp27_ = NULL; - gpointer _tmp28_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp29_ = NULL; +#line 1053 "SavedSearchDialog.c" + GeeArrayList* _tmp27_; + gpointer _tmp28_; + SavedSearchDialogSearchRowContainer* _tmp29_; #line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp27_ = self->priv->row_list; #line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1057,27 +1063,27 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ saved_search_dialog_search_row_container_allow_removal (_tmp29_, FALSE); #line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (_tmp29_); -#line 1061 "SavedSearchDialog.c" +#line 1067 "SavedSearchDialog.c" } #line 680 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_set_valid (self, TRUE); #line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 1067 "SavedSearchDialog.c" +#line 1073 "SavedSearchDialog.c" } SavedSearchDialog* saved_search_dialog_new_edit_existing (SavedSearch* saved_search) { #line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_construct_edit_existing (TYPE_SAVED_SEARCH_DIALOG, saved_search); -#line 1074 "SavedSearchDialog.c" +#line 1080 "SavedSearchDialog.c" } static void _saved_search_dialog_on_response_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { #line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_on_response ((SavedSearchDialog*) self, response_id); -#line 1081 "SavedSearchDialog.c" +#line 1087 "SavedSearchDialog.c" } @@ -1086,52 +1092,46 @@ static gboolean _saved_search_dialog_on_add_criteria_gtk_widget_button_press_eve result = saved_search_dialog_on_add_criteria ((SavedSearchDialog*) self, event); #line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 1090 "SavedSearchDialog.c" +#line 1096 "SavedSearchDialog.c" } static void saved_search_dialog_setup_dialog (SavedSearchDialog* self) { - GtkBuilder* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - AppWindow* _tmp2_ = NULL; - AppWindow* _tmp3_ = NULL; - GdkWindow* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - GtkDialog* _tmp7_ = NULL; - GtkDialog* _tmp8_ = NULL; - GtkDialog* _tmp9_ = NULL; - AppWindow* _tmp10_ = NULL; - AppWindow* _tmp11_ = NULL; - GtkDialog* _tmp12_ = NULL; - GtkDialog* _tmp13_ = NULL; - GtkDialog* _tmp14_ = NULL; - GtkBox* _tmp15_ = NULL; - GtkBuilder* _tmp16_ = NULL; - GObject* _tmp17_ = NULL; - GtkDialog* _tmp18_ = NULL; - GtkBuilder* _tmp19_ = NULL; - GObject* _tmp20_ = NULL; - GtkButton* _tmp21_ = NULL; - GtkButton* _tmp22_ = NULL; - GtkBuilder* _tmp23_ = NULL; - GObject* _tmp24_ = NULL; - GtkEntry* _tmp25_ = NULL; - GtkEntry* _tmp26_ = NULL; - GtkEntry* _tmp27_ = NULL; - GtkBuilder* _tmp28_ = NULL; - GObject* _tmp29_ = NULL; - GtkBox* _tmp30_ = NULL; - GtkBuilder* _tmp31_ = NULL; - GObject* _tmp32_ = NULL; - GtkComboBoxText* _tmp33_ = NULL; - GtkComboBoxText* _tmp34_ = NULL; - const gchar* _tmp35_ = NULL; - GtkComboBoxText* _tmp36_ = NULL; - const gchar* _tmp37_ = NULL; - GtkComboBoxText* _tmp38_ = NULL; - const gchar* _tmp39_ = NULL; - GtkComboBoxText* _tmp40_ = NULL; + GtkBuilder* _tmp0_; + AppWindow* _tmp1_; + AppWindow* _tmp2_; + GdkWindow* _tmp3_; + GtkDialog* _tmp4_; + GtkDialog* _tmp5_; + GtkDialog* _tmp6_; + AppWindow* _tmp7_; + AppWindow* _tmp8_; + GtkDialog* _tmp9_; + GtkDialog* _tmp10_; + GtkDialog* _tmp11_; + GtkBox* _tmp12_; + GtkBuilder* _tmp13_; + GObject* _tmp14_; + GtkDialog* _tmp15_; + GtkBuilder* _tmp16_; + GObject* _tmp17_; + GtkButton* _tmp18_; + GtkButton* _tmp19_; + GtkBuilder* _tmp20_; + GObject* _tmp21_; + GtkEntry* _tmp22_; + GtkEntry* _tmp23_; + GtkEntry* _tmp24_; + GtkBuilder* _tmp25_; + GObject* _tmp26_; + GtkBox* _tmp27_; + GtkBuilder* _tmp28_; + GObject* _tmp29_; + GtkComboBoxText* _tmp30_; + GtkComboBoxText* _tmp31_; + GtkComboBoxText* _tmp32_; + GtkComboBoxText* _tmp33_; + GtkComboBoxText* _tmp34_; #line 688 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); #line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1141,144 +1141,132 @@ static void saved_search_dialog_setup_dialog (SavedSearchDialog* self) { #line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->builder = _tmp0_; #line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = _ ("Search"); -#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = app_window_get_instance (); -#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = _tmp2_; -#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); + _tmp1_ = app_window_get_instance (); #line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = _ ("Cancel"); + _tmp2_ = _tmp1_; #line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = _ ("OK"); + _tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); #line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = (GtkDialog*) gtk_dialog_new_with_buttons (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow), (GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT) | GTK_DIALOG_USE_HEADER_BAR, _tmp5_, GTK_RESPONSE_CANCEL, _tmp6_, GTK_RESPONSE_OK, NULL, NULL); + _tmp4_ = (GtkDialog*) gtk_dialog_new_with_buttons (_ ("Search"), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_window_get_type (), GtkWindow), (GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT) | GTK_DIALOG_USE_HEADER_BAR, _ ("Cancel"), GTK_RESPONSE_CANCEL, _ ("OK"), GTK_RESPONSE_OK, NULL, NULL); #line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp7_); + g_object_ref_sink (_tmp4_); #line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->dialog); #line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->dialog = _tmp7_; + self->priv->dialog = _tmp4_; #line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 699 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = self->priv->dialog; + _tmp5_ = self->priv->dialog; #line 699 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), FALSE); + gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow), FALSE); #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = self->priv->dialog; + _tmp6_ = self->priv->dialog; #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = app_window_get_instance (); + _tmp7_ = app_window_get_instance (); #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow)); + gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow)); #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp8_); #line 701 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = self->priv->dialog; + _tmp9_ = self->priv->dialog; #line 701 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_dialog_set_default_response (_tmp12_, (gint) GTK_RESPONSE_OK); + gtk_dialog_set_default_response (_tmp9_, (gint) GTK_RESPONSE_OK); #line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = self->priv->dialog; + _tmp10_ = self->priv->dialog; #line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (_tmp13_, "response", (GCallback) _saved_search_dialog_on_response_gtk_dialog_response, self); + g_signal_connect (_tmp10_, "response", (GCallback) _saved_search_dialog_on_response_gtk_dialog_response, self); #line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = self->priv->dialog; + _tmp11_ = self->priv->dialog; #line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = (GtkBox*) gtk_dialog_get_content_area (_tmp14_); + _tmp12_ = (GtkBox*) gtk_dialog_get_content_area (_tmp11_); #line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = self->priv->builder; + _tmp13_ = self->priv->builder; #line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = gtk_builder_get_object (_tmp16_, "criteria"); + _tmp14_ = gtk_builder_get_object (_tmp13_, "criteria"); #line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp17_) : NULL); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp14_) : NULL); #line 704 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp18_ = self->priv->dialog; + _tmp15_ = self->priv->dialog; #line 704 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_dialog_set_default_response (_tmp18_, (gint) GTK_RESPONSE_OK); + gtk_dialog_set_default_response (_tmp15_, (gint) GTK_RESPONSE_OK); #line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = self->priv->builder; + _tmp16_ = self->priv->builder; #line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = gtk_builder_get_object (_tmp19_, "Add search button"); + _tmp17_ = gtk_builder_get_object (_tmp16_, "Add search button"); #line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_button_get_type ()) ? ((GtkButton*) _tmp20_) : NULL); + _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_button_get_type ()) ? ((GtkButton*) _tmp17_) : NULL); #line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->add_criteria); #line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->add_criteria = _tmp21_; + self->priv->add_criteria = _tmp18_; #line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp22_ = self->priv->add_criteria; + _tmp19_ = self->priv->add_criteria; #line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _saved_search_dialog_on_add_criteria_gtk_widget_button_press_event, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _saved_search_dialog_on_add_criteria_gtk_widget_button_press_event, self); #line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp23_ = self->priv->builder; + _tmp20_ = self->priv->builder; #line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp24_ = gtk_builder_get_object (_tmp23_, "Search title"); + _tmp21_ = gtk_builder_get_object (_tmp20_, "Search title"); #line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp24_) : NULL); + _tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp21_) : NULL); #line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->search_title); #line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->search_title = _tmp25_; + self->priv->search_title = _tmp22_; #line 710 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp26_ = self->priv->search_title; + _tmp23_ = self->priv->search_title; #line 710 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_entry_set_activates_default (_tmp26_, TRUE); + gtk_entry_set_activates_default (_tmp23_, TRUE); #line 711 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp27_ = self->priv->search_title; + _tmp24_ = self->priv->search_title; #line 711 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_on_title_changed_gtk_editable_changed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_on_title_changed_gtk_editable_changed, self); #line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp28_ = self->priv->builder; + _tmp25_ = self->priv->builder; #line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp29_ = gtk_builder_get_object (_tmp28_, "row_box"); + _tmp26_ = gtk_builder_get_object (_tmp25_, "row_box"); #line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_box_get_type ()) ? ((GtkBox*) _tmp29_) : NULL); + _tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, gtk_box_get_type ()) ? ((GtkBox*) _tmp26_) : NULL); #line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->row_box); #line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->row_box = _tmp30_; + self->priv->row_box = _tmp27_; #line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp31_ = self->priv->builder; + _tmp28_ = self->priv->builder; #line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp32_ = gtk_builder_get_object (_tmp31_, "Type of search criteria"); + _tmp29_ = gtk_builder_get_object (_tmp28_, "Type of search criteria"); #line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp32_) : NULL); + _tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp29_) : NULL); #line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->operator); #line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->operator = _tmp33_; -#line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp34_ = self->priv->operator; + self->priv->operator = _tmp30_; #line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp35_ = _ ("any"); + _tmp31_ = self->priv->operator; #line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp34_, _tmp35_); + gtk_combo_box_text_append_text (_tmp31_, _ ("any")); #line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp36_ = self->priv->operator; + _tmp32_ = self->priv->operator; #line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp37_ = _ ("all"); -#line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp36_, _tmp37_); -#line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp38_ = self->priv->operator; + gtk_combo_box_text_append_text (_tmp32_, _ ("all")); #line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp39_ = _ ("none"); + _tmp33_ = self->priv->operator; #line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp38_, _tmp39_); + gtk_combo_box_text_append_text (_tmp33_, _ ("none")); #line 719 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp40_ = self->priv->operator; + _tmp34_ = self->priv->operator; #line 719 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_combo_box_get_type (), GtkComboBox), 0); -#line 1276 "SavedSearchDialog.c" + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox), 0); +#line 1264 "SavedSearchDialog.c" } void saved_search_dialog_show (SavedSearchDialog* self) { - GtkDialog* _tmp0_ = NULL; - GtkDialog* _tmp1_ = NULL; + GtkDialog* _tmp0_; + GtkDialog* _tmp1_; #line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); #line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1289,7 +1277,7 @@ void saved_search_dialog_show (SavedSearchDialog* self) { _tmp1_ = self->priv->dialog; #line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); -#line 1293 "SavedSearchDialog.c" +#line 1281 "SavedSearchDialog.c" } @@ -1305,13 +1293,13 @@ static gboolean saved_search_dialog_on_add_criteria (SavedSearchDialog* self, Gd result = FALSE; #line 731 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 1309 "SavedSearchDialog.c" +#line 1297 "SavedSearchDialog.c" } static void saved_search_dialog_add_text_search (SavedSearchDialog* self) { SavedSearchDialogSearchRowContainer* text = NULL; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; #line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); #line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1322,38 +1310,38 @@ static void saved_search_dialog_add_text_search (SavedSearchDialog* self) { saved_search_dialog_add_row (self, text); #line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (text); -#line 1326 "SavedSearchDialog.c" +#line 1314 "SavedSearchDialog.c" } static void _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove (SavedSearchDialogSearchRowContainer* _sender, SavedSearchDialogSearchRowContainer* this_row, gpointer self) { #line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_on_remove_row ((SavedSearchDialog*) self, this_row); -#line 1333 "SavedSearchDialog.c" +#line 1321 "SavedSearchDialog.c" } static void _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed (SavedSearchDialogSearchRowContainer* _sender, SavedSearchDialogSearchRowContainer* this_row, gpointer self) { #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_on_row_changed ((SavedSearchDialog*) self, this_row); -#line 1340 "SavedSearchDialog.c" +#line 1328 "SavedSearchDialog.c" } static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row) { - GeeArrayList* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - GtkBox* _tmp6_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp7_ = NULL; - GtkWidget* _tmp8_ = NULL; - GtkWidget* _tmp9_ = NULL; - GeeArrayList* _tmp10_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp11_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp12_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp13_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; + GeeArrayList* _tmp0_; + gint _tmp1_; + gint _tmp2_; + GtkBox* _tmp6_; + SavedSearchDialogSearchRowContainer* _tmp7_; + GtkWidget* _tmp8_; + GtkWidget* _tmp9_; + GeeArrayList* _tmp10_; + SavedSearchDialogSearchRowContainer* _tmp11_; + SavedSearchDialogSearchRowContainer* _tmp12_; + SavedSearchDialogSearchRowContainer* _tmp13_; + SavedSearchDialogSearchRowContainer* _tmp14_; + gboolean _tmp15_; #line 740 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); #line 740 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1366,10 +1354,10 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia _tmp2_ = _tmp1_; #line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp2_ == 1) { -#line 1370 "SavedSearchDialog.c" - GeeArrayList* _tmp3_ = NULL; - gpointer _tmp4_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp5_ = NULL; +#line 1358 "SavedSearchDialog.c" + GeeArrayList* _tmp3_; + gpointer _tmp4_; + SavedSearchDialogSearchRowContainer* _tmp5_; #line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->row_list; #line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1380,7 +1368,7 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia saved_search_dialog_search_row_container_allow_removal (_tmp5_, TRUE); #line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (_tmp5_); -#line 1384 "SavedSearchDialog.c" +#line 1372 "SavedSearchDialog.c" } #line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = self->priv->row_box; @@ -1414,24 +1402,24 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia _tmp15_ = saved_search_dialog_search_row_container_is_complete (_tmp14_); #line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_set_valid (self, _tmp15_); -#line 1418 "SavedSearchDialog.c" +#line 1406 "SavedSearchDialog.c" } static void saved_search_dialog_on_remove_row (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row) { - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - guint _tmp1_ = 0U; - SavedSearchDialogSearchRowContainer* _tmp2_ = NULL; - guint _tmp3_ = 0U; - GtkBox* _tmp4_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp5_ = NULL; - GtkWidget* _tmp6_ = NULL; - GtkWidget* _tmp7_ = NULL; - GeeArrayList* _tmp8_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp9_ = NULL; - GeeArrayList* _tmp10_ = NULL; - gint _tmp11_ = 0; - gint _tmp12_ = 0; + SavedSearchDialogSearchRowContainer* _tmp0_; + guint _tmp1_; + SavedSearchDialogSearchRowContainer* _tmp2_; + guint _tmp3_; + GtkBox* _tmp4_; + SavedSearchDialogSearchRowContainer* _tmp5_; + GtkWidget* _tmp6_; + GtkWidget* _tmp7_; + GeeArrayList* _tmp8_; + SavedSearchDialogSearchRowContainer* _tmp9_; + GeeArrayList* _tmp10_; + gint _tmp11_; + gint _tmp12_; #line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); #line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1474,10 +1462,10 @@ static void saved_search_dialog_on_remove_row (SavedSearchDialog* self, SavedSea _tmp12_ = _tmp11_; #line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp12_ == 1) { -#line 1478 "SavedSearchDialog.c" - GeeArrayList* _tmp13_ = NULL; - gpointer _tmp14_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp15_ = NULL; +#line 1466 "SavedSearchDialog.c" + GeeArrayList* _tmp13_; + gpointer _tmp14_; + SavedSearchDialogSearchRowContainer* _tmp15_; #line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp13_ = self->priv->row_list; #line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1488,44 +1476,44 @@ static void saved_search_dialog_on_remove_row (SavedSearchDialog* self, SavedSea saved_search_dialog_search_row_container_allow_removal (_tmp15_, FALSE); #line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (_tmp15_); -#line 1492 "SavedSearchDialog.c" +#line 1480 "SavedSearchDialog.c" } #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_set_valid (self, TRUE); -#line 1496 "SavedSearchDialog.c" +#line 1484 "SavedSearchDialog.c" } static void saved_search_dialog_on_response (SavedSearchDialog* self, gint response_id) { - gint _tmp0_ = 0; + gint _tmp0_; #line 761 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); #line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = response_id; #line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) { -#line 1508 "SavedSearchDialog.c" +#line 1496 "SavedSearchDialog.c" gboolean _tmp1_ = FALSE; - SavedSearchTable* _tmp2_ = NULL; - SavedSearchTable* _tmp3_ = NULL; - GtkEntry* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - gboolean _tmp7_ = FALSE; - gboolean _tmp19_ = FALSE; + SavedSearchTable* _tmp2_; + SavedSearchTable* _tmp3_; + GtkEntry* _tmp4_; + const gchar* _tmp5_; + gboolean _tmp6_; + gboolean _tmp7_; + gboolean _tmp19_; GeeArrayList* conditions = NULL; - GeeArrayList* _tmp23_ = NULL; + GeeArrayList* _tmp23_; SearchOperator search_operator = 0; - GtkComboBoxText* _tmp39_ = NULL; - gint _tmp40_ = 0; - SavedSearchTable* _tmp41_ = NULL; - SavedSearchTable* _tmp42_ = NULL; - GtkEntry* _tmp43_ = NULL; - const gchar* _tmp44_ = NULL; - SearchOperator _tmp45_ = 0; - GeeArrayList* _tmp46_ = NULL; - SavedSearch* _tmp47_ = NULL; - SavedSearch* _tmp48_ = NULL; + GtkComboBoxText* _tmp39_; + gint _tmp40_; + SavedSearchTable* _tmp41_; + SavedSearchTable* _tmp42_; + GtkEntry* _tmp43_; + const gchar* _tmp44_; + SearchOperator _tmp45_; + GeeArrayList* _tmp46_; + SavedSearch* _tmp47_; + SavedSearch* _tmp48_; #line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = saved_search_table_get_instance (); #line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1542,19 +1530,19 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo _saved_search_table_unref0 (_tmp3_); #line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp7_) { -#line 1546 "SavedSearchDialog.c" +#line 1534 "SavedSearchDialog.c" gboolean _tmp8_ = FALSE; - gboolean _tmp9_ = FALSE; + gboolean _tmp9_; #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = self->priv->edit_mode; #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp9_) { -#line 1553 "SavedSearchDialog.c" - SavedSearch* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - GtkEntry* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; +#line 1541 "SavedSearchDialog.c" + SavedSearch* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + GtkEntry* _tmp13_; + const gchar* _tmp14_; #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = self->priv->previous_search; #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1569,27 +1557,27 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo _tmp8_ = g_strcmp0 (_tmp12_, _tmp14_) == 0; #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_free0 (_tmp12_); -#line 1573 "SavedSearchDialog.c" +#line 1561 "SavedSearchDialog.c" } else { #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = FALSE; -#line 1577 "SavedSearchDialog.c" +#line 1565 "SavedSearchDialog.c" } #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = !_tmp8_; -#line 1581 "SavedSearchDialog.c" +#line 1569 "SavedSearchDialog.c" } else { #line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = FALSE; -#line 1585 "SavedSearchDialog.c" +#line 1573 "SavedSearchDialog.c" } #line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp1_) { -#line 1589 "SavedSearchDialog.c" - GtkEntry* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; +#line 1577 "SavedSearchDialog.c" + GtkEntry* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; #line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp15_ = self->priv->search_title; #line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1604,16 +1592,16 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo _g_free0 (_tmp18_); #line 766 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return; -#line 1608 "SavedSearchDialog.c" +#line 1596 "SavedSearchDialog.c" } #line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp19_ = self->priv->edit_mode; #line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp19_) { -#line 1614 "SavedSearchDialog.c" - SavedSearchTable* _tmp20_ = NULL; - SavedSearchTable* _tmp21_ = NULL; - SavedSearch* _tmp22_ = NULL; +#line 1602 "SavedSearchDialog.c" + SavedSearchTable* _tmp20_; + SavedSearchTable* _tmp21_; + SavedSearch* _tmp22_; #line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp20_ = saved_search_table_get_instance (); #line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1624,21 +1612,21 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo saved_search_table_remove (_tmp21_, _tmp22_); #line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_table_unref0 (_tmp21_); -#line 1628 "SavedSearchDialog.c" +#line 1616 "SavedSearchDialog.c" } #line 775 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp23_ = gee_array_list_new (TYPE_SEARCH_CONDITION, (GBoxedCopyFunc) search_condition_ref, (GDestroyNotify) search_condition_unref, NULL, NULL, NULL); #line 775 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" conditions = _tmp23_; -#line 1634 "SavedSearchDialog.c" +#line 1622 "SavedSearchDialog.c" { GeeArrayList* _c_list = NULL; - GeeArrayList* _tmp24_ = NULL; - GeeArrayList* _tmp25_ = NULL; + GeeArrayList* _tmp24_; + GeeArrayList* _tmp25_; gint _c_size = 0; - GeeArrayList* _tmp26_ = NULL; - gint _tmp27_ = 0; - gint _tmp28_ = 0; + GeeArrayList* _tmp26_; + gint _tmp27_; + gint _tmp28_; gint _c_index = 0; #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp24_ = self->priv->row_list; @@ -1658,18 +1646,18 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo _c_index = -1; #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" while (TRUE) { -#line 1662 "SavedSearchDialog.c" - gint _tmp29_ = 0; - gint _tmp30_ = 0; - gint _tmp31_ = 0; +#line 1650 "SavedSearchDialog.c" + gint _tmp29_; + gint _tmp30_; + gint _tmp31_; SavedSearchDialogSearchRowContainer* c = NULL; - GeeArrayList* _tmp32_ = NULL; - gint _tmp33_ = 0; - gpointer _tmp34_ = NULL; - GeeArrayList* _tmp35_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp36_ = NULL; - SearchCondition* _tmp37_ = NULL; - SearchCondition* _tmp38_ = NULL; + GeeArrayList* _tmp32_; + gint _tmp33_; + gpointer _tmp34_; + GeeArrayList* _tmp35_; + SavedSearchDialogSearchRowContainer* _tmp36_; + SearchCondition* _tmp37_; + SearchCondition* _tmp38_; #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp29_ = _c_index; #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1682,7 +1670,7 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo if (!(_tmp30_ < _tmp31_)) { #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 1686 "SavedSearchDialog.c" +#line 1674 "SavedSearchDialog.c" } #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp32_ = _c_list; @@ -1706,11 +1694,11 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo _search_condition_unref0 (_tmp38_); #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (c); -#line 1710 "SavedSearchDialog.c" +#line 1698 "SavedSearchDialog.c" } #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_c_list); -#line 1714 "SavedSearchDialog.c" +#line 1702 "SavedSearchDialog.c" } #line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp39_ = self->priv->operator; @@ -1740,14 +1728,14 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo _saved_search_table_unref0 (_tmp42_); #line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (conditions); -#line 1744 "SavedSearchDialog.c" +#line 1732 "SavedSearchDialog.c" } } static void saved_search_dialog_on_row_changed (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row) { - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SavedSearchDialogSearchRowContainer* _tmp0_; + gboolean _tmp1_; #line 786 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); #line 786 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1758,42 +1746,42 @@ static void saved_search_dialog_on_row_changed (SavedSearchDialog* self, SavedSe _tmp1_ = saved_search_dialog_search_row_container_is_complete (_tmp0_); #line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_set_valid (self, _tmp1_); -#line 1762 "SavedSearchDialog.c" +#line 1750 "SavedSearchDialog.c" } static void saved_search_dialog_on_title_changed (SavedSearchDialog* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 790 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); #line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = saved_search_dialog_is_title_valid (self); #line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_set_valid (self, _tmp0_); -#line 1774 "SavedSearchDialog.c" +#line 1762 "SavedSearchDialog.c" } static gchar* string_chomp (const gchar* self) { gchar* result = NULL; gchar* _result_ = NULL; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; -#line 1191 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + const gchar* _tmp1_; +#line 1218 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_strchomp (_tmp1_); -#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1797 "SavedSearchDialog.c" +#line 1785 "SavedSearchDialog.c" } @@ -1801,44 +1789,44 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - GtkEntry* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; - SavedSearchTable* _tmp14_ = NULL; - SavedSearchTable* _tmp15_ = NULL; - GtkEntry* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; - gboolean _tmp19_ = FALSE; + gboolean _tmp2_; + GtkEntry* _tmp9_; + const gchar* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gboolean _tmp13_; + SavedSearchTable* _tmp14_; + SavedSearchTable* _tmp15_; + GtkEntry* _tmp16_; + const gchar* _tmp17_; + gboolean _tmp18_; + gboolean _tmp19_; #line 794 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (IS_SAVED_SEARCH_DIALOG (self), FALSE); #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->edit_mode; #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp2_) { -#line 1823 "SavedSearchDialog.c" - SavedSearch* _tmp3_ = NULL; +#line 1811 "SavedSearchDialog.c" + SavedSearch* _tmp3_; #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->previous_search; #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _tmp3_ != NULL; -#line 1829 "SavedSearchDialog.c" +#line 1817 "SavedSearchDialog.c" } else { #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = FALSE; -#line 1833 "SavedSearchDialog.c" +#line 1821 "SavedSearchDialog.c" } #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp1_) { -#line 1837 "SavedSearchDialog.c" - SavedSearch* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - GtkEntry* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; +#line 1825 "SavedSearchDialog.c" + SavedSearch* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GtkEntry* _tmp7_; + const gchar* _tmp8_; #line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = self->priv->previous_search; #line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1853,11 +1841,11 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) { _tmp0_ = g_strcmp0 (_tmp6_, _tmp8_) == 0; #line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_free0 (_tmp6_); -#line 1857 "SavedSearchDialog.c" +#line 1845 "SavedSearchDialog.c" } else { #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = FALSE; -#line 1861 "SavedSearchDialog.c" +#line 1849 "SavedSearchDialog.c" } #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp0_) { @@ -1865,7 +1853,7 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) { result = TRUE; #line 797 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 1869 "SavedSearchDialog.c" +#line 1857 "SavedSearchDialog.c" } #line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = self->priv->search_title; @@ -1885,7 +1873,7 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) { result = FALSE; #line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 1889 "SavedSearchDialog.c" +#line 1877 "SavedSearchDialog.c" } #line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp14_ = saved_search_table_get_instance (); @@ -1907,20 +1895,20 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) { result = FALSE; #line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 1911 "SavedSearchDialog.c" +#line 1899 "SavedSearchDialog.c" } #line 802 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = TRUE; #line 802 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 1917 "SavedSearchDialog.c" +#line 1905 "SavedSearchDialog.c" } static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) { - gboolean _tmp0_ = FALSE; - GtkDialog* _tmp22_ = NULL; - gboolean _tmp23_ = FALSE; + gboolean _tmp0_; + GtkDialog* _tmp22_; + gboolean _tmp23_; #line 806 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); #line 807 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1929,39 +1917,39 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) if (!_tmp0_) { #line 808 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->valid = FALSE; -#line 1933 "SavedSearchDialog.c" +#line 1921 "SavedSearchDialog.c" } else { - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; + gboolean _tmp1_; + gboolean _tmp2_; #line 809 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = v; #line 809 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->valid; #line 809 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp1_ != _tmp2_) { -#line 1943 "SavedSearchDialog.c" - gboolean _tmp3_ = FALSE; +#line 1931 "SavedSearchDialog.c" + gboolean _tmp3_; #line 810 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = saved_search_dialog_is_title_valid (self); #line 810 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp3_) { -#line 1949 "SavedSearchDialog.c" +#line 1937 "SavedSearchDialog.c" gint valid_rows = 0; - gint _tmp18_ = 0; - GeeArrayList* _tmp19_ = NULL; - gint _tmp20_ = 0; - gint _tmp21_ = 0; + gint _tmp18_; + GeeArrayList* _tmp19_; + gint _tmp20_; + gint _tmp21_; #line 812 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" valid_rows = 0; -#line 1957 "SavedSearchDialog.c" +#line 1945 "SavedSearchDialog.c" { GeeArrayList* _c_list = NULL; - GeeArrayList* _tmp4_ = NULL; - GeeArrayList* _tmp5_ = NULL; + GeeArrayList* _tmp4_; + GeeArrayList* _tmp5_; gint _c_size = 0; - GeeArrayList* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + GeeArrayList* _tmp6_; + gint _tmp7_; + gint _tmp8_; gint _c_index = 0; #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = self->priv->row_list; @@ -1981,16 +1969,16 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) _c_index = -1; #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" while (TRUE) { -#line 1985 "SavedSearchDialog.c" - gint _tmp9_ = 0; - gint _tmp10_ = 0; - gint _tmp11_ = 0; +#line 1973 "SavedSearchDialog.c" + gint _tmp9_; + gint _tmp10_; + gint _tmp11_; SavedSearchDialogSearchRowContainer* c = NULL; - GeeArrayList* _tmp12_ = NULL; - gint _tmp13_ = 0; - gpointer _tmp14_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; + GeeArrayList* _tmp12_; + gint _tmp13_; + gpointer _tmp14_; + SavedSearchDialogSearchRowContainer* _tmp15_; + gboolean _tmp16_; #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = _c_index; #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2003,7 +1991,7 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) if (!(_tmp10_ < _tmp11_)) { #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2007 "SavedSearchDialog.c" +#line 1995 "SavedSearchDialog.c" } #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp12_ = _c_list; @@ -2019,21 +2007,21 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) _tmp16_ = saved_search_dialog_search_row_container_is_complete (_tmp15_); #line 814 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp16_) { -#line 2023 "SavedSearchDialog.c" - gint _tmp17_ = 0; +#line 2011 "SavedSearchDialog.c" + gint _tmp17_; #line 815 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp17_ = valid_rows; #line 815 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" valid_rows = _tmp17_ + 1; -#line 2029 "SavedSearchDialog.c" +#line 2017 "SavedSearchDialog.c" } #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (c); -#line 2033 "SavedSearchDialog.c" +#line 2021 "SavedSearchDialog.c" } #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_c_list); -#line 2037 "SavedSearchDialog.c" +#line 2025 "SavedSearchDialog.c" } #line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp18_ = valid_rows; @@ -2045,11 +2033,11 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) _tmp21_ = _tmp20_; #line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->valid = _tmp18_ == _tmp21_; -#line 2049 "SavedSearchDialog.c" +#line 2037 "SavedSearchDialog.c" } else { #line 819 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->valid = FALSE; -#line 2053 "SavedSearchDialog.c" +#line 2041 "SavedSearchDialog.c" } } } @@ -2059,7 +2047,7 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) _tmp23_ = self->priv->valid; #line 823 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_dialog_set_response_sensitive (_tmp22_, (gint) GTK_RESPONSE_OK, _tmp23_); -#line 2063 "SavedSearchDialog.c" +#line 2051 "SavedSearchDialog.c" } @@ -2073,27 +2061,27 @@ static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_conta saved_search_dialog_search_row_container_set_type (self, SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT); #line 23 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 2077 "SavedSearchDialog.c" +#line 2065 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new (void) { #line 23 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_container_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER); -#line 2084 "SavedSearchDialog.c" +#line 2072 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct_edit_existing (GType object_type, SearchCondition* sc) { SavedSearchDialogSearchRowContainer* self = NULL; - SearchCondition* _tmp0_ = NULL; - SearchConditionSearchType _tmp1_ = 0; - SearchConditionSearchType _tmp2_ = 0; - SearchCondition* _tmp3_ = NULL; - SearchConditionSearchType _tmp4_ = 0; - SearchConditionSearchType _tmp5_ = 0; - SavedSearchDialogSearchRow* _tmp6_ = NULL; - SearchCondition* _tmp7_ = NULL; + SearchCondition* _tmp0_; + SearchConditionSearchType _tmp1_; + SearchConditionSearchType _tmp2_; + SearchCondition* _tmp3_; + SearchConditionSearchType _tmp4_; + SearchConditionSearchType _tmp5_; + SavedSearchDialogSearchRow* _tmp6_; + SearchCondition* _tmp7_; #line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (IS_SEARCH_CONDITION (sc), NULL); #line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2124,21 +2112,21 @@ static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_conta saved_search_dialog_search_row_populate (_tmp6_, _tmp7_); #line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 2128 "SavedSearchDialog.c" +#line 2116 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new_edit_existing (SearchCondition* sc) { #line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_container_construct_edit_existing (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, sc); -#line 2135 "SavedSearchDialog.c" +#line 2123 "SavedSearchDialog.c" } static void _saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 48 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_on_type_changed ((SavedSearchDialogSearchRowContainer*) self); -#line 2142 "SavedSearchDialog.c" +#line 2130 "SavedSearchDialog.c" } @@ -2147,24 +2135,24 @@ static gboolean _saved_search_dialog_search_row_container_on_removed_gtk_widget_ result = saved_search_dialog_search_row_container_on_removed ((SavedSearchDialogSearchRowContainer*) self, event); #line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 2151 "SavedSearchDialog.c" +#line 2139 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialogSearchRowContainer* self) { - gint _tmp0_ = 0; - SearchConditionSearchType* _tmp1_ = NULL; - GeeHashMap* _tmp2_ = NULL; - GtkComboBoxText* _tmp3_ = NULL; - GtkComboBoxText* _tmp18_ = NULL; - GtkButton* _tmp19_ = NULL; - GtkButton* _tmp20_ = NULL; - GtkBox* _tmp21_ = NULL; - GtkBox* _tmp22_ = NULL; - GtkComboBoxText* _tmp23_ = NULL; - GtkBox* _tmp24_ = NULL; - GtkButton* _tmp25_ = NULL; - GtkBox* _tmp26_ = NULL; + gint _tmp0_; + SearchConditionSearchType* _tmp1_; + GeeHashMap* _tmp2_; + GtkComboBoxText* _tmp3_; + GtkComboBoxText* _tmp18_; + GtkButton* _tmp19_; + GtkButton* _tmp20_; + GtkBox* _tmp21_; + GtkBox* _tmp22_; + GtkComboBoxText* _tmp23_; + GtkBox* _tmp24_; + GtkButton* _tmp25_; + GtkBox* _tmp26_; #line 36 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self)); #line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2193,43 +2181,43 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo _g_object_unref0 (self->priv->type_combo); #line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->type_combo = _tmp3_; -#line 2197 "SavedSearchDialog.c" +#line 2185 "SavedSearchDialog.c" { gint i = 0; #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" i = 0; -#line 2202 "SavedSearchDialog.c" +#line 2190 "SavedSearchDialog.c" { gboolean _tmp4_ = FALSE; #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = TRUE; #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" while (TRUE) { -#line 2209 "SavedSearchDialog.c" - gint _tmp6_ = 0; - SearchConditionSearchType* _tmp7_ = NULL; - gint _tmp7__length1 = 0; +#line 2197 "SavedSearchDialog.c" + gint _tmp6_; + SearchConditionSearchType* _tmp7_; + gint _tmp7__length1; SearchConditionSearchType st = 0; - SearchConditionSearchType* _tmp8_ = NULL; - gint _tmp8__length1 = 0; - gint _tmp9_ = 0; - SearchConditionSearchType _tmp10_ = 0; - GeeHashMap* _tmp11_ = NULL; - SearchConditionSearchType _tmp12_ = 0; - gint _tmp13_ = 0; - GtkComboBoxText* _tmp14_ = NULL; - SearchConditionSearchType _tmp15_ = 0; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; + SearchConditionSearchType* _tmp8_; + gint _tmp8__length1; + gint _tmp9_; + SearchConditionSearchType _tmp10_; + GeeHashMap* _tmp11_; + SearchConditionSearchType _tmp12_; + gint _tmp13_; + GtkComboBoxText* _tmp14_; + SearchConditionSearchType _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!_tmp4_) { -#line 2227 "SavedSearchDialog.c" - gint _tmp5_ = 0; +#line 2215 "SavedSearchDialog.c" + gint _tmp5_; #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = i; #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" i = _tmp5_ + 1; -#line 2233 "SavedSearchDialog.c" +#line 2221 "SavedSearchDialog.c" } #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = FALSE; @@ -2243,7 +2231,7 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo if (!(_tmp6_ < _tmp7__length1)) { #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2247 "SavedSearchDialog.c" +#line 2235 "SavedSearchDialog.c" } #line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = self->priv->search_types; @@ -2275,7 +2263,7 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo gtk_combo_box_text_append_text (_tmp14_, _tmp17_); #line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_free0 (_tmp17_); -#line 2279 "SavedSearchDialog.c" +#line 2267 "SavedSearchDialog.c" } } } @@ -2321,12 +2309,12 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo _tmp26_ = self->priv->box; #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget)); -#line 2325 "SavedSearchDialog.c" +#line 2313 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_container_on_type_changed (SavedSearchDialogSearchRowContainer* self) { - SearchConditionSearchType _tmp0_ = 0; + SearchConditionSearchType _tmp0_; #line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self)); #line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2334,16 +2322,16 @@ static void saved_search_dialog_search_row_container_on_type_changed (SavedSearc #line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_set_type (self, _tmp0_); #line 61 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_emit_by_name (self, "changed", self); -#line 2339 "SavedSearchDialog.c" + g_signal_emit (self, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, self); +#line 2327 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_container_set_type_combo_box (SavedSearchDialogSearchRowContainer* self, SearchConditionSearchType st) { - GtkComboBoxText* _tmp0_ = NULL; - GeeHashMap* _tmp1_ = NULL; - SearchConditionSearchType _tmp2_ = 0; - gpointer _tmp3_ = NULL; + GtkComboBoxText* _tmp0_; + GeeHashMap* _tmp1_; + SearchConditionSearchType _tmp2_; + gpointer _tmp3_; #line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self)); #line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2356,28 +2344,28 @@ static void saved_search_dialog_search_row_container_set_type_combo_box (SavedSe _tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp2_)); #line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), (gint) ((gintptr) _tmp3_)); -#line 2360 "SavedSearchDialog.c" +#line 2348 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_container_set_type (SavedSearchDialogSearchRowContainer* self, SearchConditionSearchType type) { - SavedSearchDialogSearchRow* _tmp0_ = NULL; - SearchConditionSearchType _tmp5_ = 0; - GtkBox* _tmp12_ = NULL; - SavedSearchDialogSearchRow* _tmp13_ = NULL; - GtkWidget* _tmp14_ = NULL; - GtkWidget* _tmp15_ = NULL; + SavedSearchDialogSearchRow* _tmp0_; + SearchConditionSearchType _tmp5_; + GtkBox* _tmp12_; + SavedSearchDialogSearchRow* _tmp13_; + GtkWidget* _tmp14_; + GtkWidget* _tmp15_; #line 68 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self)); #line 69 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->my_row; #line 69 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp0_ != NULL) { -#line 2377 "SavedSearchDialog.c" - GtkBox* _tmp1_ = NULL; - SavedSearchDialogSearchRow* _tmp2_ = NULL; - GtkWidget* _tmp3_ = NULL; - GtkWidget* _tmp4_ = NULL; +#line 2365 "SavedSearchDialog.c" + GtkBox* _tmp1_; + SavedSearchDialogSearchRow* _tmp2_; + GtkWidget* _tmp3_; + GtkWidget* _tmp4_; #line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->box; #line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2390,7 +2378,7 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), _tmp4_); #line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_tmp4_); -#line 2394 "SavedSearchDialog.c" +#line 2382 "SavedSearchDialog.c" } #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = type; @@ -2408,9 +2396,9 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog case SEARCH_CONDITION_SEARCH_TYPE_COMMENT: #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_TITLE: -#line 2412 "SavedSearchDialog.c" +#line 2400 "SavedSearchDialog.c" { - SavedSearchDialogSearchRowText* _tmp6_ = NULL; + SavedSearchDialogSearchRowText* _tmp6_; #line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = saved_search_dialog_search_row_text_new (self); #line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2419,13 +2407,13 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); #line 80 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2423 "SavedSearchDialog.c" +#line 2411 "SavedSearchDialog.c" } #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE: -#line 2427 "SavedSearchDialog.c" +#line 2415 "SavedSearchDialog.c" { - SavedSearchDialogSearchRowMediaType* _tmp7_ = NULL; + SavedSearchDialogSearchRowMediaType* _tmp7_; #line 83 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = saved_search_dialog_search_row_media_type_new (self); #line 83 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2434,13 +2422,13 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); #line 84 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2438 "SavedSearchDialog.c" +#line 2426 "SavedSearchDialog.c" } #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE: -#line 2442 "SavedSearchDialog.c" +#line 2430 "SavedSearchDialog.c" { - SavedSearchDialogSearchRowFlagged* _tmp8_ = NULL; + SavedSearchDialogSearchRowFlagged* _tmp8_; #line 87 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = saved_search_dialog_search_row_flagged_new (self); #line 87 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2449,13 +2437,13 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); #line 88 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2453 "SavedSearchDialog.c" +#line 2441 "SavedSearchDialog.c" } #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE: -#line 2457 "SavedSearchDialog.c" +#line 2445 "SavedSearchDialog.c" { - SavedSearchDialogSearchRowModified* _tmp9_ = NULL; + SavedSearchDialogSearchRowModified* _tmp9_; #line 91 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = saved_search_dialog_search_row_modified_new (self); #line 91 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2464,13 +2452,13 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); #line 92 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2468 "SavedSearchDialog.c" +#line 2456 "SavedSearchDialog.c" } #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_RATING: -#line 2472 "SavedSearchDialog.c" +#line 2460 "SavedSearchDialog.c" { - SavedSearchDialogSearchRowRating* _tmp10_ = NULL; + SavedSearchDialogSearchRowRating* _tmp10_; #line 95 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = saved_search_dialog_search_row_rating_new (self); #line 95 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2479,13 +2467,13 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); #line 96 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2483 "SavedSearchDialog.c" +#line 2471 "SavedSearchDialog.c" } #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_DATE: -#line 2487 "SavedSearchDialog.c" +#line 2475 "SavedSearchDialog.c" { - SavedSearchDialogSearchRowDate* _tmp11_ = NULL; + SavedSearchDialogSearchRowDate* _tmp11_; #line 99 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp11_ = saved_search_dialog_search_row_date_new (self); #line 99 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2494,13 +2482,13 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); #line 100 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2498 "SavedSearchDialog.c" +#line 2486 "SavedSearchDialog.c" } default: { #line 103 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_assert_not_reached (); -#line 2504 "SavedSearchDialog.c" +#line 2492 "SavedSearchDialog.c" } } #line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2515,17 +2503,17 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog gtk_box_pack_start (_tmp12_, _tmp15_, TRUE, TRUE, (guint) 0); #line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_tmp15_); -#line 2519 "SavedSearchDialog.c" +#line 2507 "SavedSearchDialog.c" } static SearchConditionSearchType saved_search_dialog_search_row_container_get_search_type (SavedSearchDialogSearchRowContainer* self) { SearchConditionSearchType result = 0; - SearchConditionSearchType* _tmp0_ = NULL; - gint _tmp0__length1 = 0; - GtkComboBoxText* _tmp1_ = NULL; - gint _tmp2_ = 0; - SearchConditionSearchType _tmp3_ = 0; + SearchConditionSearchType* _tmp0_; + gint _tmp0__length1; + GtkComboBoxText* _tmp1_; + gint _tmp2_; + SearchConditionSearchType _tmp3_; #line 109 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), 0); #line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2542,7 +2530,7 @@ static SearchConditionSearchType saved_search_dialog_search_row_container_get_se result = _tmp3_; #line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 2546 "SavedSearchDialog.c" +#line 2534 "SavedSearchDialog.c" } @@ -2553,18 +2541,18 @@ static gboolean saved_search_dialog_search_row_container_on_removed (SavedSearch #line 113 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (event != NULL, FALSE); #line 114 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_emit_by_name (self, "remove", self); + g_signal_emit (self, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_REMOVE_SIGNAL], 0, self); #line 115 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = FALSE; #line 115 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 2562 "SavedSearchDialog.c" +#line 2550 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_container_allow_removal (SavedSearchDialogSearchRowContainer* self, gboolean allow) { - GtkButton* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + GtkButton* _tmp0_; + gboolean _tmp1_; #line 118 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self)); #line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2573,14 +2561,14 @@ static void saved_search_dialog_search_row_container_allow_removal (SavedSearchD _tmp1_ = allow; #line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_); -#line 2577 "SavedSearchDialog.c" +#line 2565 "SavedSearchDialog.c" } static GtkWidget* saved_search_dialog_search_row_container_get_widget (SavedSearchDialogSearchRowContainer* self) { GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 122 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), NULL); #line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2591,14 +2579,14 @@ static GtkWidget* saved_search_dialog_search_row_container_get_widget (SavedSear result = _tmp1_; #line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 2595 "SavedSearchDialog.c" +#line 2583 "SavedSearchDialog.c" } static SearchCondition* saved_search_dialog_search_row_container_get_search_condition (SavedSearchDialogSearchRowContainer* self) { SearchCondition* result = NULL; - SavedSearchDialogSearchRow* _tmp0_ = NULL; - SearchCondition* _tmp1_ = NULL; + SavedSearchDialogSearchRow* _tmp0_; + SearchCondition* _tmp1_; #line 126 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), NULL); #line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2609,14 +2597,14 @@ static SearchCondition* saved_search_dialog_search_row_container_get_search_cond result = _tmp1_; #line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 2613 "SavedSearchDialog.c" +#line 2601 "SavedSearchDialog.c" } static gboolean saved_search_dialog_search_row_container_is_complete (SavedSearchDialogSearchRowContainer* self) { gboolean result = FALSE; - SavedSearchDialogSearchRow* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SavedSearchDialogSearchRow* _tmp0_; + gboolean _tmp1_; #line 130 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), FALSE); #line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2627,7 +2615,7 @@ static gboolean saved_search_dialog_search_row_container_is_complete (SavedSearc result = _tmp1_; #line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 2631 "SavedSearchDialog.c" +#line 2619 "SavedSearchDialog.c" } @@ -2646,26 +2634,26 @@ static void g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAIN data1 = closure->data; #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" data2 = param_values->data[0].v_pointer; -#line 2650 "SavedSearchDialog.c" +#line 2638 "SavedSearchDialog.c" } else { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" data1 = param_values->data[0].v_pointer; #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" data2 = closure->data; -#line 2656 "SavedSearchDialog.c" +#line 2644 "SavedSearchDialog.c" } #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" callback = (GMarshalFunc_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER) (marshal_data ? marshal_data : cc->callback); #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" callback (data1, saved_search_dialog_value_get_search_row_container (param_values + 1), data2); -#line 2662 "SavedSearchDialog.c" +#line 2650 "SavedSearchDialog.c" } static void saved_search_dialog_value_search_row_container_init (GValue* value) { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 2669 "SavedSearchDialog.c" +#line 2657 "SavedSearchDialog.c" } @@ -2674,7 +2662,7 @@ static void saved_search_dialog_value_search_row_container_free_value (GValue* v if (value->data[0].v_pointer) { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_unref (value->data[0].v_pointer); -#line 2678 "SavedSearchDialog.c" +#line 2666 "SavedSearchDialog.c" } } @@ -2684,11 +2672,11 @@ static void saved_search_dialog_value_search_row_container_copy_value (const GVa if (src_value->data[0].v_pointer) { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" dest_value->data[0].v_pointer = saved_search_dialog_search_row_container_ref (src_value->data[0].v_pointer); -#line 2688 "SavedSearchDialog.c" +#line 2676 "SavedSearchDialog.c" } else { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" dest_value->data[0].v_pointer = NULL; -#line 2692 "SavedSearchDialog.c" +#line 2680 "SavedSearchDialog.c" } } @@ -2696,66 +2684,66 @@ static void saved_search_dialog_value_search_row_container_copy_value (const GVa static gpointer saved_search_dialog_value_search_row_container_peek_pointer (const GValue* value) { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return value->data[0].v_pointer; -#line 2700 "SavedSearchDialog.c" +#line 2688 "SavedSearchDialog.c" } static gchar* saved_search_dialog_value_search_row_container_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (collect_values[0].v_pointer) { -#line 2707 "SavedSearchDialog.c" - SavedSearchDialogSearchRowContainer* object; +#line 2695 "SavedSearchDialog.c" + SavedSearchDialogSearchRowContainer * object; object = collect_values[0].v_pointer; #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (object->parent_instance.g_class == NULL) { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2714 "SavedSearchDialog.c" +#line 2702 "SavedSearchDialog.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2718 "SavedSearchDialog.c" +#line 2706 "SavedSearchDialog.c" } #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = saved_search_dialog_search_row_container_ref (object); -#line 2722 "SavedSearchDialog.c" +#line 2710 "SavedSearchDialog.c" } else { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 2726 "SavedSearchDialog.c" +#line 2714 "SavedSearchDialog.c" } #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 2730 "SavedSearchDialog.c" +#line 2718 "SavedSearchDialog.c" } static gchar* saved_search_dialog_value_search_row_container_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - SavedSearchDialogSearchRowContainer** object_p; + SavedSearchDialogSearchRowContainer ** object_p; object_p = collect_values[0].v_pointer; #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!object_p) { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2741 "SavedSearchDialog.c" +#line 2729 "SavedSearchDialog.c" } #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!value->data[0].v_pointer) { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = NULL; -#line 2747 "SavedSearchDialog.c" +#line 2735 "SavedSearchDialog.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = value->data[0].v_pointer; -#line 2751 "SavedSearchDialog.c" +#line 2739 "SavedSearchDialog.c" } else { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = saved_search_dialog_search_row_container_ref (value->data[0].v_pointer); -#line 2755 "SavedSearchDialog.c" +#line 2743 "SavedSearchDialog.c" } #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 2759 "SavedSearchDialog.c" +#line 2747 "SavedSearchDialog.c" } @@ -2769,7 +2757,7 @@ static GParamSpec* saved_search_dialog_param_spec_search_row_container (const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return G_PARAM_SPEC (spec); -#line 2773 "SavedSearchDialog.c" +#line 2761 "SavedSearchDialog.c" } @@ -2778,12 +2766,12 @@ static gpointer saved_search_dialog_value_get_search_row_container (const GValue g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER), NULL); #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return value->data[0].v_pointer; -#line 2782 "SavedSearchDialog.c" +#line 2770 "SavedSearchDialog.c" } static void saved_search_dialog_value_set_search_row_container (GValue* value, gpointer v_object) { - SavedSearchDialogSearchRowContainer* old; + SavedSearchDialogSearchRowContainer * old; #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER)); #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2798,23 +2786,23 @@ static void saved_search_dialog_value_set_search_row_container (GValue* value, g value->data[0].v_pointer = v_object; #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_ref (value->data[0].v_pointer); -#line 2802 "SavedSearchDialog.c" +#line 2790 "SavedSearchDialog.c" } else { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 2806 "SavedSearchDialog.c" +#line 2794 "SavedSearchDialog.c" } #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (old) { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_unref (old); -#line 2812 "SavedSearchDialog.c" +#line 2800 "SavedSearchDialog.c" } } static void saved_search_dialog_value_take_search_row_container (GValue* value, gpointer v_object) { - SavedSearchDialogSearchRowContainer* old; + SavedSearchDialogSearchRowContainer * old; #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER)); #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2827,17 +2815,17 @@ static void saved_search_dialog_value_take_search_row_container (GValue* value, g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = v_object; -#line 2831 "SavedSearchDialog.c" +#line 2819 "SavedSearchDialog.c" } else { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 2835 "SavedSearchDialog.c" +#line 2823 "SavedSearchDialog.c" } #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (old) { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_unref (old); -#line 2841 "SavedSearchDialog.c" +#line 2829 "SavedSearchDialog.c" } } @@ -2850,10 +2838,10 @@ static void saved_search_dialog_search_row_container_class_init (SavedSearchDial #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowContainerPrivate)); #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_new ("remove", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER, G_TYPE_NONE, 1, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER); + saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_REMOVE_SIGNAL] = g_signal_new ("remove", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER, G_TYPE_NONE, 1, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER); #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_new ("changed", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER, G_TYPE_NONE, 1, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER); -#line 2857 "SavedSearchDialog.c" + saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL] = g_signal_new ("changed", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER, G_TYPE_NONE, 1, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER); +#line 2845 "SavedSearchDialog.c" } @@ -2864,11 +2852,11 @@ static void saved_search_dialog_search_row_container_instance_init (SavedSearchD self->priv->my_row = NULL; #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->ref_count = 1; -#line 2868 "SavedSearchDialog.c" +#line 2856 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_container_finalize (SavedSearchDialogSearchRowContainer* obj) { +static void saved_search_dialog_search_row_container_finalize (SavedSearchDialogSearchRowContainer * obj) { SavedSearchDialogSearchRowContainer * self; #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, SavedSearchDialogSearchRowContainer); @@ -2886,7 +2874,7 @@ static void saved_search_dialog_search_row_container_finalize (SavedSearchDialog _g_object_unref0 (self->priv->search_types_index); #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_unref0 (self->priv->my_row); -#line 2890 "SavedSearchDialog.c" +#line 2878 "SavedSearchDialog.c" } @@ -2905,18 +2893,18 @@ static GType saved_search_dialog_search_row_container_get_type (void) { static gpointer saved_search_dialog_search_row_container_ref (gpointer instance) { - SavedSearchDialogSearchRowContainer* self; + SavedSearchDialogSearchRowContainer * self; self = instance; #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_atomic_int_inc (&self->ref_count); #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return instance; -#line 2915 "SavedSearchDialog.c" +#line 2903 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_container_unref (gpointer instance) { - SavedSearchDialogSearchRowContainer* self; + SavedSearchDialogSearchRowContainer * self; self = instance; #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2924,7 +2912,7 @@ static void saved_search_dialog_search_row_container_unref (gpointer instance) { SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_GET_CLASS (self)->finalize (self); #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2928 "SavedSearchDialog.c" +#line 2916 "SavedSearchDialog.c" } } @@ -2934,7 +2922,7 @@ static GtkWidget* saved_search_dialog_search_row_real_get_widget (SavedSearchDia g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_get_widget'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 138 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 2938 "SavedSearchDialog.c" +#line 2926 "SavedSearchDialog.c" } @@ -2943,7 +2931,7 @@ GtkWidget* saved_search_dialog_search_row_get_widget (SavedSearchDialogSearchRow g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), NULL); #line 138 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->get_widget (self); -#line 2947 "SavedSearchDialog.c" +#line 2935 "SavedSearchDialog.c" } @@ -2952,7 +2940,7 @@ static SearchCondition* saved_search_dialog_search_row_real_get_search_condition g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_get_search_condition'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 2956 "SavedSearchDialog.c" +#line 2944 "SavedSearchDialog.c" } @@ -2961,7 +2949,7 @@ SearchCondition* saved_search_dialog_search_row_get_search_condition (SavedSearc g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), NULL); #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->get_search_condition (self); -#line 2965 "SavedSearchDialog.c" +#line 2953 "SavedSearchDialog.c" } @@ -2970,7 +2958,7 @@ static void saved_search_dialog_search_row_real_populate (SavedSearchDialogSearc g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_populate'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return; -#line 2974 "SavedSearchDialog.c" +#line 2962 "SavedSearchDialog.c" } @@ -2979,7 +2967,7 @@ void saved_search_dialog_search_row_populate (SavedSearchDialogSearchRow* self, g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self)); #line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->populate (self, sc); -#line 2983 "SavedSearchDialog.c" +#line 2971 "SavedSearchDialog.c" } @@ -2989,7 +2977,7 @@ static gboolean saved_search_dialog_search_row_real_is_complete (SavedSearchDial g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_is_complete'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return _tmp0_; -#line 2993 "SavedSearchDialog.c" +#line 2981 "SavedSearchDialog.c" } @@ -2998,7 +2986,7 @@ gboolean saved_search_dialog_search_row_is_complete (SavedSearchDialogSearchRow* g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), FALSE); #line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->is_complete (self); -#line 3002 "SavedSearchDialog.c" +#line 2990 "SavedSearchDialog.c" } @@ -3008,14 +2996,14 @@ static SavedSearchDialogSearchRow* saved_search_dialog_search_row_construct (GTy self = (SavedSearchDialogSearchRow*) g_type_create_instance (object_type); #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 3012 "SavedSearchDialog.c" +#line 3000 "SavedSearchDialog.c" } static void saved_search_dialog_value_search_row_init (GValue* value) { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 3019 "SavedSearchDialog.c" +#line 3007 "SavedSearchDialog.c" } @@ -3024,7 +3012,7 @@ static void saved_search_dialog_value_search_row_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_unref (value->data[0].v_pointer); -#line 3028 "SavedSearchDialog.c" +#line 3016 "SavedSearchDialog.c" } } @@ -3034,11 +3022,11 @@ static void saved_search_dialog_value_search_row_copy_value (const GValue* src_v if (src_value->data[0].v_pointer) { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" dest_value->data[0].v_pointer = saved_search_dialog_search_row_ref (src_value->data[0].v_pointer); -#line 3038 "SavedSearchDialog.c" +#line 3026 "SavedSearchDialog.c" } else { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" dest_value->data[0].v_pointer = NULL; -#line 3042 "SavedSearchDialog.c" +#line 3030 "SavedSearchDialog.c" } } @@ -3046,66 +3034,66 @@ static void saved_search_dialog_value_search_row_copy_value (const GValue* src_v static gpointer saved_search_dialog_value_search_row_peek_pointer (const GValue* value) { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return value->data[0].v_pointer; -#line 3050 "SavedSearchDialog.c" +#line 3038 "SavedSearchDialog.c" } static gchar* saved_search_dialog_value_search_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (collect_values[0].v_pointer) { -#line 3057 "SavedSearchDialog.c" - SavedSearchDialogSearchRow* object; +#line 3045 "SavedSearchDialog.c" + SavedSearchDialogSearchRow * object; object = collect_values[0].v_pointer; #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (object->parent_instance.g_class == NULL) { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3064 "SavedSearchDialog.c" +#line 3052 "SavedSearchDialog.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3068 "SavedSearchDialog.c" +#line 3056 "SavedSearchDialog.c" } #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = saved_search_dialog_search_row_ref (object); -#line 3072 "SavedSearchDialog.c" +#line 3060 "SavedSearchDialog.c" } else { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 3076 "SavedSearchDialog.c" +#line 3064 "SavedSearchDialog.c" } #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 3080 "SavedSearchDialog.c" +#line 3068 "SavedSearchDialog.c" } static gchar* saved_search_dialog_value_search_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - SavedSearchDialogSearchRow** object_p; + SavedSearchDialogSearchRow ** object_p; object_p = collect_values[0].v_pointer; #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!object_p) { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3091 "SavedSearchDialog.c" +#line 3079 "SavedSearchDialog.c" } #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!value->data[0].v_pointer) { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = NULL; -#line 3097 "SavedSearchDialog.c" +#line 3085 "SavedSearchDialog.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = value->data[0].v_pointer; -#line 3101 "SavedSearchDialog.c" +#line 3089 "SavedSearchDialog.c" } else { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = saved_search_dialog_search_row_ref (value->data[0].v_pointer); -#line 3105 "SavedSearchDialog.c" +#line 3093 "SavedSearchDialog.c" } #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 3109 "SavedSearchDialog.c" +#line 3097 "SavedSearchDialog.c" } @@ -3119,7 +3107,7 @@ static GParamSpec* saved_search_dialog_param_spec_search_row (const gchar* name, G_PARAM_SPEC (spec)->value_type = object_type; #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return G_PARAM_SPEC (spec); -#line 3123 "SavedSearchDialog.c" +#line 3111 "SavedSearchDialog.c" } @@ -3128,12 +3116,12 @@ static gpointer saved_search_dialog_value_get_search_row (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW), NULL); #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return value->data[0].v_pointer; -#line 3132 "SavedSearchDialog.c" +#line 3120 "SavedSearchDialog.c" } static void saved_search_dialog_value_set_search_row (GValue* value, gpointer v_object) { - SavedSearchDialogSearchRow* old; + SavedSearchDialogSearchRow * old; #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW)); #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -3148,23 +3136,23 @@ static void saved_search_dialog_value_set_search_row (GValue* value, gpointer v_ value->data[0].v_pointer = v_object; #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_ref (value->data[0].v_pointer); -#line 3152 "SavedSearchDialog.c" +#line 3140 "SavedSearchDialog.c" } else { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 3156 "SavedSearchDialog.c" +#line 3144 "SavedSearchDialog.c" } #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (old) { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_unref (old); -#line 3162 "SavedSearchDialog.c" +#line 3150 "SavedSearchDialog.c" } } static void saved_search_dialog_value_take_search_row (GValue* value, gpointer v_object) { - SavedSearchDialogSearchRow* old; + SavedSearchDialogSearchRow * old; #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW)); #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -3177,17 +3165,17 @@ static void saved_search_dialog_value_take_search_row (GValue* value, gpointer v g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = v_object; -#line 3181 "SavedSearchDialog.c" +#line 3169 "SavedSearchDialog.c" } else { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 3185 "SavedSearchDialog.c" +#line 3173 "SavedSearchDialog.c" } #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (old) { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_unref (old); -#line 3191 "SavedSearchDialog.c" +#line 3179 "SavedSearchDialog.c" } } @@ -3198,31 +3186,31 @@ static void saved_search_dialog_search_row_class_init (SavedSearchDialogSearchRo #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_finalize; #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_real_get_widget; + ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_real_get_widget; #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_real_get_search_condition; + ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_real_get_search_condition; #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_real_populate; + ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_real_populate; #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_real_is_complete; -#line 3209 "SavedSearchDialog.c" + ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_real_is_complete; +#line 3197 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_instance_init (SavedSearchDialogSearchRow * self) { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->ref_count = 1; -#line 3216 "SavedSearchDialog.c" +#line 3204 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow* obj) { +static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow * obj) { SavedSearchDialogSearchRow * self; #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_handlers_destroy (self); -#line 3226 "SavedSearchDialog.c" +#line 3214 "SavedSearchDialog.c" } @@ -3241,18 +3229,18 @@ static GType saved_search_dialog_search_row_get_type (void) { static gpointer saved_search_dialog_search_row_ref (gpointer instance) { - SavedSearchDialogSearchRow* self; + SavedSearchDialogSearchRow * self; self = instance; #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_atomic_int_inc (&self->ref_count); #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return instance; -#line 3251 "SavedSearchDialog.c" +#line 3239 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_unref (gpointer instance) { - SavedSearchDialogSearchRow* self; + SavedSearchDialogSearchRow * self; self = instance; #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -3260,7 +3248,7 @@ static void saved_search_dialog_search_row_unref (gpointer instance) { SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->finalize (self); #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3264 "SavedSearchDialog.c" +#line 3252 "SavedSearchDialog.c" } } @@ -3268,55 +3256,48 @@ static void saved_search_dialog_search_row_unref (gpointer instance) { static void _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_text_on_changed ((SavedSearchDialogSearchRowText*) self); -#line 3272 "SavedSearchDialog.c" +#line 3260 "SavedSearchDialog.c" } static void _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_text_on_changed ((SavedSearchDialogSearchRowText*) self); -#line 3279 "SavedSearchDialog.c" +#line 3267 "SavedSearchDialog.c" } static gpointer _saved_search_dialog_search_row_container_ref0 (gpointer self) { #line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self ? saved_search_dialog_search_row_container_ref (self) : NULL; -#line 3286 "SavedSearchDialog.c" +#line 3274 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) { SavedSearchDialogSearchRowText* self = NULL; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - GtkComboBoxText* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GtkComboBoxText* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - GtkComboBoxText* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - GtkComboBoxText* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - GtkComboBoxText* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - GtkComboBoxText* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - GtkComboBoxText* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - GtkComboBoxText* _tmp17_ = NULL; - GtkComboBoxText* _tmp18_ = NULL; - GtkEntry* _tmp19_ = NULL; - GtkEntry* _tmp20_ = NULL; - GtkEntry* _tmp21_ = NULL; - GtkEntry* _tmp22_ = NULL; - GtkBox* _tmp23_ = NULL; - GtkBox* _tmp24_ = NULL; - GtkComboBoxText* _tmp25_ = NULL; - GtkBox* _tmp26_ = NULL; - GtkEntry* _tmp27_ = NULL; - GtkBox* _tmp28_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; + GtkComboBoxText* _tmp2_; + GtkComboBoxText* _tmp3_; + GtkComboBoxText* _tmp4_; + GtkComboBoxText* _tmp5_; + GtkComboBoxText* _tmp6_; + GtkComboBoxText* _tmp7_; + GtkComboBoxText* _tmp8_; + GtkComboBoxText* _tmp9_; + GtkComboBoxText* _tmp10_; + GtkComboBoxText* _tmp11_; + GtkEntry* _tmp12_; + GtkEntry* _tmp13_; + GtkEntry* _tmp14_; + GtkEntry* _tmp15_; + GtkBox* _tmp16_; + GtkBox* _tmp17_; + GtkComboBoxText* _tmp18_; + GtkBox* _tmp19_; + GtkEntry* _tmp20_; + GtkBox* _tmp21_; #line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL); #line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -3340,115 +3321,101 @@ static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_const #line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->text_context; #line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = _ ("contains"); -#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp3_, _tmp4_); + gtk_combo_box_text_append_text (_tmp3_, _ ("contains")); #line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->text_context; -#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = _ ("is exactly"); + _tmp4_ = self->priv->text_context; #line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp5_, _tmp6_); + gtk_combo_box_text_append_text (_tmp4_, _ ("is exactly")); #line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = self->priv->text_context; -#line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = _ ("starts with"); + _tmp5_ = self->priv->text_context; #line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp7_, _tmp8_); + gtk_combo_box_text_append_text (_tmp5_, _ ("starts with")); #line 165 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = self->priv->text_context; -#line 165 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = _ ("ends with"); + _tmp6_ = self->priv->text_context; #line 165 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp9_, _tmp10_); + gtk_combo_box_text_append_text (_tmp6_, _ ("ends with")); #line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = self->priv->text_context; -#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = _ ("does not contain"); + _tmp7_ = self->priv->text_context; #line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp11_, _tmp12_); -#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = self->priv->text_context; + gtk_combo_box_text_append_text (_tmp7_, _ ("does not contain")); #line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = _ ("is not set"); + _tmp8_ = self->priv->text_context; #line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp13_, _tmp14_); + gtk_combo_box_text_append_text (_tmp8_, _ ("is not set")); #line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = self->priv->text_context; -#line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = _ ("is set"); + _tmp9_ = self->priv->text_context; #line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp15_, _tmp16_); + gtk_combo_box_text_append_text (_tmp9_, _ ("is set")); #line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = self->priv->text_context; + _tmp10_ = self->priv->text_context; #line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox), 0); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp18_ = self->priv->text_context; + _tmp11_ = self->priv->text_context; #line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed, self); #line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = (GtkEntry*) gtk_entry_new (); + _tmp12_ = (GtkEntry*) gtk_entry_new (); #line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp19_); + g_object_ref_sink (_tmp12_); #line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->entry); #line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->entry = _tmp19_; + self->priv->entry = _tmp12_; #line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = self->priv->entry; + _tmp13_ = self->priv->entry; #line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_entry_set_width_chars (_tmp20_, 25); + gtk_entry_set_width_chars (_tmp13_, 25); #line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp21_ = self->priv->entry; + _tmp14_ = self->priv->entry; #line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_entry_set_activates_default (_tmp21_, TRUE); + gtk_entry_set_activates_default (_tmp14_, TRUE); #line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp22_ = self->priv->entry; + _tmp15_ = self->priv->entry; #line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed, self); #line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + _tmp16_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); #line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp23_); + g_object_ref_sink (_tmp16_); #line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); #line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->box = _tmp23_; + self->priv->box = _tmp16_; #line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp24_ = self->priv->box; + _tmp17_ = self->priv->box; #line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp25_ = self->priv->text_context; + _tmp18_ = self->priv->text_context; #line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp26_ = self->priv->box; + _tmp19_ = self->priv->box; #line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp27_ = self->priv->entry; + _tmp20_ = self->priv->entry; #line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp28_ = self->priv->box; + _tmp21_ = self->priv->box; #line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget)); #line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 3437 "SavedSearchDialog.c" +#line 3404 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_new (SavedSearchDialogSearchRowContainer* parent) { #line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_text_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, parent); -#line 3444 "SavedSearchDialog.c" +#line 3411 "SavedSearchDialog.c" } static GtkWidget* saved_search_dialog_search_row_text_real_get_widget (SavedSearchDialogSearchRow* base) { SavedSearchDialogSearchRowText * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 188 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText); #line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -3459,7 +3426,7 @@ static GtkWidget* saved_search_dialog_search_row_text_real_get_widget (SavedSear result = _tmp1_; #line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3463 "SavedSearchDialog.c" +#line 3430 "SavedSearchDialog.c" } @@ -3467,16 +3434,16 @@ static SearchCondition* saved_search_dialog_search_row_text_real_get_search_cond SavedSearchDialogSearchRowText * self; SearchCondition* result = NULL; SearchConditionSearchType type = 0; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SearchConditionSearchType _tmp1_ = 0; + SavedSearchDialogSearchRowContainer* _tmp0_; + SearchConditionSearchType _tmp1_; gchar* text = NULL; - GtkEntry* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + GtkEntry* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; SearchConditionTextContext context = 0; - SearchConditionTextContext _tmp5_ = 0; + SearchConditionTextContext _tmp5_; SearchConditionText* c = NULL; - SearchConditionText* _tmp6_ = NULL; + SearchConditionText* _tmp6_; #line 192 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText); #line 193 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -3507,28 +3474,28 @@ static SearchCondition* saved_search_dialog_search_row_text_real_get_search_cond _g_free0 (text); #line 197 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3511 "SavedSearchDialog.c" +#line 3478 "SavedSearchDialog.c" } static gpointer _search_condition_ref0 (gpointer self) { #line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self ? search_condition_ref (self) : NULL; -#line 3518 "SavedSearchDialog.c" +#line 3485 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_text_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) { SavedSearchDialogSearchRowText * self; SearchConditionText* text = NULL; - SearchCondition* _tmp0_ = NULL; - SearchConditionText* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - SearchConditionTextContext _tmp3_ = 0; - SearchConditionTextContext _tmp4_ = 0; - GtkEntry* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; + SearchCondition* _tmp0_; + SearchConditionText* _tmp1_; + GtkComboBoxText* _tmp2_; + SearchConditionTextContext _tmp3_; + SearchConditionTextContext _tmp4_; + GtkEntry* _tmp5_; + const gchar* _tmp6_; + const gchar* _tmp7_; #line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText); #line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -3561,7 +3528,7 @@ static void saved_search_dialog_search_row_text_real_populate (SavedSearchDialog saved_search_dialog_search_row_text_on_changed (self); #line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (text); -#line 3565 "SavedSearchDialog.c" +#line 3532 "SavedSearchDialog.c" } @@ -3570,12 +3537,12 @@ static gboolean saved_search_dialog_search_row_text_real_is_complete (SavedSearc gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - GtkEntry* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GtkEntry* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gboolean _tmp7_; #line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText); #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -3596,40 +3563,40 @@ static gboolean saved_search_dialog_search_row_text_real_is_complete (SavedSearc if (_tmp7_) { #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = TRUE; -#line 3600 "SavedSearchDialog.c" +#line 3567 "SavedSearchDialog.c" } else { - SearchConditionTextContext _tmp8_ = 0; + SearchConditionTextContext _tmp8_; #line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = saved_search_dialog_search_row_text_get_text_context (self); #line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _tmp8_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET; -#line 3607 "SavedSearchDialog.c" +#line 3574 "SavedSearchDialog.c" } #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp1_) { #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = TRUE; -#line 3613 "SavedSearchDialog.c" +#line 3580 "SavedSearchDialog.c" } else { - SearchConditionTextContext _tmp9_ = 0; + SearchConditionTextContext _tmp9_; #line 211 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = saved_search_dialog_search_row_text_get_text_context (self); #line 211 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = _tmp9_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET; -#line 3620 "SavedSearchDialog.c" +#line 3587 "SavedSearchDialog.c" } #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = _tmp0_; #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3626 "SavedSearchDialog.c" +#line 3593 "SavedSearchDialog.c" } static SearchConditionTextContext saved_search_dialog_search_row_text_get_text_context (SavedSearchDialogSearchRowText* self) { SearchConditionTextContext result = 0; - GtkComboBoxText* _tmp0_ = NULL; - gint _tmp1_ = 0; + GtkComboBoxText* _tmp0_; + gint _tmp1_; #line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_TEXT (self), 0); #line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -3640,15 +3607,15 @@ static SearchConditionTextContext saved_search_dialog_search_row_text_get_text_c result = (SearchConditionTextContext) _tmp1_; #line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3644 "SavedSearchDialog.c" +#line 3611 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_text_on_changed (SavedSearchDialogSearchRowText* self) { gboolean _tmp0_ = FALSE; - SearchConditionTextContext _tmp1_ = 0; - SavedSearchDialogSearchRowContainer* _tmp5_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp6_ = NULL; + SearchConditionTextContext _tmp1_; + SavedSearchDialogSearchRowContainer* _tmp5_; + SavedSearchDialogSearchRowContainer* _tmp6_; #line 218 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_TEXT (self)); #line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -3657,39 +3624,39 @@ static void saved_search_dialog_search_row_text_on_changed (SavedSearchDialogSea if (_tmp1_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET) { #line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = TRUE; -#line 3661 "SavedSearchDialog.c" +#line 3628 "SavedSearchDialog.c" } else { - SearchConditionTextContext _tmp2_ = 0; + SearchConditionTextContext _tmp2_; #line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = saved_search_dialog_search_row_text_get_text_context (self); #line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = _tmp2_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET; -#line 3668 "SavedSearchDialog.c" +#line 3635 "SavedSearchDialog.c" } #line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp0_) { -#line 3672 "SavedSearchDialog.c" - GtkEntry* _tmp3_ = NULL; +#line 3639 "SavedSearchDialog.c" + GtkEntry* _tmp3_; #line 221 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->entry; #line 221 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); -#line 3678 "SavedSearchDialog.c" +#line 3645 "SavedSearchDialog.c" } else { - GtkEntry* _tmp4_ = NULL; + GtkEntry* _tmp4_; #line 223 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = self->priv->entry; #line 223 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); -#line 3685 "SavedSearchDialog.c" +#line 3652 "SavedSearchDialog.c" } #line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = self->priv->parent; #line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = self->priv->parent; #line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_emit_by_name (_tmp5_, "changed", _tmp6_); -#line 3693 "SavedSearchDialog.c" + g_signal_emit (_tmp5_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp6_); +#line 3660 "SavedSearchDialog.c" } @@ -3701,30 +3668,30 @@ static void saved_search_dialog_search_row_text_class_init (SavedSearchDialogSea #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowTextPrivate)); #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_text_real_get_widget; + ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_text_real_get_widget; #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_text_real_get_search_condition; + ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_text_real_get_search_condition; #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_text_real_populate; + ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_text_real_populate; #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_text_real_is_complete; -#line 3712 "SavedSearchDialog.c" + ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_text_real_is_complete; +#line 3679 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_text_instance_init (SavedSearchDialogSearchRowText * self) { #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_TEXT_GET_PRIVATE (self); -#line 3719 "SavedSearchDialog.c" +#line 3686 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearchRow* obj) { +static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearchRow * obj) { SavedSearchDialogSearchRowText * self; - GtkComboBoxText* _tmp0_ = NULL; - guint _tmp1_ = 0U; - GtkEntry* _tmp2_ = NULL; - guint _tmp3_ = 0U; + GtkComboBoxText* _tmp0_; + guint _tmp1_; + GtkEntry* _tmp2_; + guint _tmp3_; #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText); #line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -3749,7 +3716,7 @@ static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearc _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_text_parent_class)->finalize (obj); -#line 3753 "SavedSearchDialog.c" +#line 3720 "SavedSearchDialog.c" } @@ -3768,36 +3735,31 @@ static GType saved_search_dialog_search_row_text_get_type (void) { static void _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_media_type_on_changed ((SavedSearchDialogSearchRowMediaType*) self); -#line 3772 "SavedSearchDialog.c" +#line 3739 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media_type_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) { SavedSearchDialogSearchRowMediaType* self = NULL; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - GtkComboBoxText* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GtkComboBoxText* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - GtkComboBoxText* _tmp7_ = NULL; - GtkComboBoxText* _tmp8_ = NULL; - GtkComboBoxText* _tmp9_ = NULL; - GtkComboBoxText* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - GtkComboBoxText* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - GtkComboBoxText* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - GtkComboBoxText* _tmp16_ = NULL; - GtkComboBoxText* _tmp17_ = NULL; - GtkBox* _tmp18_ = NULL; - GtkBox* _tmp19_ = NULL; - GtkComboBoxText* _tmp20_ = NULL; - GtkBox* _tmp21_ = NULL; - GtkComboBoxText* _tmp22_ = NULL; - GtkBox* _tmp23_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; + GtkComboBoxText* _tmp2_; + GtkComboBoxText* _tmp3_; + GtkComboBoxText* _tmp4_; + GtkComboBoxText* _tmp5_; + GtkComboBoxText* _tmp6_; + GtkComboBoxText* _tmp7_; + GtkComboBoxText* _tmp8_; + GtkComboBoxText* _tmp9_; + GtkComboBoxText* _tmp10_; + GtkComboBoxText* _tmp11_; + GtkComboBoxText* _tmp12_; + GtkBox* _tmp13_; + GtkBox* _tmp14_; + GtkComboBoxText* _tmp15_; + GtkBox* _tmp16_; + GtkComboBoxText* _tmp17_; + GtkBox* _tmp18_; #line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL); #line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -3821,99 +3783,89 @@ static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media #line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->media_context; #line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = _ ("is"); -#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp3_, _tmp4_); + gtk_combo_box_text_append_text (_tmp3_, _ ("is")); #line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->media_context; + _tmp4_ = self->priv->media_context; #line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = _ ("is not"); -#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp5_, _tmp6_); + gtk_combo_box_text_append_text (_tmp4_, _ ("is not")); #line 244 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = self->priv->media_context; + _tmp5_ = self->priv->media_context; #line 244 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 245 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = self->priv->media_context; + _tmp6_ = self->priv->media_context; #line 245 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self); #line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = (GtkComboBoxText*) gtk_combo_box_text_new (); + _tmp7_ = (GtkComboBoxText*) gtk_combo_box_text_new (); #line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp9_); + g_object_ref_sink (_tmp7_); #line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->media_type); #line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->media_type = _tmp9_; -#line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = self->priv->media_type; + self->priv->media_type = _tmp7_; #line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = _ ("any photo"); + _tmp8_ = self->priv->media_type; #line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp10_, _tmp11_); -#line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = self->priv->media_type; + gtk_combo_box_text_append_text (_tmp8_, _ ("any photo")); #line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = _ ("a raw photo"); + _tmp9_ = self->priv->media_type; #line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp12_, _tmp13_); -#line 251 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = self->priv->media_type; + gtk_combo_box_text_append_text (_tmp9_, _ ("a raw photo")); #line 251 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = _ ("a video"); + _tmp10_ = self->priv->media_type; #line 251 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp14_, _tmp15_); + gtk_combo_box_text_append_text (_tmp10_, _ ("a video")); #line 252 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = self->priv->media_type; + _tmp11_ = self->priv->media_type; #line 252 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), 0); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = self->priv->media_type; + _tmp12_ = self->priv->media_type; #line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self); #line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + _tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); #line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp18_); + g_object_ref_sink (_tmp13_); #line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); #line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->box = _tmp18_; + self->priv->box = _tmp13_; #line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = self->priv->box; + _tmp14_ = self->priv->box; #line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = self->priv->media_context; + _tmp15_ = self->priv->media_context; #line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp21_ = self->priv->box; + _tmp16_ = self->priv->box; #line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp22_ = self->priv->media_type; + _tmp17_ = self->priv->media_type; #line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp23_ = self->priv->box; + _tmp18_ = self->priv->box; #line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget)); #line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 3902 "SavedSearchDialog.c" +#line 3854 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media_type_new (SavedSearchDialogSearchRowContainer* parent) { #line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_media_type_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, parent); -#line 3909 "SavedSearchDialog.c" +#line 3861 "SavedSearchDialog.c" } static GtkWidget* saved_search_dialog_search_row_media_type_real_get_widget (SavedSearchDialogSearchRow* base) { SavedSearchDialogSearchRowMediaType * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 266 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType); #line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -3924,7 +3876,7 @@ static GtkWidget* saved_search_dialog_search_row_media_type_real_get_widget (Sav result = _tmp1_; #line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3928 "SavedSearchDialog.c" +#line 3880 "SavedSearchDialog.c" } @@ -3932,16 +3884,16 @@ static SearchCondition* saved_search_dialog_search_row_media_type_real_get_searc SavedSearchDialogSearchRowMediaType * self; SearchCondition* result = NULL; SearchConditionSearchType search_type = 0; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SearchConditionSearchType _tmp1_ = 0; + SavedSearchDialogSearchRowContainer* _tmp0_; + SearchConditionSearchType _tmp1_; SearchConditionMediaTypeContext context = 0; - GtkComboBoxText* _tmp2_ = NULL; - gint _tmp3_ = 0; + GtkComboBoxText* _tmp2_; + gint _tmp3_; SearchConditionMediaTypeMediaType type = 0; - GtkComboBoxText* _tmp4_ = NULL; - gint _tmp5_ = 0; + GtkComboBoxText* _tmp4_; + gint _tmp5_; SearchConditionMediaType* c = NULL; - SearchConditionMediaType* _tmp6_ = NULL; + SearchConditionMediaType* _tmp6_; #line 270 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType); #line 271 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -3970,21 +3922,21 @@ static SearchCondition* saved_search_dialog_search_row_media_type_real_get_searc result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); #line 275 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3974 "SavedSearchDialog.c" +#line 3926 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_media_type_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) { SavedSearchDialogSearchRowMediaType * self; SearchConditionMediaType* media = NULL; - SearchCondition* _tmp0_ = NULL; - SearchConditionMediaType* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - SearchConditionMediaTypeContext _tmp3_ = 0; - SearchConditionMediaTypeContext _tmp4_ = 0; - GtkComboBoxText* _tmp5_ = NULL; - SearchConditionMediaTypeMediaType _tmp6_ = 0; - SearchConditionMediaTypeMediaType _tmp7_ = 0; + SearchCondition* _tmp0_; + SearchConditionMediaType* _tmp1_; + GtkComboBoxText* _tmp2_; + SearchConditionMediaTypeContext _tmp3_; + SearchConditionMediaTypeContext _tmp4_; + GtkComboBoxText* _tmp5_; + SearchConditionMediaTypeMediaType _tmp6_; + SearchConditionMediaTypeMediaType _tmp7_; #line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType); #line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4015,7 +3967,7 @@ static void saved_search_dialog_search_row_media_type_real_populate (SavedSearch gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp7_); #line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (media); -#line 4019 "SavedSearchDialog.c" +#line 3971 "SavedSearchDialog.c" } @@ -4028,13 +3980,13 @@ static gboolean saved_search_dialog_search_row_media_type_real_is_complete (Save result = TRUE; #line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4032 "SavedSearchDialog.c" +#line 3984 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_media_type_on_changed (SavedSearchDialogSearchRowMediaType* self) { - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; #line 289 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_MEDIA_TYPE (self)); #line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4042,8 +3994,8 @@ static void saved_search_dialog_search_row_media_type_on_changed (SavedSearchDia #line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->parent; #line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_emit_by_name (_tmp0_, "changed", _tmp1_); -#line 4047 "SavedSearchDialog.c" + g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_); +#line 3999 "SavedSearchDialog.c" } @@ -4055,30 +4007,30 @@ static void saved_search_dialog_search_row_media_type_class_init (SavedSearchDia #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowMediaTypePrivate)); #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_media_type_real_get_widget; + ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_media_type_real_get_widget; #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_media_type_real_get_search_condition; + ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_media_type_real_get_search_condition; #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_media_type_real_populate; + ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_media_type_real_populate; #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_media_type_real_is_complete; -#line 4066 "SavedSearchDialog.c" + ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_media_type_real_is_complete; +#line 4018 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_media_type_instance_init (SavedSearchDialogSearchRowMediaType * self) { #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_MEDIA_TYPE_GET_PRIVATE (self); -#line 4073 "SavedSearchDialog.c" +#line 4025 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialogSearchRow* obj) { +static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialogSearchRow * obj) { SavedSearchDialogSearchRowMediaType * self; - GtkComboBoxText* _tmp0_ = NULL; - guint _tmp1_ = 0U; - GtkComboBoxText* _tmp2_ = NULL; - guint _tmp3_ = 0U; + GtkComboBoxText* _tmp0_; + guint _tmp1_; + GtkComboBoxText* _tmp2_; + guint _tmp3_; #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType); #line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4103,7 +4055,7 @@ static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialo _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_media_type_parent_class)->finalize (obj); -#line 4107 "SavedSearchDialog.c" +#line 4059 "SavedSearchDialog.c" } @@ -4122,36 +4074,31 @@ static GType saved_search_dialog_search_row_media_type_get_type (void) { static void _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_modified_on_changed ((SavedSearchDialogSearchRowModified*) self); -#line 4126 "SavedSearchDialog.c" +#line 4078 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modified_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) { SavedSearchDialogSearchRowModified* self = NULL; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - GtkComboBoxText* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GtkComboBoxText* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - GtkComboBoxText* _tmp7_ = NULL; - GtkComboBoxText* _tmp8_ = NULL; - GtkComboBoxText* _tmp9_ = NULL; - GtkComboBoxText* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - GtkComboBoxText* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - GtkComboBoxText* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - GtkComboBoxText* _tmp16_ = NULL; - GtkComboBoxText* _tmp17_ = NULL; - GtkBox* _tmp18_ = NULL; - GtkBox* _tmp19_ = NULL; - GtkComboBoxText* _tmp20_ = NULL; - GtkBox* _tmp21_ = NULL; - GtkComboBoxText* _tmp22_ = NULL; - GtkBox* _tmp23_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; + GtkComboBoxText* _tmp2_; + GtkComboBoxText* _tmp3_; + GtkComboBoxText* _tmp4_; + GtkComboBoxText* _tmp5_; + GtkComboBoxText* _tmp6_; + GtkComboBoxText* _tmp7_; + GtkComboBoxText* _tmp8_; + GtkComboBoxText* _tmp9_; + GtkComboBoxText* _tmp10_; + GtkComboBoxText* _tmp11_; + GtkComboBoxText* _tmp12_; + GtkBox* _tmp13_; + GtkBox* _tmp14_; + GtkComboBoxText* _tmp15_; + GtkBox* _tmp16_; + GtkComboBoxText* _tmp17_; + GtkBox* _tmp18_; #line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL); #line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4175,99 +4122,89 @@ static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modifi #line 305 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->modified_context; #line 305 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = _ ("has"); -#line 305 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp3_, _tmp4_); -#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->modified_context; + gtk_combo_box_text_append_text (_tmp3_, _ ("has")); #line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = _ ("has no"); + _tmp4_ = self->priv->modified_context; #line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp5_, _tmp6_); + gtk_combo_box_text_append_text (_tmp4_, _ ("has no")); #line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = self->priv->modified_context; + _tmp5_ = self->priv->modified_context; #line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 308 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = self->priv->modified_context; + _tmp6_ = self->priv->modified_context; #line 308 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self); #line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = (GtkComboBoxText*) gtk_combo_box_text_new (); + _tmp7_ = (GtkComboBoxText*) gtk_combo_box_text_new (); #line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp9_); + g_object_ref_sink (_tmp7_); #line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->modified_state); #line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->modified_state = _tmp9_; -#line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = self->priv->modified_state; + self->priv->modified_state = _tmp7_; #line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = _ ("modifications"); + _tmp8_ = self->priv->modified_state; #line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp10_, _tmp11_); + gtk_combo_box_text_append_text (_tmp8_, _ ("modifications")); #line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = self->priv->modified_state; -#line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = _ ("internal modifications"); + _tmp9_ = self->priv->modified_state; #line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp12_, _tmp13_); -#line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = self->priv->modified_state; + gtk_combo_box_text_append_text (_tmp9_, _ ("internal modifications")); #line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = _ ("external modifications"); + _tmp10_ = self->priv->modified_state; #line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp14_, _tmp15_); + gtk_combo_box_text_append_text (_tmp10_, _ ("external modifications")); #line 314 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = self->priv->modified_state; + _tmp11_ = self->priv->modified_state; #line 314 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), 0); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = self->priv->modified_state; + _tmp12_ = self->priv->modified_state; #line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self); #line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + _tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); #line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp18_); + g_object_ref_sink (_tmp13_); #line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); #line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->box = _tmp18_; + self->priv->box = _tmp13_; #line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = self->priv->box; + _tmp14_ = self->priv->box; #line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = self->priv->modified_context; + _tmp15_ = self->priv->modified_context; #line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp21_ = self->priv->box; + _tmp16_ = self->priv->box; #line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp22_ = self->priv->modified_state; + _tmp17_ = self->priv->modified_state; #line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp23_ = self->priv->box; + _tmp18_ = self->priv->box; #line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget)); #line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 4256 "SavedSearchDialog.c" +#line 4193 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modified_new (SavedSearchDialogSearchRowContainer* parent) { #line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_modified_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, parent); -#line 4263 "SavedSearchDialog.c" +#line 4200 "SavedSearchDialog.c" } static GtkWidget* saved_search_dialog_search_row_modified_real_get_widget (SavedSearchDialogSearchRow* base) { SavedSearchDialogSearchRowModified * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 328 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified); #line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4278,7 +4215,7 @@ static GtkWidget* saved_search_dialog_search_row_modified_real_get_widget (Saved result = _tmp1_; #line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4282 "SavedSearchDialog.c" +#line 4219 "SavedSearchDialog.c" } @@ -4286,16 +4223,16 @@ static SearchCondition* saved_search_dialog_search_row_modified_real_get_search_ SavedSearchDialogSearchRowModified * self; SearchCondition* result = NULL; SearchConditionSearchType search_type = 0; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SearchConditionSearchType _tmp1_ = 0; + SavedSearchDialogSearchRowContainer* _tmp0_; + SearchConditionSearchType _tmp1_; SearchConditionModifiedContext context = 0; - GtkComboBoxText* _tmp2_ = NULL; - gint _tmp3_ = 0; + GtkComboBoxText* _tmp2_; + gint _tmp3_; SearchConditionModifiedState state = 0; - GtkComboBoxText* _tmp4_ = NULL; - gint _tmp5_ = 0; + GtkComboBoxText* _tmp4_; + gint _tmp5_; SearchConditionModified* c = NULL; - SearchConditionModified* _tmp6_ = NULL; + SearchConditionModified* _tmp6_; #line 332 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified); #line 333 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4324,21 +4261,21 @@ static SearchCondition* saved_search_dialog_search_row_modified_real_get_search_ result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); #line 337 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4328 "SavedSearchDialog.c" +#line 4265 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_modified_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) { SavedSearchDialogSearchRowModified * self; SearchConditionModified* scm = NULL; - SearchCondition* _tmp0_ = NULL; - SearchConditionModified* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - SearchConditionModifiedState _tmp3_ = 0; - SearchConditionModifiedState _tmp4_ = 0; - GtkComboBoxText* _tmp5_ = NULL; - SearchConditionModifiedContext _tmp6_ = 0; - SearchConditionModifiedContext _tmp7_ = 0; + SearchCondition* _tmp0_; + SearchConditionModified* _tmp1_; + GtkComboBoxText* _tmp2_; + SearchConditionModifiedState _tmp3_; + SearchConditionModifiedState _tmp4_; + GtkComboBoxText* _tmp5_; + SearchConditionModifiedContext _tmp6_; + SearchConditionModifiedContext _tmp7_; #line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified); #line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4369,7 +4306,7 @@ static void saved_search_dialog_search_row_modified_real_populate (SavedSearchDi gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp7_); #line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (scm); -#line 4373 "SavedSearchDialog.c" +#line 4310 "SavedSearchDialog.c" } @@ -4382,13 +4319,13 @@ static gboolean saved_search_dialog_search_row_modified_real_is_complete (SavedS result = TRUE; #line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4386 "SavedSearchDialog.c" +#line 4323 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_modified_on_changed (SavedSearchDialogSearchRowModified* self) { - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; #line 351 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_MODIFIED (self)); #line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4396,8 +4333,8 @@ static void saved_search_dialog_search_row_modified_on_changed (SavedSearchDialo #line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->parent; #line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_emit_by_name (_tmp0_, "changed", _tmp1_); -#line 4401 "SavedSearchDialog.c" + g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_); +#line 4338 "SavedSearchDialog.c" } @@ -4409,30 +4346,30 @@ static void saved_search_dialog_search_row_modified_class_init (SavedSearchDialo #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowModifiedPrivate)); #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_modified_real_get_widget; + ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_modified_real_get_widget; #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_modified_real_get_search_condition; + ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_modified_real_get_search_condition; #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_modified_real_populate; + ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_modified_real_populate; #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_modified_real_is_complete; -#line 4420 "SavedSearchDialog.c" + ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_modified_real_is_complete; +#line 4357 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_modified_instance_init (SavedSearchDialogSearchRowModified * self) { #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_MODIFIED_GET_PRIVATE (self); -#line 4427 "SavedSearchDialog.c" +#line 4364 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogSearchRow* obj) { +static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogSearchRow * obj) { SavedSearchDialogSearchRowModified * self; - GtkComboBoxText* _tmp0_ = NULL; - guint _tmp1_ = 0U; - GtkComboBoxText* _tmp2_ = NULL; - guint _tmp3_ = 0U; + GtkComboBoxText* _tmp0_; + guint _tmp1_; + GtkComboBoxText* _tmp2_; + guint _tmp3_; #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified); #line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4457,7 +4394,7 @@ static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogS _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_modified_parent_class)->finalize (obj); -#line 4461 "SavedSearchDialog.c" +#line 4398 "SavedSearchDialog.c" } @@ -4476,29 +4413,26 @@ static GType saved_search_dialog_search_row_modified_get_type (void) { static void _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_flagged_on_changed ((SavedSearchDialogSearchRowFlagged*) self); -#line 4480 "SavedSearchDialog.c" +#line 4417 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) { SavedSearchDialogSearchRowFlagged* self = NULL; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - GtkComboBoxText* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GtkComboBoxText* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - GtkComboBoxText* _tmp7_ = NULL; - GtkComboBoxText* _tmp8_ = NULL; - GtkBox* _tmp9_ = NULL; - GtkBox* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - GtkLabel* _tmp12_ = NULL; - GtkLabel* _tmp13_ = NULL; - GtkBox* _tmp14_ = NULL; - GtkComboBoxText* _tmp15_ = NULL; - GtkBox* _tmp16_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; + GtkComboBoxText* _tmp2_; + GtkComboBoxText* _tmp3_; + GtkComboBoxText* _tmp4_; + GtkComboBoxText* _tmp5_; + GtkComboBoxText* _tmp6_; + GtkBox* _tmp7_; + GtkBox* _tmp8_; + GtkLabel* _tmp9_; + GtkLabel* _tmp10_; + GtkBox* _tmp11_; + GtkComboBoxText* _tmp12_; + GtkBox* _tmp13_; #line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL); #line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4522,73 +4456,67 @@ static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged #line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->flagged_state; #line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = _ ("flagged"); -#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp3_, _tmp4_); -#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->flagged_state; + gtk_combo_box_text_append_text (_tmp3_, _ ("flagged")); #line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = _ ("not flagged"); + _tmp4_ = self->priv->flagged_state; #line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp5_, _tmp6_); + gtk_combo_box_text_append_text (_tmp4_, _ ("not flagged")); #line 369 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = self->priv->flagged_state; + _tmp5_ = self->priv->flagged_state; #line 369 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 370 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = self->priv->flagged_state; + _tmp6_ = self->priv->flagged_state; #line 370 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed, self); #line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + _tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); #line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp9_); + g_object_ref_sink (_tmp7_); #line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); #line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->box = _tmp9_; + self->priv->box = _tmp7_; #line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = self->priv->box; + _tmp8_ = self->priv->box; #line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = _ ("is"); + _tmp9_ = (GtkLabel*) gtk_label_new (_ ("is")); #line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = (GtkLabel*) gtk_label_new (_tmp11_); -#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp12_); + g_object_ref_sink (_tmp9_); #line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = _tmp12_; + _tmp10_ = _tmp9_; #line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp10_); #line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = self->priv->box; + _tmp11_ = self->priv->box; #line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = self->priv->flagged_state; + _tmp12_ = self->priv->flagged_state; #line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = self->priv->box; + _tmp13_ = self->priv->box; #line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget)); #line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 4577 "SavedSearchDialog.c" +#line 4505 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged_new (SavedSearchDialogSearchRowContainer* parent) { #line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_flagged_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, parent); -#line 4584 "SavedSearchDialog.c" +#line 4512 "SavedSearchDialog.c" } static GtkWidget* saved_search_dialog_search_row_flagged_real_get_widget (SavedSearchDialogSearchRow* base) { SavedSearchDialogSearchRowFlagged * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 382 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged); #line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4599,7 +4527,7 @@ static GtkWidget* saved_search_dialog_search_row_flagged_real_get_widget (SavedS result = _tmp1_; #line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4603 "SavedSearchDialog.c" +#line 4531 "SavedSearchDialog.c" } @@ -4607,13 +4535,13 @@ static SearchCondition* saved_search_dialog_search_row_flagged_real_get_search_c SavedSearchDialogSearchRowFlagged * self; SearchCondition* result = NULL; SearchConditionSearchType search_type = 0; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SearchConditionSearchType _tmp1_ = 0; + SavedSearchDialogSearchRowContainer* _tmp0_; + SearchConditionSearchType _tmp1_; SearchConditionFlaggedState state = 0; - GtkComboBoxText* _tmp2_ = NULL; - gint _tmp3_ = 0; + GtkComboBoxText* _tmp2_; + gint _tmp3_; SearchConditionFlagged* c = NULL; - SearchConditionFlagged* _tmp4_ = NULL; + SearchConditionFlagged* _tmp4_; #line 386 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged); #line 387 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4636,18 +4564,18 @@ static SearchCondition* saved_search_dialog_search_row_flagged_real_get_search_c result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); #line 390 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4640 "SavedSearchDialog.c" +#line 4568 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_flagged_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) { SavedSearchDialogSearchRowFlagged * self; SearchConditionFlagged* f = NULL; - SearchCondition* _tmp0_ = NULL; - SearchConditionFlagged* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - SearchConditionFlaggedState _tmp3_ = 0; - SearchConditionFlaggedState _tmp4_ = 0; + SearchCondition* _tmp0_; + SearchConditionFlagged* _tmp1_; + GtkComboBoxText* _tmp2_; + SearchConditionFlaggedState _tmp3_; + SearchConditionFlaggedState _tmp4_; #line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged); #line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4670,7 +4598,7 @@ static void saved_search_dialog_search_row_flagged_real_populate (SavedSearchDia gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_); #line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (f); -#line 4674 "SavedSearchDialog.c" +#line 4602 "SavedSearchDialog.c" } @@ -4683,13 +4611,13 @@ static gboolean saved_search_dialog_search_row_flagged_real_is_complete (SavedSe result = TRUE; #line 400 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4687 "SavedSearchDialog.c" +#line 4615 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_flagged_on_changed (SavedSearchDialogSearchRowFlagged* self) { - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; #line 403 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_FLAGGED (self)); #line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4697,8 +4625,8 @@ static void saved_search_dialog_search_row_flagged_on_changed (SavedSearchDialog #line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->parent; #line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_emit_by_name (_tmp0_, "changed", _tmp1_); -#line 4702 "SavedSearchDialog.c" + g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_); +#line 4630 "SavedSearchDialog.c" } @@ -4710,28 +4638,28 @@ static void saved_search_dialog_search_row_flagged_class_init (SavedSearchDialog #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowFlaggedPrivate)); #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_flagged_real_get_widget; + ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_flagged_real_get_widget; #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_flagged_real_get_search_condition; + ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_flagged_real_get_search_condition; #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_flagged_real_populate; + ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_flagged_real_populate; #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_flagged_real_is_complete; -#line 4721 "SavedSearchDialog.c" + ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_flagged_real_is_complete; +#line 4649 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_flagged_instance_init (SavedSearchDialogSearchRowFlagged * self) { #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_FLAGGED_GET_PRIVATE (self); -#line 4728 "SavedSearchDialog.c" +#line 4656 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSearchRow* obj) { +static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSearchRow * obj) { SavedSearchDialogSearchRowFlagged * self; - GtkComboBoxText* _tmp0_ = NULL; - guint _tmp1_ = 0U; + GtkComboBoxText* _tmp0_; + guint _tmp1_; #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged); #line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4748,7 +4676,7 @@ static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSe _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_flagged_parent_class)->finalize (obj); -#line 4752 "SavedSearchDialog.c" +#line 4680 "SavedSearchDialog.c" } @@ -4767,50 +4695,46 @@ static GType saved_search_dialog_search_row_flagged_get_type (void) { static void _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_rating_on_changed ((SavedSearchDialogSearchRowRating*) self); -#line 4771 "SavedSearchDialog.c" +#line 4699 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) { SavedSearchDialogSearchRowRating* self = NULL; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - GtkComboBoxText* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GtkComboBoxText* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - GtkComboBoxText* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - GtkComboBoxText* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - GtkComboBoxText* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - GtkComboBoxText* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - GtkComboBoxText* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - GtkComboBoxText* _tmp17_ = NULL; - GtkComboBoxText* _tmp18_ = NULL; - GtkComboBoxText* _tmp19_ = NULL; - GtkComboBoxText* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - GtkComboBoxText* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; - GtkComboBoxText* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; - GtkComboBoxText* _tmp26_ = NULL; - GtkComboBoxText* _tmp27_ = NULL; - GtkBox* _tmp28_ = NULL; - GtkBox* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; - GtkLabel* _tmp31_ = NULL; - GtkLabel* _tmp32_ = NULL; - GtkBox* _tmp33_ = NULL; - GtkComboBoxText* _tmp34_ = NULL; - GtkBox* _tmp35_ = NULL; - GtkComboBoxText* _tmp36_ = NULL; - GtkBox* _tmp37_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; + GtkComboBoxText* _tmp2_; + GtkComboBoxText* _tmp3_; + const gchar* _tmp4_; + GtkComboBoxText* _tmp5_; + const gchar* _tmp6_; + GtkComboBoxText* _tmp7_; + const gchar* _tmp8_; + GtkComboBoxText* _tmp9_; + const gchar* _tmp10_; + GtkComboBoxText* _tmp11_; + const gchar* _tmp12_; + GtkComboBoxText* _tmp13_; + const gchar* _tmp14_; + GtkComboBoxText* _tmp15_; + const gchar* _tmp16_; + GtkComboBoxText* _tmp17_; + GtkComboBoxText* _tmp18_; + GtkComboBoxText* _tmp19_; + GtkComboBoxText* _tmp20_; + GtkComboBoxText* _tmp21_; + GtkComboBoxText* _tmp22_; + GtkComboBoxText* _tmp23_; + GtkComboBoxText* _tmp24_; + GtkBox* _tmp25_; + GtkBox* _tmp26_; + GtkLabel* _tmp27_; + GtkLabel* _tmp28_; + GtkBox* _tmp29_; + GtkComboBoxText* _tmp30_; + GtkBox* _tmp31_; + GtkComboBoxText* _tmp32_; + GtkBox* _tmp33_; #line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL); #line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4892,85 +4816,77 @@ static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_c #line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp20_ = self->priv->context; #line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp21_ = _ ("and higher"); -#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp20_, _tmp21_); -#line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp22_ = self->priv->context; + gtk_combo_box_text_append_text (_tmp20_, _ ("and higher")); #line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp23_ = _ ("only"); + _tmp21_ = self->priv->context; #line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp22_, _tmp23_); + gtk_combo_box_text_append_text (_tmp21_, _ ("only")); #line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp24_ = self->priv->context; -#line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp25_ = _ ("and lower"); + _tmp22_ = self->priv->context; #line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp24_, _tmp25_); + gtk_combo_box_text_append_text (_tmp22_, _ ("and lower")); #line 434 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp26_ = self->priv->context; + _tmp23_ = self->priv->context; #line 434 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_combo_box_get_type (), GtkComboBox), 0); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp27_ = self->priv->context; + _tmp24_ = self->priv->context; #line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self); #line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp28_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + _tmp25_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); #line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp28_); + g_object_ref_sink (_tmp25_); #line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); #line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->box = _tmp28_; + self->priv->box = _tmp25_; #line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp29_ = self->priv->box; -#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp30_ = _ ("is"); + _tmp26_ = self->priv->box; #line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp31_ = (GtkLabel*) gtk_label_new (_tmp30_); + _tmp27_ = (GtkLabel*) gtk_label_new (_ ("is")); #line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp31_); + g_object_ref_sink (_tmp27_); #line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp32_ = _tmp31_; + _tmp28_ = _tmp27_; #line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (_tmp32_); + _g_object_unref0 (_tmp28_); #line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp33_ = self->priv->box; + _tmp29_ = self->priv->box; #line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp34_ = self->priv->rating; + _tmp30_ = self->priv->rating; #line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp35_ = self->priv->box; + _tmp31_ = self->priv->box; #line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp36_ = self->priv->context; + _tmp32_ = self->priv->context; #line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 441 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp37_ = self->priv->box; + _tmp33_ = self->priv->box; #line 441 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget)); #line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 4959 "SavedSearchDialog.c" +#line 4875 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_new (SavedSearchDialogSearchRowContainer* parent) { #line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_rating_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, parent); -#line 4966 "SavedSearchDialog.c" +#line 4882 "SavedSearchDialog.c" } static GtkWidget* saved_search_dialog_search_row_rating_real_get_widget (SavedSearchDialogSearchRow* base) { SavedSearchDialogSearchRowRating * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 449 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating); #line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -4981,7 +4897,7 @@ static GtkWidget* saved_search_dialog_search_row_rating_real_get_widget (SavedSe result = _tmp1_; #line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4985 "SavedSearchDialog.c" +#line 4901 "SavedSearchDialog.c" } @@ -4989,16 +4905,16 @@ static SearchCondition* saved_search_dialog_search_row_rating_real_get_search_co SavedSearchDialogSearchRowRating * self; SearchCondition* result = NULL; SearchConditionSearchType search_type = 0; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SearchConditionSearchType _tmp1_ = 0; + SavedSearchDialogSearchRowContainer* _tmp0_; + SearchConditionSearchType _tmp1_; Rating search_rating = 0; - GtkComboBoxText* _tmp2_ = NULL; - gint _tmp3_ = 0; + GtkComboBoxText* _tmp2_; + gint _tmp3_; SearchConditionRatingContext search_context = 0; - GtkComboBoxText* _tmp4_ = NULL; - gint _tmp5_ = 0; + GtkComboBoxText* _tmp4_; + gint _tmp5_; SearchConditionRating* c = NULL; - SearchConditionRating* _tmp6_ = NULL; + SearchConditionRating* _tmp6_; #line 453 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating); #line 454 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5027,21 +4943,21 @@ static SearchCondition* saved_search_dialog_search_row_rating_real_get_search_co result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); #line 458 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5031 "SavedSearchDialog.c" +#line 4947 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_rating_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) { SavedSearchDialogSearchRowRating * self; SearchConditionRating* r = NULL; - SearchCondition* _tmp0_ = NULL; - SearchConditionRating* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - SearchConditionRatingContext _tmp3_ = 0; - SearchConditionRatingContext _tmp4_ = 0; - GtkComboBoxText* _tmp5_ = NULL; - Rating _tmp6_ = 0; - Rating _tmp7_ = 0; + SearchCondition* _tmp0_; + SearchConditionRating* _tmp1_; + GtkComboBoxText* _tmp2_; + SearchConditionRatingContext _tmp3_; + SearchConditionRatingContext _tmp4_; + GtkComboBoxText* _tmp5_; + Rating _tmp6_; + Rating _tmp7_; #line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating); #line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5072,7 +4988,7 @@ static void saved_search_dialog_search_row_rating_real_populate (SavedSearchDial gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) (_tmp7_ - RATING_REJECTED)); #line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (r); -#line 5076 "SavedSearchDialog.c" +#line 4992 "SavedSearchDialog.c" } @@ -5085,13 +5001,13 @@ static gboolean saved_search_dialog_search_row_rating_real_is_complete (SavedSea result = TRUE; #line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5089 "SavedSearchDialog.c" +#line 5005 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_rating_on_changed (SavedSearchDialogSearchRowRating* self) { - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; #line 472 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_RATING (self)); #line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5099,8 +5015,8 @@ static void saved_search_dialog_search_row_rating_on_changed (SavedSearchDialogS #line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->parent; #line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_emit_by_name (_tmp0_, "changed", _tmp1_); -#line 5104 "SavedSearchDialog.c" + g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_); +#line 5020 "SavedSearchDialog.c" } @@ -5112,30 +5028,30 @@ static void saved_search_dialog_search_row_rating_class_init (SavedSearchDialogS #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowRatingPrivate)); #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_rating_real_get_widget; + ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_rating_real_get_widget; #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_rating_real_get_search_condition; + ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_rating_real_get_search_condition; #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_rating_real_populate; + ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_rating_real_populate; #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_rating_real_is_complete; -#line 5123 "SavedSearchDialog.c" + ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_rating_real_is_complete; +#line 5039 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_rating_instance_init (SavedSearchDialogSearchRowRating * self) { #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_RATING_GET_PRIVATE (self); -#line 5130 "SavedSearchDialog.c" +#line 5046 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSearchRow* obj) { +static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSearchRow * obj) { SavedSearchDialogSearchRowRating * self; - GtkComboBoxText* _tmp0_ = NULL; - guint _tmp1_ = 0U; - GtkComboBoxText* _tmp2_ = NULL; - guint _tmp3_ = 0U; + GtkComboBoxText* _tmp0_; + guint _tmp1_; + GtkComboBoxText* _tmp2_; + guint _tmp3_; #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating); #line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5160,7 +5076,7 @@ static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSea _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_rating_parent_class)->finalize (obj); -#line 5164 "SavedSearchDialog.c" +#line 5080 "SavedSearchDialog.c" } @@ -5179,59 +5095,53 @@ static GType saved_search_dialog_search_row_rating_get_type (void) { static void _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_on_changed ((SavedSearchDialogSearchRowDate*) self); -#line 5183 "SavedSearchDialog.c" +#line 5099 "SavedSearchDialog.c" } static void _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_on_one_clicked ((SavedSearchDialogSearchRowDate*) self); -#line 5190 "SavedSearchDialog.c" +#line 5106 "SavedSearchDialog.c" } static void _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_on_two_clicked ((SavedSearchDialogSearchRowDate*) self); -#line 5197 "SavedSearchDialog.c" +#line 5113 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) { SavedSearchDialogSearchRowDate* self = NULL; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - GtkComboBoxText* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GtkComboBoxText* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - GtkComboBoxText* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - GtkComboBoxText* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - GtkComboBoxText* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - GtkComboBoxText* _tmp13_ = NULL; - GtkComboBoxText* _tmp14_ = NULL; - GtkCalendar* _tmp15_ = NULL; - GtkCalendar* _tmp16_ = NULL; - GtkButton* _tmp17_ = NULL; - GtkButton* _tmp18_ = NULL; - GtkButton* _tmp19_ = NULL; - GtkButton* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - GtkLabel* _tmp22_ = NULL; - GtkBox* _tmp23_ = NULL; - GtkBox* _tmp24_ = NULL; - GtkComboBoxText* _tmp25_ = NULL; - GtkBox* _tmp26_ = NULL; - GtkButton* _tmp27_ = NULL; - GtkBox* _tmp28_ = NULL; - GtkLabel* _tmp29_ = NULL; - GtkBox* _tmp30_ = NULL; - GtkButton* _tmp31_ = NULL; - GtkBox* _tmp32_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; + GtkComboBoxText* _tmp2_; + GtkComboBoxText* _tmp3_; + GtkComboBoxText* _tmp4_; + GtkComboBoxText* _tmp5_; + GtkComboBoxText* _tmp6_; + GtkComboBoxText* _tmp7_; + GtkComboBoxText* _tmp8_; + GtkComboBoxText* _tmp9_; + GtkCalendar* _tmp10_; + GtkCalendar* _tmp11_; + GtkButton* _tmp12_; + GtkButton* _tmp13_; + GtkButton* _tmp14_; + GtkButton* _tmp15_; + GtkLabel* _tmp16_; + GtkBox* _tmp17_; + GtkBox* _tmp18_; + GtkComboBoxText* _tmp19_; + GtkBox* _tmp20_; + GtkButton* _tmp21_; + GtkBox* _tmp22_; + GtkLabel* _tmp23_; + GtkBox* _tmp24_; + GtkButton* _tmp25_; + GtkBox* _tmp26_; #line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL); #line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5255,157 +5165,145 @@ static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_const #line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->context; #line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = _ ("is exactly"); -#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp3_, _tmp4_); -#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->context; + gtk_combo_box_text_append_text (_tmp3_, _ ("is exactly")); #line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = _ ("is after"); + _tmp4_ = self->priv->context; #line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp5_, _tmp6_); -#line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = self->priv->context; + gtk_combo_box_text_append_text (_tmp4_, _ ("is after")); #line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = _ ("is before"); + _tmp5_ = self->priv->context; #line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp7_, _tmp8_); + gtk_combo_box_text_append_text (_tmp5_, _ ("is before")); #line 497 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = self->priv->context; + _tmp6_ = self->priv->context; #line 497 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = _ ("is between"); -#line 497 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp9_, _tmp10_); -#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = self->priv->context; + gtk_combo_box_text_append_text (_tmp6_, _ ("is between")); #line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = _ ("is not set"); + _tmp7_ = self->priv->context; #line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp11_, _tmp12_); + gtk_combo_box_text_append_text (_tmp7_, _ ("is not set")); #line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = self->priv->context; + _tmp8_ = self->priv->context; #line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_combo_box_get_type (), GtkComboBox), 0); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = self->priv->context; + _tmp9_ = self->priv->context; #line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed, self); #line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = (GtkCalendar*) gtk_calendar_new (); + _tmp10_ = (GtkCalendar*) gtk_calendar_new (); #line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp15_); + g_object_ref_sink (_tmp10_); #line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->cal_one); #line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->cal_one = _tmp15_; + self->priv->cal_one = _tmp10_; #line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = (GtkCalendar*) gtk_calendar_new (); + _tmp11_ = (GtkCalendar*) gtk_calendar_new (); #line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp16_); + g_object_ref_sink (_tmp11_); #line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->cal_two); #line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->cal_two = _tmp16_; + self->priv->cal_two = _tmp11_; #line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = (GtkButton*) gtk_button_new (); + _tmp12_ = (GtkButton*) gtk_button_new (); #line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp17_); + g_object_ref_sink (_tmp12_); #line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->label_one); #line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->label_one = _tmp17_; + self->priv->label_one = _tmp12_; #line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp18_ = self->priv->label_one; + _tmp13_ = self->priv->label_one; #line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (_tmp18_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked, self); + g_signal_connect (_tmp13_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked, self); #line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = (GtkButton*) gtk_button_new (); + _tmp14_ = (GtkButton*) gtk_button_new (); #line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp19_); + g_object_ref_sink (_tmp14_); #line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->label_two); #line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->label_two = _tmp19_; + self->priv->label_two = _tmp14_; #line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = self->priv->label_two; + _tmp15_ = self->priv->label_two; #line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (_tmp20_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked, self); -#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp21_ = _ ("and"); + g_signal_connect (_tmp15_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked, self); #line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp22_ = (GtkLabel*) gtk_label_new (_tmp21_); + _tmp16_ = (GtkLabel*) gtk_label_new (_ ("and")); #line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp22_); + g_object_ref_sink (_tmp16_); #line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->and); #line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->and = _tmp22_; + self->priv->and = _tmp16_; #line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + _tmp17_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); #line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp23_); + g_object_ref_sink (_tmp17_); #line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); #line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->box = _tmp23_; + self->priv->box = _tmp17_; #line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp24_ = self->priv->box; + _tmp18_ = self->priv->box; #line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp25_ = self->priv->context; + _tmp19_ = self->priv->context; #line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp26_ = self->priv->box; + _tmp20_ = self->priv->box; #line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp27_ = self->priv->label_one; + _tmp21_ = self->priv->label_one; #line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp28_ = self->priv->box; + _tmp22_ = self->priv->box; #line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp29_ = self->priv->and; + _tmp23_ = self->priv->and; #line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp30_ = self->priv->box; + _tmp24_ = self->priv->box; #line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp31_ = self->priv->label_two; + _tmp25_ = self->priv->label_two; #line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp32_ = self->priv->box; + _tmp26_ = self->priv->box; #line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget)); #line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_update_date_labels (self); #line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 5384 "SavedSearchDialog.c" +#line 5282 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_new (SavedSearchDialogSearchRowContainer* parent) { #line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_date_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, parent); -#line 5391 "SavedSearchDialog.c" +#line 5289 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchDialogSearchRowDate* self) { SearchConditionDateContext c = 0; - GtkComboBoxText* _tmp0_ = NULL; - gint _tmp1_ = 0; - SearchConditionDateContext _tmp2_ = 0; - GtkButton* _tmp13_ = NULL; - GDateTime* _tmp14_ = NULL; - GDateTime* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - GtkButton* _tmp18_ = NULL; - GDateTime* _tmp19_ = NULL; - GDateTime* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; + GtkComboBoxText* _tmp0_; + gint _tmp1_; + SearchConditionDateContext _tmp2_; + GtkButton* _tmp13_; + GDateTime* _tmp14_; + GDateTime* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + GtkButton* _tmp18_; + GDateTime* _tmp19_; + GDateTime* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; #line 526 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self)); #line 527 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5418,10 +5316,10 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD _tmp2_ = c; #line 530 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp2_ == SEARCH_CONDITION_DATE_CONTEXT_BETWEEN) { -#line 5422 "SavedSearchDialog.c" - GtkButton* _tmp3_ = NULL; - GtkLabel* _tmp4_ = NULL; - GtkButton* _tmp5_ = NULL; +#line 5320 "SavedSearchDialog.c" + GtkButton* _tmp3_; + GtkLabel* _tmp4_; + GtkButton* _tmp5_; #line 531 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->label_one; #line 531 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5434,17 +5332,17 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD _tmp5_ = self->priv->label_two; #line 533 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget)); -#line 5438 "SavedSearchDialog.c" +#line 5336 "SavedSearchDialog.c" } else { - SearchConditionDateContext _tmp6_ = 0; + SearchConditionDateContext _tmp6_; #line 534 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = c; #line 534 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp6_ == SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET) { -#line 5445 "SavedSearchDialog.c" - GtkButton* _tmp7_ = NULL; - GtkLabel* _tmp8_ = NULL; - GtkButton* _tmp9_ = NULL; +#line 5343 "SavedSearchDialog.c" + GtkButton* _tmp7_; + GtkLabel* _tmp8_; + GtkButton* _tmp9_; #line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = self->priv->label_one; #line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5457,11 +5355,11 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD _tmp9_ = self->priv->label_two; #line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); -#line 5461 "SavedSearchDialog.c" +#line 5359 "SavedSearchDialog.c" } else { - GtkButton* _tmp10_ = NULL; - GtkLabel* _tmp11_ = NULL; - GtkButton* _tmp12_ = NULL; + GtkButton* _tmp10_; + GtkLabel* _tmp11_; + GtkButton* _tmp12_; #line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = self->priv->label_one; #line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5474,7 +5372,7 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD _tmp12_ = self->priv->label_two; #line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget)); -#line 5478 "SavedSearchDialog.c" +#line 5376 "SavedSearchDialog.c" } } #line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5509,15 +5407,15 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD _g_free0 (_tmp22_); #line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_date_time_unref0 (_tmp20_); -#line 5513 "SavedSearchDialog.c" +#line 5411 "SavedSearchDialog.c" } static GtkWidget* saved_search_dialog_search_row_date_real_get_widget (SavedSearchDialogSearchRow* base) { SavedSearchDialogSearchRowDate * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 549 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate); #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5528,22 +5426,22 @@ static GtkWidget* saved_search_dialog_search_row_date_real_get_widget (SavedSear result = _tmp1_; #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5532 "SavedSearchDialog.c" +#line 5430 "SavedSearchDialog.c" } static GDateTime* saved_search_dialog_search_row_date_get_date_one (SavedSearchDialogSearchRowDate* self) { GDateTime* result = NULL; - GtkCalendar* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - GtkCalendar* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; - GtkCalendar* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - GDateTime* _tmp9_ = NULL; + GtkCalendar* _tmp0_; + gint _tmp1_; + gint _tmp2_; + GtkCalendar* _tmp3_; + gint _tmp4_; + gint _tmp5_; + GtkCalendar* _tmp6_; + gint _tmp7_; + gint _tmp8_; + GDateTime* _tmp9_; #line 553 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self), NULL); #line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5570,22 +5468,22 @@ static GDateTime* saved_search_dialog_search_row_date_get_date_one (SavedSearchD result = _tmp9_; #line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5574 "SavedSearchDialog.c" +#line 5472 "SavedSearchDialog.c" } static GDateTime* saved_search_dialog_search_row_date_get_date_two (SavedSearchDialogSearchRowDate* self) { GDateTime* result = NULL; - GtkCalendar* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - GtkCalendar* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; - GtkCalendar* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - GDateTime* _tmp9_ = NULL; + GtkCalendar* _tmp0_; + gint _tmp1_; + gint _tmp2_; + GtkCalendar* _tmp3_; + gint _tmp4_; + gint _tmp5_; + GtkCalendar* _tmp6_; + gint _tmp7_; + gint _tmp8_; + GDateTime* _tmp9_; #line 557 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self), NULL); #line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5612,20 +5510,20 @@ static GDateTime* saved_search_dialog_search_row_date_get_date_two (SavedSearchD result = _tmp9_; #line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5616 "SavedSearchDialog.c" +#line 5514 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_set_date_one (SavedSearchDialogSearchRowDate* self, GDateTime* date) { - GtkCalendar* _tmp0_ = NULL; - GDateTime* _tmp1_ = NULL; - gint _tmp2_ = 0; - GtkCalendar* _tmp3_ = NULL; - GDateTime* _tmp4_ = NULL; - gint _tmp5_ = 0; - GtkCalendar* _tmp6_ = NULL; - GDateTime* _tmp7_ = NULL; - gint _tmp8_ = 0; + GtkCalendar* _tmp0_; + GDateTime* _tmp1_; + gint _tmp2_; + GtkCalendar* _tmp3_; + GDateTime* _tmp4_; + gint _tmp5_; + GtkCalendar* _tmp6_; + GDateTime* _tmp7_; + gint _tmp8_; #line 561 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self)); #line 561 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5654,20 +5552,20 @@ static void saved_search_dialog_search_row_date_set_date_one (SavedSearchDialogS _tmp8_ = g_date_time_get_year (_tmp7_); #line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_set (_tmp6_, "year", _tmp8_, NULL); -#line 5658 "SavedSearchDialog.c" +#line 5556 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_set_date_two (SavedSearchDialogSearchRowDate* self, GDateTime* date) { - GtkCalendar* _tmp0_ = NULL; - GDateTime* _tmp1_ = NULL; - gint _tmp2_ = 0; - GtkCalendar* _tmp3_ = NULL; - GDateTime* _tmp4_ = NULL; - gint _tmp5_ = 0; - GtkCalendar* _tmp6_ = NULL; - GDateTime* _tmp7_ = NULL; - gint _tmp8_ = 0; + GtkCalendar* _tmp0_; + GDateTime* _tmp1_; + gint _tmp2_; + GtkCalendar* _tmp3_; + GDateTime* _tmp4_; + gint _tmp5_; + GtkCalendar* _tmp6_; + GDateTime* _tmp7_; + gint _tmp8_; #line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self)); #line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5696,7 +5594,7 @@ static void saved_search_dialog_search_row_date_set_date_two (SavedSearchDialogS _tmp8_ = g_date_time_get_year (_tmp7_); #line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_set (_tmp6_, "year", _tmp8_, NULL); -#line 5700 "SavedSearchDialog.c" +#line 5598 "SavedSearchDialog.c" } @@ -5704,18 +5602,18 @@ static SearchCondition* saved_search_dialog_search_row_date_real_get_search_cond SavedSearchDialogSearchRowDate * self; SearchCondition* result = NULL; SearchConditionSearchType search_type = 0; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SearchConditionSearchType _tmp1_ = 0; + SavedSearchDialogSearchRowContainer* _tmp0_; + SearchConditionSearchType _tmp1_; SearchConditionDateContext search_context = 0; - GtkComboBoxText* _tmp2_ = NULL; - gint _tmp3_ = 0; + GtkComboBoxText* _tmp2_; + gint _tmp3_; SearchConditionDate* c = NULL; - GDateTime* _tmp4_ = NULL; - GDateTime* _tmp5_ = NULL; - GDateTime* _tmp6_ = NULL; - GDateTime* _tmp7_ = NULL; - SearchConditionDate* _tmp8_ = NULL; - SearchConditionDate* _tmp9_ = NULL; + GDateTime* _tmp4_; + GDateTime* _tmp5_; + GDateTime* _tmp6_; + GDateTime* _tmp7_; + SearchConditionDate* _tmp8_; + SearchConditionDate* _tmp9_; #line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate); #line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5752,22 +5650,22 @@ static SearchCondition* saved_search_dialog_search_row_date_real_get_search_cond result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); #line 578 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5756 "SavedSearchDialog.c" +#line 5654 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) { SavedSearchDialogSearchRowDate * self; SearchConditionDate* cond = NULL; - SearchCondition* _tmp0_ = NULL; - SearchConditionDate* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - SearchConditionDateContext _tmp3_ = 0; - SearchConditionDateContext _tmp4_ = 0; - GDateTime* _tmp5_ = NULL; - GDateTime* _tmp6_ = NULL; - GDateTime* _tmp7_ = NULL; - GDateTime* _tmp8_ = NULL; + SearchCondition* _tmp0_; + SearchConditionDate* _tmp1_; + GtkComboBoxText* _tmp2_; + SearchConditionDateContext _tmp3_; + SearchConditionDateContext _tmp4_; + GDateTime* _tmp5_; + GDateTime* _tmp6_; + GDateTime* _tmp7_; + GDateTime* _tmp8_; #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate); #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5804,7 +5702,7 @@ static void saved_search_dialog_search_row_date_real_populate (SavedSearchDialog saved_search_dialog_search_row_date_update_date_labels (self); #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (cond); -#line 5808 "SavedSearchDialog.c" +#line 5706 "SavedSearchDialog.c" } @@ -5817,13 +5715,13 @@ static gboolean saved_search_dialog_search_row_date_real_is_complete (SavedSearc result = TRUE; #line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5821 "SavedSearchDialog.c" +#line 5719 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSearchRowDate* self) { - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; #line 594 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self)); #line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5831,123 +5729,123 @@ static void saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSea #line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->parent; #line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_emit_by_name (_tmp0_, "changed", _tmp1_); + g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_); #line 596 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_update_date_labels (self); -#line 5838 "SavedSearchDialog.c" +#line 5736 "SavedSearchDialog.c" } -static Block9Data* block9_data_ref (Block9Data* _data9_) { +static Block10Data* block10_data_ref (Block10Data* _data10_) { #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_atomic_int_inc (&_data9_->_ref_count_); + g_atomic_int_inc (&_data10_->_ref_count_); #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - return _data9_; -#line 5847 "SavedSearchDialog.c" + return _data10_; +#line 5745 "SavedSearchDialog.c" } -static void block9_data_unref (void * _userdata_) { - Block9Data* _data9_; - _data9_ = (Block9Data*) _userdata_; +static void block10_data_unref (void * _userdata_) { + Block10Data* _data10_; + _data10_ = (Block10Data*) _userdata_; #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) { -#line 5856 "SavedSearchDialog.c" + if (g_atomic_int_dec_and_test (&_data10_->_ref_count_)) { +#line 5754 "SavedSearchDialog.c" SavedSearchDialogSearchRowDate* self; #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self = _data9_->self; + self = _data10_->self; #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (_data9_->d); + _g_object_unref0 (_data10_->d); #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_unref0 (self); #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_slice_free (Block9Data, _data9_); -#line 5866 "SavedSearchDialog.c" + g_slice_free (Block10Data, _data10_); +#line 5764 "SavedSearchDialog.c" } } -static void __lambda12_ (SavedSearchDialogSearchRowDate* self) { +static void __lambda13_ (SavedSearchDialogSearchRowDate* self) { #line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_update_date_labels (self); -#line 5874 "SavedSearchDialog.c" +#line 5772 "SavedSearchDialog.c" } -static void ___lambda12__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) { +static void ___lambda13__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) { #line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - __lambda12_ ((SavedSearchDialogSearchRowDate*) self); -#line 5881 "SavedSearchDialog.c" + __lambda13_ ((SavedSearchDialogSearchRowDate*) self); +#line 5779 "SavedSearchDialog.c" } -static void __lambda13_ (Block9Data* _data9_) { +static void __lambda14_ (Block10Data* _data10_) { SavedSearchDialogSearchRowDate* self; - GtkDialog* _tmp0_ = NULL; + GtkDialog* _tmp0_; #line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self = _data9_->self; + self = _data10_->self; #line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = _data9_->d; + _tmp0_ = _data10_->d; #line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_dialog_response (_tmp0_, (gint) GTK_RESPONSE_ACCEPT); -#line 5894 "SavedSearchDialog.c" +#line 5792 "SavedSearchDialog.c" } -static void ___lambda13__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self) { +static void ___lambda14__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self) { #line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - __lambda13_ (self); -#line 5901 "SavedSearchDialog.c" + __lambda14_ (self); +#line 5799 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialogSearchRowDate* self, GtkCalendar* cal) { - Block9Data* _data9_; + Block10Data* _data10_; gint orig_day = 0; - GtkCalendar* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + GtkCalendar* _tmp0_; + gint _tmp1_; + gint _tmp2_; gint orig_month = 0; - GtkCalendar* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; + GtkCalendar* _tmp3_; + gint _tmp4_; + gint _tmp5_; gint orig_year = 0; - GtkCalendar* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - GtkDialog* _tmp9_ = NULL; - GtkDialog* _tmp10_ = NULL; - GtkDialog* _tmp11_ = NULL; - GtkDialog* _tmp12_ = NULL; - GtkDialog* _tmp13_ = NULL; - GtkBox* _tmp14_ = NULL; - GtkCalendar* _tmp15_ = NULL; + GtkCalendar* _tmp6_; + gint _tmp7_; + gint _tmp8_; + GtkDialog* _tmp9_; + GtkDialog* _tmp10_; + GtkDialog* _tmp11_; + GtkDialog* _tmp12_; + GtkDialog* _tmp13_; + GtkBox* _tmp14_; + GtkCalendar* _tmp15_; gulong id_1 = 0UL; - GtkCalendar* _tmp16_ = NULL; - gulong _tmp17_ = 0UL; + GtkCalendar* _tmp16_; + gulong _tmp17_; gulong id_2 = 0UL; - GtkCalendar* _tmp18_ = NULL; - gulong _tmp19_ = 0UL; - GtkDialog* _tmp20_ = NULL; + GtkCalendar* _tmp18_; + gulong _tmp19_; + GtkDialog* _tmp20_; gint res = 0; - GtkDialog* _tmp21_ = NULL; - gint _tmp22_ = 0; - gint _tmp23_ = 0; - GtkCalendar* _tmp30_ = NULL; - gulong _tmp31_ = 0UL; - GtkCalendar* _tmp32_ = NULL; - gulong _tmp33_ = 0UL; - GtkDialog* _tmp34_ = NULL; + GtkDialog* _tmp21_; + gint _tmp22_; + gint _tmp23_; + GtkCalendar* _tmp30_; + gulong _tmp31_; + GtkCalendar* _tmp32_; + gulong _tmp33_; + GtkDialog* _tmp34_; #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self)); #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (GTK_IS_CALENDAR (cal)); #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _data9_ = g_slice_new0 (Block9Data); + _data10_ = g_slice_new0 (Block10Data); #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _data9_->_ref_count_ = 1; + _data10_->_ref_count_ = 1; #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _data9_->self = saved_search_dialog_search_row_ref (self); + _data10_->self = saved_search_dialog_search_row_ref (self); #line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = cal; #line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5977,21 +5875,21 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo #line 603 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp9_); #line 603 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _data9_->d = _tmp9_; + _data10_->d = _tmp9_; #line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = _data9_->d; + _tmp10_ = _data10_->d; #line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow), TRUE); #line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = _data9_->d; + _tmp11_ = _data10_->d; #line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow), FALSE); #line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = _data9_->d; + _tmp12_ = _data10_->d; #line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_window_set_decorated (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow), FALSE); #line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = _data9_->d; + _tmp13_ = _data10_->d; #line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp14_ = (GtkBox*) gtk_dialog_get_content_area (_tmp13_); #line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -6001,21 +5899,21 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo #line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp16_ = cal; #line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = g_signal_connect (_tmp16_, "day-selected", (GCallback) ___lambda12__gtk_calendar_day_selected, self); + _tmp17_ = g_signal_connect (_tmp16_, "day-selected", (GCallback) ___lambda13__gtk_calendar_day_selected, self); #line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" id_1 = _tmp17_; #line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp18_ = cal; #line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = g_signal_connect_data (_tmp18_, "day-selected-double-click", (GCallback) ___lambda13__gtk_calendar_day_selected_double_click, block9_data_ref (_data9_), (GClosureNotify) block9_data_unref, 0); + _tmp19_ = g_signal_connect_data (_tmp18_, "day-selected-double-click", (GCallback) ___lambda14__gtk_calendar_day_selected_double_click, block10_data_ref (_data10_), (GClosureNotify) block10_data_unref, 0); #line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" id_2 = _tmp19_; #line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = _data9_->d; + _tmp20_ = _data10_->d; #line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget)); #line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp21_ = _data9_->d; + _tmp21_ = _data10_->d; #line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp22_ = gtk_dialog_run (_tmp21_); #line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -6024,13 +5922,13 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo _tmp23_ = res; #line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp23_ != ((gint) GTK_RESPONSE_ACCEPT)) { -#line 6028 "SavedSearchDialog.c" - GtkCalendar* _tmp24_ = NULL; - gint _tmp25_ = 0; - GtkCalendar* _tmp26_ = NULL; - gint _tmp27_ = 0; - GtkCalendar* _tmp28_ = NULL; - gint _tmp29_ = 0; +#line 5926 "SavedSearchDialog.c" + GtkCalendar* _tmp24_; + gint _tmp25_; + GtkCalendar* _tmp26_; + gint _tmp27_; + GtkCalendar* _tmp28_; + gint _tmp29_; #line 618 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp24_ = cal; #line 618 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -6049,7 +5947,7 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo _tmp29_ = orig_year; #line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_set (_tmp28_, "year", _tmp29_, NULL); -#line 6053 "SavedSearchDialog.c" +#line 5951 "SavedSearchDialog.c" } #line 622 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp30_ = cal; @@ -6064,40 +5962,40 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo #line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, G_TYPE_OBJECT, GObject), _tmp33_); #line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp34_ = _data9_->d; + _tmp34_ = _data10_->d; #line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget)); #line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_update_date_labels (self); #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - block9_data_unref (_data9_); + block10_data_unref (_data10_); #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _data9_ = NULL; -#line 6077 "SavedSearchDialog.c" + _data10_ = NULL; +#line 5975 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_on_one_clicked (SavedSearchDialogSearchRowDate* self) { - GtkCalendar* _tmp0_ = NULL; + GtkCalendar* _tmp0_; #line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self)); #line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->cal_one; #line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_popup_calendar (self, _tmp0_); -#line 6089 "SavedSearchDialog.c" +#line 5987 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_on_two_clicked (SavedSearchDialogSearchRowDate* self) { - GtkCalendar* _tmp0_ = NULL; + GtkCalendar* _tmp0_; #line 632 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self)); #line 633 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->cal_two; #line 633 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_popup_calendar (self, _tmp0_); -#line 6101 "SavedSearchDialog.c" +#line 5999 "SavedSearchDialog.c" } @@ -6109,28 +6007,28 @@ static void saved_search_dialog_search_row_date_class_init (SavedSearchDialogSea #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowDatePrivate)); #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_date_real_get_widget; + ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_date_real_get_widget; #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_date_real_get_search_condition; + ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_date_real_get_search_condition; #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_date_real_populate; + ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_date_real_populate; #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_date_real_is_complete; -#line 6120 "SavedSearchDialog.c" + ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_date_real_is_complete; +#line 6018 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_instance_init (SavedSearchDialogSearchRowDate * self) { #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_GET_PRIVATE (self); -#line 6127 "SavedSearchDialog.c" +#line 6025 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearchRow* obj) { +static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearchRow * obj) { SavedSearchDialogSearchRowDate * self; - GtkComboBoxText* _tmp0_ = NULL; - guint _tmp1_ = 0U; + GtkComboBoxText* _tmp0_; + guint _tmp1_; #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate); #line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -6157,7 +6055,7 @@ static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearc _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_date_parent_class)->finalize (obj); -#line 6161 "SavedSearchDialog.c" +#line 6059 "SavedSearchDialog.c" } @@ -6176,7 +6074,7 @@ static GType saved_search_dialog_search_row_date_get_type (void) { static void value_saved_search_dialog_init (GValue* value) { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 6180 "SavedSearchDialog.c" +#line 6078 "SavedSearchDialog.c" } @@ -6185,7 +6083,7 @@ static void value_saved_search_dialog_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_unref (value->data[0].v_pointer); -#line 6189 "SavedSearchDialog.c" +#line 6087 "SavedSearchDialog.c" } } @@ -6195,11 +6093,11 @@ static void value_saved_search_dialog_copy_value (const GValue* src_value, GValu if (src_value->data[0].v_pointer) { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" dest_value->data[0].v_pointer = saved_search_dialog_ref (src_value->data[0].v_pointer); -#line 6199 "SavedSearchDialog.c" +#line 6097 "SavedSearchDialog.c" } else { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" dest_value->data[0].v_pointer = NULL; -#line 6203 "SavedSearchDialog.c" +#line 6101 "SavedSearchDialog.c" } } @@ -6207,66 +6105,66 @@ static void value_saved_search_dialog_copy_value (const GValue* src_value, GValu static gpointer value_saved_search_dialog_peek_pointer (const GValue* value) { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return value->data[0].v_pointer; -#line 6211 "SavedSearchDialog.c" +#line 6109 "SavedSearchDialog.c" } static gchar* value_saved_search_dialog_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (collect_values[0].v_pointer) { -#line 6218 "SavedSearchDialog.c" - SavedSearchDialog* object; +#line 6116 "SavedSearchDialog.c" + SavedSearchDialog * object; object = collect_values[0].v_pointer; #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (object->parent_instance.g_class == NULL) { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6225 "SavedSearchDialog.c" +#line 6123 "SavedSearchDialog.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6229 "SavedSearchDialog.c" +#line 6127 "SavedSearchDialog.c" } #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = saved_search_dialog_ref (object); -#line 6233 "SavedSearchDialog.c" +#line 6131 "SavedSearchDialog.c" } else { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 6237 "SavedSearchDialog.c" +#line 6135 "SavedSearchDialog.c" } #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 6241 "SavedSearchDialog.c" +#line 6139 "SavedSearchDialog.c" } static gchar* value_saved_search_dialog_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - SavedSearchDialog** object_p; + SavedSearchDialog ** object_p; object_p = collect_values[0].v_pointer; #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!object_p) { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 6252 "SavedSearchDialog.c" +#line 6150 "SavedSearchDialog.c" } #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!value->data[0].v_pointer) { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = NULL; -#line 6258 "SavedSearchDialog.c" +#line 6156 "SavedSearchDialog.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = value->data[0].v_pointer; -#line 6262 "SavedSearchDialog.c" +#line 6160 "SavedSearchDialog.c" } else { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = saved_search_dialog_ref (value->data[0].v_pointer); -#line 6266 "SavedSearchDialog.c" +#line 6164 "SavedSearchDialog.c" } #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 6270 "SavedSearchDialog.c" +#line 6168 "SavedSearchDialog.c" } @@ -6280,7 +6178,7 @@ GParamSpec* param_spec_saved_search_dialog (const gchar* name, const gchar* nick G_PARAM_SPEC (spec)->value_type = object_type; #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return G_PARAM_SPEC (spec); -#line 6284 "SavedSearchDialog.c" +#line 6182 "SavedSearchDialog.c" } @@ -6289,12 +6187,12 @@ gpointer value_get_saved_search_dialog (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_DIALOG), NULL); #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return value->data[0].v_pointer; -#line 6293 "SavedSearchDialog.c" +#line 6191 "SavedSearchDialog.c" } void value_set_saved_search_dialog (GValue* value, gpointer v_object) { - SavedSearchDialog* old; + SavedSearchDialog * old; #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_DIALOG)); #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -6309,23 +6207,23 @@ void value_set_saved_search_dialog (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_ref (value->data[0].v_pointer); -#line 6313 "SavedSearchDialog.c" +#line 6211 "SavedSearchDialog.c" } else { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 6317 "SavedSearchDialog.c" +#line 6215 "SavedSearchDialog.c" } #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (old) { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_unref (old); -#line 6323 "SavedSearchDialog.c" +#line 6221 "SavedSearchDialog.c" } } void value_take_saved_search_dialog (GValue* value, gpointer v_object) { - SavedSearchDialog* old; + SavedSearchDialog * old; #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_DIALOG)); #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -6338,17 +6236,17 @@ void value_take_saved_search_dialog (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = v_object; -#line 6342 "SavedSearchDialog.c" +#line 6240 "SavedSearchDialog.c" } else { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 6346 "SavedSearchDialog.c" +#line 6244 "SavedSearchDialog.c" } #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (old) { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_unref (old); -#line 6352 "SavedSearchDialog.c" +#line 6250 "SavedSearchDialog.c" } } @@ -6360,12 +6258,12 @@ static void saved_search_dialog_class_init (SavedSearchDialogClass * klass) { ((SavedSearchDialogClass *) klass)->finalize = saved_search_dialog_finalize; #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_class_add_private (klass, sizeof (SavedSearchDialogPrivate)); -#line 6364 "SavedSearchDialog.c" +#line 6262 "SavedSearchDialog.c" } static void saved_search_dialog_instance_init (SavedSearchDialog * self) { - GeeArrayList* _tmp0_ = NULL; + GeeArrayList* _tmp0_; #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_GET_PRIVATE (self); #line 643 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -6380,14 +6278,14 @@ static void saved_search_dialog_instance_init (SavedSearchDialog * self) { self->priv->valid = FALSE; #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->ref_count = 1; -#line 6384 "SavedSearchDialog.c" +#line 6282 "SavedSearchDialog.c" } -static void saved_search_dialog_finalize (SavedSearchDialog* obj) { +static void saved_search_dialog_finalize (SavedSearchDialog * obj) { SavedSearchDialog * self; - GtkEntry* _tmp0_ = NULL; - guint _tmp1_ = 0U; + GtkEntry* _tmp0_; + guint _tmp1_; #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_DIALOG, SavedSearchDialog); #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -6414,7 +6312,7 @@ static void saved_search_dialog_finalize (SavedSearchDialog* obj) { _g_object_unref0 (self->priv->row_list); #line 645 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->previous_search); -#line 6418 "SavedSearchDialog.c" +#line 6316 "SavedSearchDialog.c" } @@ -6433,18 +6331,18 @@ GType saved_search_dialog_get_type (void) { gpointer saved_search_dialog_ref (gpointer instance) { - SavedSearchDialog* self; + SavedSearchDialog * self; self = instance; #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_atomic_int_inc (&self->ref_count); #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return instance; -#line 6443 "SavedSearchDialog.c" +#line 6341 "SavedSearchDialog.c" } void saved_search_dialog_unref (gpointer instance) { - SavedSearchDialog* self; + SavedSearchDialog * self; self = instance; #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -6452,7 +6350,7 @@ void saved_search_dialog_unref (gpointer instance) { SAVED_SEARCH_DIALOG_GET_CLASS (self)->finalize (self); #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_free_instance ((GTypeInstance *) self); -#line 6456 "SavedSearchDialog.c" +#line 6354 "SavedSearchDialog.c" } } diff --git a/src/searches/SavedSearchPage.c b/src/searches/SavedSearchPage.c index 2f44fd0..92f433b 100644 --- a/src/searches/SavedSearchPage.c +++ b/src/searches/SavedSearchPage.c @@ -1,4 +1,4 @@ -/* SavedSearchPage.c generated by valac 0.34.7, the Vala compiler +/* SavedSearchPage.c generated by valac 0.36.6, the Vala compiler * generated from SavedSearchPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -690,7 +690,7 @@ static gboolean saved_search_manager_real_include_in_view (ViewManager* base, Da GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; gboolean saved_search_predicate (SavedSearch* self, MediaSource* source); -static void saved_search_manager_finalize (ViewManager* obj); +static void saved_search_manager_finalize (ViewManager * obj); GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); @@ -821,7 +821,7 @@ void saved_search_dialog_show (SavedSearchDialog* self); static void saved_search_page_real_update_actions (Page* base, gint selected_count, gint count); void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); void page_update_actions (Page* self, gint selected_count, gint count); -static void saved_search_page_finalize (GObject* obj); +static void saved_search_page_finalize (GObject * obj); static const GActionEntry SAVED_SEARCH_PAGE_entries[3] = {{"RenameSearch", _saved_search_page_on_rename_search_gsimple_action_activate_callback}, {"EditSearch", _saved_search_page_on_edit_search_gsimple_action_activate_callback}, {"DeleteSearch", _saved_search_page_on_delete_search_gsimple_action_activate_callback}}; @@ -834,9 +834,9 @@ static gpointer _g_object_ref0 (gpointer self) { SavedSearchManager* saved_search_manager_construct (GType object_type, SavedSearchPage* owner, SavedSearch* search) { SavedSearchManager* self = NULL; - SavedSearchPage* _tmp0_ = NULL; - SavedSearch* _tmp1_ = NULL; - SavedSearch* _tmp2_ = NULL; + SavedSearchPage* _tmp0_; + SavedSearch* _tmp1_; + SavedSearch* _tmp2_; #line 10 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" g_return_val_if_fail (IS_SAVED_SEARCH_PAGE (owner), NULL); #line 10 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" @@ -869,9 +869,9 @@ SavedSearchManager* saved_search_manager_new (SavedSearchPage* owner, SavedSearc static gboolean saved_search_manager_real_include_in_view (ViewManager* base, DataSource* source) { SavedSearchManager * self; gboolean result = FALSE; - SavedSearch* _tmp0_ = NULL; - DataSource* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + SavedSearch* _tmp0_; + DataSource* _tmp1_; + gboolean _tmp2_; #line 15 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_MANAGER, SavedSearchManager); #line 15 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" @@ -898,7 +898,7 @@ static void saved_search_manager_class_init (SavedSearchManagerClass * klass) { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" g_type_class_add_private (klass, sizeof (SavedSearchManagerPrivate)); #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - ((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) saved_search_manager_real_include_in_view; + ((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) saved_search_manager_real_include_in_view; #line 903 "SavedSearchPage.c" } @@ -910,7 +910,7 @@ static void saved_search_manager_instance_init (SavedSearchManager * self) { } -static void saved_search_manager_finalize (ViewManager* obj) { +static void saved_search_manager_finalize (ViewManager * obj) { SavedSearchManager * self; #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_MANAGER, SavedSearchManager); @@ -957,11 +957,11 @@ static void _saved_search_page_on_delete_search_gsimple_action_activate_callback SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* search) { SavedSearchPage * self = NULL; - SavedSearch* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - SavedSearch* _tmp3_ = NULL; - SavedSearch* _tmp4_ = NULL; + SavedSearch* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + SavedSearch* _tmp3_; + SavedSearch* _tmp4_; #line 26 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL); #line 27 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" @@ -985,12 +985,12 @@ SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* se #line 986 "SavedSearchPage.c" { GeeIterator* _sources_it = NULL; - MediaCollectionRegistry* _tmp5_ = NULL; - MediaCollectionRegistry* _tmp6_ = NULL; - GeeCollection* _tmp7_ = NULL; - GeeCollection* _tmp8_ = NULL; - GeeIterator* _tmp9_ = NULL; - GeeIterator* _tmp10_ = NULL; + MediaCollectionRegistry* _tmp5_; + MediaCollectionRegistry* _tmp6_; + GeeCollection* _tmp7_; + GeeCollection* _tmp8_; + GeeIterator* _tmp9_; + GeeIterator* _tmp10_; #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" _tmp5_ = media_collection_registry_get_instance (); #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" @@ -1012,19 +1012,19 @@ SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* se #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" while (TRUE) { #line 1015 "SavedSearchPage.c" - GeeIterator* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; + GeeIterator* _tmp11_; + gboolean _tmp12_; MediaSourceCollection* sources = NULL; - GeeIterator* _tmp13_ = NULL; - gpointer _tmp14_ = NULL; - ViewCollection* _tmp15_ = NULL; - ViewCollection* _tmp16_ = NULL; - MediaSourceCollection* _tmp17_ = NULL; - SavedSearch* _tmp18_ = NULL; - SavedSearchManager* _tmp19_ = NULL; - SavedSearchManager* _tmp20_ = NULL; - ViewCollectionMonitor* _tmp21_ = NULL; - ViewCollectionMonitor* _tmp22_ = NULL; + GeeIterator* _tmp13_; + gpointer _tmp14_; + ViewCollection* _tmp15_; + ViewCollection* _tmp16_; + MediaSourceCollection* _tmp17_; + SavedSearch* _tmp18_; + SavedSearchManager* _tmp19_; + SavedSearchManager* _tmp20_; + ViewCollectionMonitor* _tmp21_; + ViewCollectionMonitor* _tmp22_; #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" _tmp11_ = _sources_it; #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" @@ -1090,8 +1090,8 @@ static void saved_search_page_real_get_config_photos_sort (MediaPage* base, gboo SavedSearchPage * 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 37 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" @@ -1125,10 +1125,10 @@ static void saved_search_page_real_get_config_photos_sort (MediaPage* base, gboo static void saved_search_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) { SavedSearchPage * self; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gint _tmp3_ = 0; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + gboolean _tmp2_; + gint _tmp3_; #line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage); #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" @@ -1149,8 +1149,8 @@ static void saved_search_page_real_set_config_photos_sort (MediaPage* base, gboo static void saved_search_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { SavedSearchPage * self; - GeeList* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; + GeeList* _tmp0_; + GeeList* _tmp1_; #line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage); #line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" @@ -1169,8 +1169,8 @@ static void saved_search_page_real_init_collect_ui_filenames (Page* base, GeeLis static void saved_search_page_real_add_actions (Page* base, GActionMap* map) { SavedSearchPage * self; - GActionMap* _tmp0_ = NULL; - GActionMap* _tmp1_ = NULL; + GActionMap* _tmp0_; + GActionMap* _tmp1_; #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage); #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" @@ -1189,7 +1189,7 @@ static void saved_search_page_real_add_actions (Page* base, GActionMap* map) { static void saved_search_page_real_remove_actions (Page* base, GActionMap* map) { SavedSearchPage * self; - GActionMap* _tmp0_ = NULL; + GActionMap* _tmp0_; #line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage); #line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" @@ -1216,9 +1216,9 @@ static void saved_search_page_real_remove_actions (Page* base, GActionMap* map) entry = entry_collection[entry_it]; #line 1218 "SavedSearchPage.c" { - GActionMap* _tmp1_ = NULL; - GActionEntry _tmp2_ = {0}; - const gchar* _tmp3_ = NULL; + GActionMap* _tmp1_; + GActionEntry _tmp2_; + const gchar* _tmp3_; #line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" _tmp1_ = map; #line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" @@ -1235,8 +1235,8 @@ static void saved_search_page_real_remove_actions (Page* base, GActionMap* map) static void saved_search_page_on_delete_search (SavedSearchPage* self) { - SavedSearch* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SavedSearch* _tmp0_; + gboolean _tmp1_; #line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" g_return_if_fail (IS_SAVED_SEARCH_PAGE (self)); #line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" @@ -1246,11 +1246,11 @@ static void saved_search_page_on_delete_search (SavedSearchPage* self) { #line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" if (_tmp1_) { #line 1249 "SavedSearchPage.c" - CommandManager* _tmp2_ = NULL; - CommandManager* _tmp3_ = NULL; - SavedSearch* _tmp4_ = NULL; - DeleteSavedSearchCommand* _tmp5_ = NULL; - DeleteSavedSearchCommand* _tmp6_ = NULL; + CommandManager* _tmp2_; + CommandManager* _tmp3_; + SavedSearch* _tmp4_; + DeleteSavedSearchCommand* _tmp5_; + DeleteSavedSearchCommand* _tmp6_; #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" _tmp2_ = app_window_get_command_manager (); #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" @@ -1273,9 +1273,9 @@ static void saved_search_page_on_delete_search (SavedSearchPage* self) { static void saved_search_page_on_rename_search (SavedSearchPage* self) { - LibraryWindow* _tmp0_ = NULL; - LibraryWindow* _tmp1_ = NULL; - SavedSearch* _tmp2_ = NULL; + LibraryWindow* _tmp0_; + LibraryWindow* _tmp1_; + SavedSearch* _tmp2_; #line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" g_return_if_fail (IS_SAVED_SEARCH_PAGE (self)); #line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" @@ -1294,8 +1294,8 @@ static void saved_search_page_on_rename_search (SavedSearchPage* self) { static void saved_search_page_on_edit_search (SavedSearchPage* self) { SavedSearchDialog* ssd = NULL; - SavedSearch* _tmp0_ = NULL; - SavedSearchDialog* _tmp1_ = NULL; + SavedSearch* _tmp0_; + SavedSearchDialog* _tmp1_; #line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" g_return_if_fail (IS_SAVED_SEARCH_PAGE (self)); #line 80 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" @@ -1314,8 +1314,8 @@ static void saved_search_page_on_edit_search (SavedSearchPage* self) { static void saved_search_page_real_update_actions (Page* base, gint selected_count, gint count) { SavedSearchPage * self; - gint _tmp0_ = 0; - gint _tmp1_ = 0; + gint _tmp0_; + gint _tmp1_; #line 84 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage); #line 85 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" @@ -1340,17 +1340,17 @@ static void saved_search_page_class_init (SavedSearchPageClass * klass) { #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" g_type_class_add_private (klass, sizeof (SavedSearchPagePrivate)); #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - ((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) saved_search_page_real_get_config_photos_sort; + ((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) saved_search_page_real_get_config_photos_sort; #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - ((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) saved_search_page_real_set_config_photos_sort; + ((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) saved_search_page_real_set_config_photos_sort; #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - ((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) saved_search_page_real_init_collect_ui_filenames; + ((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) saved_search_page_real_init_collect_ui_filenames; #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - ((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) saved_search_page_real_add_actions; + ((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) saved_search_page_real_add_actions; #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - ((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) saved_search_page_real_remove_actions; + ((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) saved_search_page_real_remove_actions; #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" - ((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) saved_search_page_real_update_actions; + ((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) saved_search_page_real_update_actions; #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" G_OBJECT_CLASS (klass)->finalize = saved_search_page_finalize; #line 1357 "SavedSearchPage.c" @@ -1364,7 +1364,7 @@ static void saved_search_page_instance_init (SavedSearchPage * self) { } -static void saved_search_page_finalize (GObject* obj) { +static void saved_search_page_finalize (GObject * obj) { SavedSearchPage * self; #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage); diff --git a/src/searches/SearchBoolean.c b/src/searches/SearchBoolean.c index 2667236..a32204d 100644 --- a/src/searches/SearchBoolean.c +++ b/src/searches/SearchBoolean.c @@ -1,4 +1,4 @@ -/* SearchBoolean.c generated by valac 0.34.7, the Vala compiler +/* SearchBoolean.c generated by valac 0.36.6, the Vala compiler * generated from SearchBoolean.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -405,6 +405,12 @@ typedef struct _LibraryWindow LibraryWindow; typedef struct _LibraryWindowClass LibraryWindowClass; typedef struct _SavedSearchTablePrivate SavedSearchTablePrivate; typedef struct _ParamSpecSavedSearchTable ParamSpecSavedSearchTable; +enum { + SAVED_SEARCH_TABLE_SEARCH_ADDED_SIGNAL, + SAVED_SEARCH_TABLE_SEARCH_REMOVED_SIGNAL, + SAVED_SEARCH_TABLE_LAST_SIGNAL +}; +static guint saved_search_table_signals[SAVED_SEARCH_TABLE_LAST_SIGNAL] = {0}; typedef enum { SEARCH_OPERATOR_ANY = 0, @@ -742,10 +748,10 @@ enum { }; SearchConditionSearchType* search_condition_search_type_as_array (int* result_length1); void search_condition_search_type_sort_array (SearchConditionSearchType** array, int* array_length1); -static gint __lambda11_ (void* a, void* b); +static gint __lambda12_ (void* a, void* b); gint utf8_cs_compare (void* a, void* b); gchar* search_condition_search_type_display_text (SearchConditionSearchType self); -static gint ___lambda11____compar_fn_t (void* key1, void* key2); +static gint ___lambda12____compar_fn_t (void* key1, void* key2); gchar* search_condition_search_type_to_string (SearchConditionSearchType self); SearchConditionSearchType search_condition_search_type_from_string (const gchar* str); gboolean search_condition_predicate (SearchCondition* self, MediaSource* source); @@ -753,7 +759,7 @@ static gboolean search_condition_real_predicate (SearchCondition* self, MediaSou SearchCondition* search_condition_construct (GType object_type); SearchConditionSearchType search_condition_get_search_type (SearchCondition* self); void search_condition_set_search_type (SearchCondition* self, SearchConditionSearchType value); -static void search_condition_finalize (SearchCondition* obj); +static void search_condition_finalize (SearchCondition * obj); GType search_condition_text_get_type (void) G_GNUC_CONST; GType search_condition_text_context_get_type (void) G_GNUC_CONST; #define SEARCH_CONDITION_TEXT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_CONDITION_TEXT, SearchConditionTextPrivate)) @@ -793,7 +799,7 @@ Event* media_source_get_event (MediaSource* self); gchar* data_object_get_name (DataObject* self); gchar* media_source_get_comment (MediaSource* self); gchar* media_source_get_basename (MediaSource* self); -static void search_condition_text_finalize (SearchCondition* obj); +static void search_condition_text_finalize (SearchCondition * obj); GType search_condition_media_type_get_type (void) G_GNUC_CONST; GType search_condition_media_type_media_type_get_type (void) G_GNUC_CONST; GType search_condition_media_type_context_get_type (void) G_GNUC_CONST; @@ -817,7 +823,7 @@ SearchConditionMediaTypeContext search_condition_media_type_get_context (SearchC GType photo_file_format_get_type (void) G_GNUC_CONST; PhotoFileFormat photo_get_master_file_format (Photo* self); GType video_source_get_type (void) G_GNUC_CONST; -static void search_condition_media_type_finalize (SearchCondition* obj); +static void search_condition_media_type_finalize (SearchCondition * obj); GType search_condition_flagged_get_type (void) G_GNUC_CONST; GType search_condition_flagged_state_get_type (void) G_GNUC_CONST; #define SEARCH_CONDITION_FLAGGED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_CONDITION_FLAGGED, SearchConditionFlaggedPrivate)) @@ -833,7 +839,7 @@ static gboolean search_condition_flagged_real_predicate (SearchCondition* base, SearchConditionFlaggedState search_condition_flagged_get_state (SearchConditionFlagged* self); GType flaggable_get_type (void) G_GNUC_CONST; gboolean flaggable_is_flagged (Flaggable* self); -static void search_condition_flagged_finalize (SearchCondition* obj); +static void search_condition_flagged_finalize (SearchCondition * obj); GType search_condition_modified_get_type (void) G_GNUC_CONST; GType search_condition_modified_state_get_type (void) G_GNUC_CONST; GType search_condition_modified_context_get_type (void) G_GNUC_CONST; @@ -854,7 +860,7 @@ SearchConditionModifiedState search_condition_modified_get_state (SearchConditio gboolean photo_has_transformations (Photo* self); gboolean photo_has_editable (Photo* self); SearchConditionModifiedContext search_condition_modified_get_context (SearchConditionModified* self); -static void search_condition_modified_finalize (SearchCondition* obj); +static void search_condition_modified_finalize (SearchCondition * obj); GType search_condition_rating_get_type (void) G_GNUC_CONST; GType rating_get_type (void) G_GNUC_CONST; GType search_condition_rating_context_get_type (void) G_GNUC_CONST; @@ -872,7 +878,7 @@ static gboolean search_condition_rating_real_predicate (SearchCondition* base, M Rating media_source_get_rating (MediaSource* self); SearchConditionRatingContext search_condition_rating_get_context (SearchConditionRating* self); Rating search_condition_rating_get_rating (SearchConditionRating* self); -static void search_condition_rating_finalize (SearchCondition* obj); +static void search_condition_rating_finalize (SearchCondition * obj); GType search_condition_date_get_type (void) G_GNUC_CONST; GType search_condition_date_context_get_type (void) G_GNUC_CONST; #define SEARCH_CONDITION_DATE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_CONDITION_DATE, SearchConditionDatePrivate)) @@ -891,7 +897,7 @@ time_t media_source_get_exposure_time (MediaSource* self); SearchConditionDateContext search_condition_date_get_context (SearchConditionDate* self); GDateTime* search_condition_date_get_date_one (SearchConditionDate* self); GDateTime* search_condition_date_get_date_two (SearchConditionDate* self); -static void search_condition_date_finalize (SearchCondition* obj); +static void search_condition_date_finalize (SearchCondition * obj); gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -974,7 +980,7 @@ LibraryWindow* library_window_get_app (void); void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* search); GeeList* saved_search_get_conditions (SavedSearch* self); SearchOperator saved_search_get_operator (SavedSearch* self); -static void saved_search_finalize (GObject* obj); +static void saved_search_finalize (GObject * obj); #define SAVED_SEARCH_TABLE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SAVED_SEARCH_TABLE, SavedSearchTablePrivate)) enum { SAVED_SEARCH_TABLE_DUMMY_PROPERTY @@ -992,7 +998,7 @@ GeeIterable* saved_search_table_get_saved_searches (SavedSearchTable* self); gint saved_search_table_get_count (SavedSearchTable* self); gchar* saved_search_table_generate_unique_name (SavedSearchTable* self); #define RESOURCES_DEFAULT_SAVED_SEARCH_NAME _ ("Saved Search") -static void saved_search_table_finalize (SavedSearchTable* obj); +static void saved_search_table_finalize (SavedSearchTable * obj); gchar* search_operator_to_string (SearchOperator self) { @@ -1001,48 +1007,48 @@ gchar* search_operator_to_string (SearchOperator self) { switch (self) { #line 14 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_OPERATOR_ANY: -#line 1005 "SearchBoolean.c" +#line 1011 "SearchBoolean.c" { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 16 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = g_strdup ("ANY"); #line 16 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp0_; #line 16 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1014 "SearchBoolean.c" +#line 1020 "SearchBoolean.c" } #line 14 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_OPERATOR_ALL: -#line 1018 "SearchBoolean.c" +#line 1024 "SearchBoolean.c" { - gchar* _tmp1_ = NULL; + gchar* _tmp1_; #line 19 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = g_strdup ("ALL"); #line 19 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp1_; #line 19 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1027 "SearchBoolean.c" +#line 1033 "SearchBoolean.c" } #line 14 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_OPERATOR_NONE: -#line 1031 "SearchBoolean.c" +#line 1037 "SearchBoolean.c" { - gchar* _tmp2_ = NULL; + gchar* _tmp2_; #line 22 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = g_strdup ("NONE"); #line 22 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp2_; #line 22 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1040 "SearchBoolean.c" +#line 1046 "SearchBoolean.c" } default: { #line 25 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:25: unrecognized search operator enumeration value"); -#line 1046 "SearchBoolean.c" +#line 1052 "SearchBoolean.c" } } } @@ -1050,7 +1056,7 @@ gchar* search_operator_to_string (SearchOperator self) { SearchOperator search_operator_from_string (const gchar* str) { SearchOperator result = 0; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 29 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (str != NULL, 0); #line 30 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1061,9 +1067,9 @@ SearchOperator search_operator_from_string (const gchar* str) { result = SEARCH_OPERATOR_ANY; #line 31 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1065 "SearchBoolean.c" +#line 1071 "SearchBoolean.c" } else { - const gchar* _tmp1_ = NULL; + const gchar* _tmp1_; #line 33 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = str; #line 33 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1072,9 +1078,9 @@ SearchOperator search_operator_from_string (const gchar* str) { result = SEARCH_OPERATOR_ALL; #line 34 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1076 "SearchBoolean.c" +#line 1082 "SearchBoolean.c" } else { - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 36 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = str; #line 36 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1083,14 +1089,14 @@ SearchOperator search_operator_from_string (const gchar* str) { result = SEARCH_OPERATOR_NONE; #line 37 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1087 "SearchBoolean.c" +#line 1093 "SearchBoolean.c" } else { - const gchar* _tmp3_ = NULL; + const gchar* _tmp3_; #line 40 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = str; #line 40 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:40: unrecognized search operator name: %s", _tmp3_); -#line 1094 "SearchBoolean.c" +#line 1100 "SearchBoolean.c" } } } @@ -1111,9 +1117,9 @@ GType search_operator_get_type (void) { SearchConditionSearchType* search_condition_search_type_as_array (int* result_length1) { SearchConditionSearchType* result = NULL; - SearchConditionSearchType* _tmp0_ = NULL; - SearchConditionSearchType* _tmp1_ = NULL; - gint _tmp1__length1 = 0; + SearchConditionSearchType* _tmp0_; + SearchConditionSearchType* _tmp1_; + gint _tmp1__length1; #line 64 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = g_new0 (SearchConditionSearchType, 11); #line 64 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1146,23 +1152,23 @@ SearchConditionSearchType* search_condition_search_type_as_array (int* result_le if (result_length1) { #line 64 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" *result_length1 = _tmp1__length1; -#line 1150 "SearchBoolean.c" +#line 1156 "SearchBoolean.c" } #line 64 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp1_; #line 64 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1156 "SearchBoolean.c" +#line 1162 "SearchBoolean.c" } -static gint __lambda11_ (void* a, void* b) { +static gint __lambda12_ (void* a, void* b) { gint result = 0; - void* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - void* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gint _tmp4_ = 0; + void* _tmp0_; + gchar* _tmp1_; + void* _tmp2_; + gchar* _tmp3_; + gint _tmp4_; #line 71 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = a; #line 71 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1177,24 +1183,24 @@ static gint __lambda11_ (void* a, void* b) { result = _tmp4_; #line 71 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1181 "SearchBoolean.c" +#line 1187 "SearchBoolean.c" } -static gint ___lambda11____compar_fn_t (void* key1, void* key2) { +static gint ___lambda12____compar_fn_t (void* key1, void* key2) { gint result; - result = __lambda11_ (key1, key2); + result = __lambda12_ (key1, key2); #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1190 "SearchBoolean.c" +#line 1196 "SearchBoolean.c" } void search_condition_search_type_sort_array (SearchConditionSearchType** array, int* array_length1) { - SearchConditionSearchType* _tmp0_ = NULL; - gint _tmp0__length1 = 0; - SearchConditionSearchType* _tmp1_ = NULL; - gint _tmp1__length1 = 0; + SearchConditionSearchType* _tmp0_; + gint _tmp0__length1; + SearchConditionSearchType* _tmp1_; + gint _tmp1__length1; #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = *array; #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1204,8 +1210,8 @@ void search_condition_search_type_sort_array (SearchConditionSearchType** array, #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1__length1 = *array_length1; #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - qsort (_tmp0_, (gsize) _tmp1__length1, (gsize) sizeof (SearchConditionSearchType), ___lambda11____compar_fn_t); -#line 1209 "SearchBoolean.c" + qsort (_tmp0_, (gsize) _tmp1__length1, (gsize) sizeof (SearchConditionSearchType), ___lambda12____compar_fn_t); +#line 1215 "SearchBoolean.c" } @@ -1215,152 +1221,152 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) { switch (self) { #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT: -#line 1219 "SearchBoolean.c" +#line 1225 "SearchBoolean.c" { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 79 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = g_strdup ("ANY_TEXT"); #line 79 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp0_; #line 79 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1228 "SearchBoolean.c" +#line 1234 "SearchBoolean.c" } #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_TITLE: -#line 1232 "SearchBoolean.c" +#line 1238 "SearchBoolean.c" { - gchar* _tmp1_ = NULL; + gchar* _tmp1_; #line 82 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = g_strdup ("TITLE"); #line 82 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp1_; #line 82 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1241 "SearchBoolean.c" +#line 1247 "SearchBoolean.c" } #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_TAG: -#line 1245 "SearchBoolean.c" +#line 1251 "SearchBoolean.c" { - gchar* _tmp2_ = NULL; + gchar* _tmp2_; #line 85 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = g_strdup ("TAG"); #line 85 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp2_; #line 85 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1254 "SearchBoolean.c" +#line 1260 "SearchBoolean.c" } #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_COMMENT: -#line 1258 "SearchBoolean.c" +#line 1264 "SearchBoolean.c" { - gchar* _tmp3_ = NULL; + gchar* _tmp3_; #line 88 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = g_strdup ("COMMENT"); #line 88 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp3_; #line 88 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1267 "SearchBoolean.c" +#line 1273 "SearchBoolean.c" } #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME: -#line 1271 "SearchBoolean.c" +#line 1277 "SearchBoolean.c" { - gchar* _tmp4_ = NULL; + gchar* _tmp4_; #line 91 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = g_strdup ("EVENT_NAME"); #line 91 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp4_; #line 91 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1280 "SearchBoolean.c" +#line 1286 "SearchBoolean.c" } #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME: -#line 1284 "SearchBoolean.c" +#line 1290 "SearchBoolean.c" { - gchar* _tmp5_ = NULL; + gchar* _tmp5_; #line 94 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp5_ = g_strdup ("FILE_NAME"); #line 94 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp5_; #line 94 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1293 "SearchBoolean.c" +#line 1299 "SearchBoolean.c" } #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE: -#line 1297 "SearchBoolean.c" +#line 1303 "SearchBoolean.c" { - gchar* _tmp6_ = NULL; + gchar* _tmp6_; #line 97 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp6_ = g_strdup ("MEDIA_TYPE"); #line 97 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp6_; #line 97 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1306 "SearchBoolean.c" +#line 1312 "SearchBoolean.c" } #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE: -#line 1310 "SearchBoolean.c" +#line 1316 "SearchBoolean.c" { - gchar* _tmp7_ = NULL; + gchar* _tmp7_; #line 100 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp7_ = g_strdup ("FLAG_STATE"); #line 100 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp7_; #line 100 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1319 "SearchBoolean.c" +#line 1325 "SearchBoolean.c" } #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE: -#line 1323 "SearchBoolean.c" +#line 1329 "SearchBoolean.c" { - gchar* _tmp8_ = NULL; + gchar* _tmp8_; #line 103 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp8_ = g_strdup ("MODIFIED_STATE"); #line 103 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp8_; #line 103 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1332 "SearchBoolean.c" +#line 1338 "SearchBoolean.c" } #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_RATING: -#line 1336 "SearchBoolean.c" +#line 1342 "SearchBoolean.c" { - gchar* _tmp9_ = NULL; + gchar* _tmp9_; #line 106 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp9_ = g_strdup ("RATING"); #line 106 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp9_; #line 106 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1345 "SearchBoolean.c" +#line 1351 "SearchBoolean.c" } #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_DATE: -#line 1349 "SearchBoolean.c" +#line 1355 "SearchBoolean.c" { - gchar* _tmp10_ = NULL; + gchar* _tmp10_; #line 109 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp10_ = g_strdup ("DATE"); #line 109 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp10_; #line 109 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1358 "SearchBoolean.c" +#line 1364 "SearchBoolean.c" } default: { #line 112 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:112: unrecognized search type enumeration value"); -#line 1364 "SearchBoolean.c" +#line 1370 "SearchBoolean.c" } } } @@ -1368,7 +1374,7 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) { SearchConditionSearchType search_condition_search_type_from_string (const gchar* str) { SearchConditionSearchType result = 0; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 116 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (str != NULL, 0); #line 117 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1379,9 +1385,9 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar* result = SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT; #line 118 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1383 "SearchBoolean.c" +#line 1389 "SearchBoolean.c" } else { - const gchar* _tmp1_ = NULL; + const gchar* _tmp1_; #line 120 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = str; #line 120 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1390,9 +1396,9 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar* result = SEARCH_CONDITION_SEARCH_TYPE_TITLE; #line 121 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1394 "SearchBoolean.c" +#line 1400 "SearchBoolean.c" } else { - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 123 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = str; #line 123 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1401,9 +1407,9 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar* result = SEARCH_CONDITION_SEARCH_TYPE_TAG; #line 124 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1405 "SearchBoolean.c" +#line 1411 "SearchBoolean.c" } else { - const gchar* _tmp3_ = NULL; + const gchar* _tmp3_; #line 126 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = str; #line 126 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1412,9 +1418,9 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar* result = SEARCH_CONDITION_SEARCH_TYPE_COMMENT; #line 127 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1416 "SearchBoolean.c" +#line 1422 "SearchBoolean.c" } else { - const gchar* _tmp4_ = NULL; + const gchar* _tmp4_; #line 129 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = str; #line 129 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1423,9 +1429,9 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar* result = SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME; #line 130 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1427 "SearchBoolean.c" +#line 1433 "SearchBoolean.c" } else { - const gchar* _tmp5_ = NULL; + const gchar* _tmp5_; #line 132 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp5_ = str; #line 132 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1434,9 +1440,9 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar* result = SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME; #line 133 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1438 "SearchBoolean.c" +#line 1444 "SearchBoolean.c" } else { - const gchar* _tmp6_ = NULL; + const gchar* _tmp6_; #line 135 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp6_ = str; #line 135 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1445,9 +1451,9 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar* result = SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE; #line 136 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1449 "SearchBoolean.c" +#line 1455 "SearchBoolean.c" } else { - const gchar* _tmp7_ = NULL; + const gchar* _tmp7_; #line 138 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp7_ = str; #line 138 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1456,9 +1462,9 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar* result = SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE; #line 139 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1460 "SearchBoolean.c" +#line 1466 "SearchBoolean.c" } else { - const gchar* _tmp8_ = NULL; + const gchar* _tmp8_; #line 141 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp8_ = str; #line 141 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1467,9 +1473,9 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar* result = SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE; #line 142 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1471 "SearchBoolean.c" +#line 1477 "SearchBoolean.c" } else { - const gchar* _tmp9_ = NULL; + const gchar* _tmp9_; #line 144 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp9_ = str; #line 144 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1478,9 +1484,9 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar* result = SEARCH_CONDITION_SEARCH_TYPE_RATING; #line 145 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1482 "SearchBoolean.c" +#line 1488 "SearchBoolean.c" } else { - const gchar* _tmp10_ = NULL; + const gchar* _tmp10_; #line 147 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp10_ = str; #line 147 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1489,14 +1495,14 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar* result = SEARCH_CONDITION_SEARCH_TYPE_DATE; #line 148 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1493 "SearchBoolean.c" +#line 1499 "SearchBoolean.c" } else { - const gchar* _tmp11_ = NULL; + const gchar* _tmp11_; #line 151 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp11_ = str; #line 151 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:151: unrecognized search type name: %s", _tmp11_); -#line 1500 "SearchBoolean.c" +#line 1506 "SearchBoolean.c" } } } @@ -1517,32 +1523,26 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self switch (self) { #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT: -#line 1521 "SearchBoolean.c" +#line 1527 "SearchBoolean.c" { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_; #line 157 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = _ ("Any text"); + _tmp0_ = g_strdup (_ ("Any text")); #line 157 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 157 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp1_; + result = _tmp0_; #line 157 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1533 "SearchBoolean.c" +#line 1536 "SearchBoolean.c" } #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_TITLE: -#line 1537 "SearchBoolean.c" +#line 1540 "SearchBoolean.c" { - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 160 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp2_ = _ ("Title"); + gchar* _tmp1_; #line 160 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp1_ = g_strdup (_ ("Title")); #line 160 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp3_; + result = _tmp1_; #line 160 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; #line 1549 "SearchBoolean.c" @@ -1551,151 +1551,124 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self case SEARCH_CONDITION_SEARCH_TYPE_TAG: #line 1553 "SearchBoolean.c" { - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; -#line 163 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp4_ = _ ("Tag"); + gchar* _tmp2_; #line 163 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp5_ = g_strdup (_tmp4_); + _tmp2_ = g_strdup (_ ("Tag")); #line 163 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp5_; + result = _tmp2_; #line 163 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1565 "SearchBoolean.c" +#line 1562 "SearchBoolean.c" } #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_COMMENT: -#line 1569 "SearchBoolean.c" +#line 1566 "SearchBoolean.c" { - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; -#line 166 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp6_ = _ ("Comment"); + gchar* _tmp3_; #line 166 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp3_ = g_strdup (_ ("Comment")); #line 166 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp7_; + result = _tmp3_; #line 166 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1581 "SearchBoolean.c" +#line 1575 "SearchBoolean.c" } #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME: -#line 1585 "SearchBoolean.c" +#line 1579 "SearchBoolean.c" { - const gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; + gchar* _tmp4_; #line 169 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp8_ = _ ("Event name"); + _tmp4_ = g_strdup (_ ("Event name")); #line 169 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp9_ = g_strdup (_tmp8_); -#line 169 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp9_; + result = _tmp4_; #line 169 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1597 "SearchBoolean.c" +#line 1588 "SearchBoolean.c" } #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME: -#line 1601 "SearchBoolean.c" +#line 1592 "SearchBoolean.c" { - const gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; -#line 172 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp10_ = _ ("File name"); + gchar* _tmp5_; #line 172 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp11_ = g_strdup (_tmp10_); + _tmp5_ = g_strdup (_ ("File name")); #line 172 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp11_; + result = _tmp5_; #line 172 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1613 "SearchBoolean.c" +#line 1601 "SearchBoolean.c" } #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE: -#line 1617 "SearchBoolean.c" +#line 1605 "SearchBoolean.c" { - const gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; -#line 175 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp12_ = _ ("Media type"); + gchar* _tmp6_; #line 175 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp13_ = g_strdup (_tmp12_); + _tmp6_ = g_strdup (_ ("Media type")); #line 175 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp13_; + result = _tmp6_; #line 175 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1629 "SearchBoolean.c" +#line 1614 "SearchBoolean.c" } #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE: -#line 1633 "SearchBoolean.c" +#line 1618 "SearchBoolean.c" { - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; -#line 178 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp14_ = _ ("Flag state"); + gchar* _tmp7_; #line 178 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp15_ = g_strdup (_tmp14_); + _tmp7_ = g_strdup (_ ("Flag state")); #line 178 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp15_; + result = _tmp7_; #line 178 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1645 "SearchBoolean.c" +#line 1627 "SearchBoolean.c" } #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE: -#line 1649 "SearchBoolean.c" +#line 1631 "SearchBoolean.c" { - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; -#line 181 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp16_ = _ ("Photo state"); + gchar* _tmp8_; #line 181 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp17_ = g_strdup (_tmp16_); + _tmp8_ = g_strdup (_ ("Photo state")); #line 181 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp17_; + result = _tmp8_; #line 181 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1661 "SearchBoolean.c" +#line 1640 "SearchBoolean.c" } #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_RATING: -#line 1665 "SearchBoolean.c" +#line 1644 "SearchBoolean.c" { - const gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; + gchar* _tmp9_; #line 184 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp18_ = _ ("Rating"); + _tmp9_ = g_strdup (_ ("Rating")); #line 184 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp19_ = g_strdup (_tmp18_); -#line 184 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp19_; + result = _tmp9_; #line 184 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1677 "SearchBoolean.c" +#line 1653 "SearchBoolean.c" } #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_SEARCH_TYPE_DATE: -#line 1681 "SearchBoolean.c" +#line 1657 "SearchBoolean.c" { - const gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; + gchar* _tmp10_; #line 187 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp20_ = _ ("Date"); + _tmp10_ = g_strdup (_ ("Date")); #line 187 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp21_ = g_strdup (_tmp20_); -#line 187 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - result = _tmp21_; + result = _tmp10_; #line 187 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1693 "SearchBoolean.c" +#line 1666 "SearchBoolean.c" } default: { #line 190 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:190: unrecognized search type enumeration value"); -#line 1699 "SearchBoolean.c" +#line 1672 "SearchBoolean.c" } } } @@ -1719,7 +1692,7 @@ static gboolean search_condition_real_predicate (SearchCondition* self, MediaSou g_critical ("Type `%s' does not implement abstract method `search_condition_predicate'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 198 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return _tmp0_; -#line 1723 "SearchBoolean.c" +#line 1696 "SearchBoolean.c" } @@ -1728,7 +1701,7 @@ gboolean search_condition_predicate (SearchCondition* self, MediaSource* source) g_return_val_if_fail (IS_SEARCH_CONDITION (self), FALSE); #line 198 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return SEARCH_CONDITION_GET_CLASS (self)->predicate (self, source); -#line 1732 "SearchBoolean.c" +#line 1705 "SearchBoolean.c" } @@ -1738,13 +1711,13 @@ SearchCondition* search_condition_construct (GType object_type) { self = (SearchCondition*) g_type_create_instance (object_type); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 1742 "SearchBoolean.c" +#line 1715 "SearchBoolean.c" } SearchConditionSearchType search_condition_get_search_type (SearchCondition* self) { SearchConditionSearchType result; - SearchConditionSearchType _tmp0_ = 0; + SearchConditionSearchType _tmp0_; #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SEARCH_CONDITION (self), 0); #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1753,26 +1726,26 @@ SearchConditionSearchType search_condition_get_search_type (SearchCondition* sel result = _tmp0_; #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1757 "SearchBoolean.c" +#line 1730 "SearchBoolean.c" } void search_condition_set_search_type (SearchCondition* self, SearchConditionSearchType value) { - SearchConditionSearchType _tmp0_ = 0; + SearchConditionSearchType _tmp0_; #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION (self)); #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = value; #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_search_type = _tmp0_; -#line 1769 "SearchBoolean.c" +#line 1742 "SearchBoolean.c" } static void value_search_condition_init (GValue* value) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 1776 "SearchBoolean.c" +#line 1749 "SearchBoolean.c" } @@ -1781,7 +1754,7 @@ static void value_search_condition_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_unref (value->data[0].v_pointer); -#line 1785 "SearchBoolean.c" +#line 1758 "SearchBoolean.c" } } @@ -1791,11 +1764,11 @@ static void value_search_condition_copy_value (const GValue* src_value, GValue* if (src_value->data[0].v_pointer) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" dest_value->data[0].v_pointer = search_condition_ref (src_value->data[0].v_pointer); -#line 1795 "SearchBoolean.c" +#line 1768 "SearchBoolean.c" } else { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" dest_value->data[0].v_pointer = NULL; -#line 1799 "SearchBoolean.c" +#line 1772 "SearchBoolean.c" } } @@ -1803,66 +1776,66 @@ static void value_search_condition_copy_value (const GValue* src_value, GValue* static gpointer value_search_condition_peek_pointer (const GValue* value) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return value->data[0].v_pointer; -#line 1807 "SearchBoolean.c" +#line 1780 "SearchBoolean.c" } static gchar* value_search_condition_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (collect_values[0].v_pointer) { -#line 1814 "SearchBoolean.c" - SearchCondition* object; +#line 1787 "SearchBoolean.c" + SearchCondition * object; object = collect_values[0].v_pointer; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (object->parent_instance.g_class == NULL) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1821 "SearchBoolean.c" +#line 1794 "SearchBoolean.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1825 "SearchBoolean.c" +#line 1798 "SearchBoolean.c" } #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = search_condition_ref (object); -#line 1829 "SearchBoolean.c" +#line 1802 "SearchBoolean.c" } else { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 1833 "SearchBoolean.c" +#line 1806 "SearchBoolean.c" } #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 1837 "SearchBoolean.c" +#line 1810 "SearchBoolean.c" } static gchar* value_search_condition_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - SearchCondition** object_p; + SearchCondition ** object_p; object_p = collect_values[0].v_pointer; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (!object_p) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1848 "SearchBoolean.c" +#line 1821 "SearchBoolean.c" } #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (!value->data[0].v_pointer) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" *object_p = NULL; -#line 1854 "SearchBoolean.c" +#line 1827 "SearchBoolean.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" *object_p = value->data[0].v_pointer; -#line 1858 "SearchBoolean.c" +#line 1831 "SearchBoolean.c" } else { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" *object_p = search_condition_ref (value->data[0].v_pointer); -#line 1862 "SearchBoolean.c" +#line 1835 "SearchBoolean.c" } #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 1866 "SearchBoolean.c" +#line 1839 "SearchBoolean.c" } @@ -1876,7 +1849,7 @@ GParamSpec* param_spec_search_condition (const gchar* name, const gchar* nick, c G_PARAM_SPEC (spec)->value_type = object_type; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return G_PARAM_SPEC (spec); -#line 1880 "SearchBoolean.c" +#line 1853 "SearchBoolean.c" } @@ -1885,12 +1858,12 @@ gpointer value_get_search_condition (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_CONDITION), NULL); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return value->data[0].v_pointer; -#line 1889 "SearchBoolean.c" +#line 1862 "SearchBoolean.c" } void value_set_search_condition (GValue* value, gpointer v_object) { - SearchCondition* old; + SearchCondition * old; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_CONDITION)); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1905,23 +1878,23 @@ void value_set_search_condition (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_ref (value->data[0].v_pointer); -#line 1909 "SearchBoolean.c" +#line 1882 "SearchBoolean.c" } else { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 1913 "SearchBoolean.c" +#line 1886 "SearchBoolean.c" } #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (old) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_unref (old); -#line 1919 "SearchBoolean.c" +#line 1892 "SearchBoolean.c" } } void value_take_search_condition (GValue* value, gpointer v_object) { - SearchCondition* old; + SearchCondition * old; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_CONDITION)); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -1934,17 +1907,17 @@ void value_take_search_condition (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = v_object; -#line 1938 "SearchBoolean.c" +#line 1911 "SearchBoolean.c" } else { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 1942 "SearchBoolean.c" +#line 1915 "SearchBoolean.c" } #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (old) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_unref (old); -#line 1948 "SearchBoolean.c" +#line 1921 "SearchBoolean.c" } } @@ -1957,8 +1930,8 @@ static void search_condition_class_init (SearchConditionClass * klass) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_class_add_private (klass, sizeof (SearchConditionPrivate)); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_real_predicate; -#line 1962 "SearchBoolean.c" + ((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_real_predicate; +#line 1935 "SearchBoolean.c" } @@ -1967,17 +1940,17 @@ static void search_condition_instance_init (SearchCondition * self) { self->priv = SEARCH_CONDITION_GET_PRIVATE (self); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->ref_count = 1; -#line 1971 "SearchBoolean.c" +#line 1944 "SearchBoolean.c" } -static void search_condition_finalize (SearchCondition* obj) { +static void search_condition_finalize (SearchCondition * obj) { SearchCondition * self; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION, SearchCondition); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_signal_handlers_destroy (self); -#line 1981 "SearchBoolean.c" +#line 1954 "SearchBoolean.c" } @@ -1996,18 +1969,18 @@ GType search_condition_get_type (void) { gpointer search_condition_ref (gpointer instance) { - SearchCondition* self; + SearchCondition * self; self = instance; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_atomic_int_inc (&self->ref_count); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return instance; -#line 2006 "SearchBoolean.c" +#line 1979 "SearchBoolean.c" } void search_condition_unref (gpointer instance) { - SearchCondition* self; + SearchCondition * self; self = instance; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2015,7 +1988,7 @@ void search_condition_unref (gpointer instance) { SEARCH_CONDITION_GET_CLASS (self)->finalize (self); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2019 "SearchBoolean.c" +#line 1992 "SearchBoolean.c" } } @@ -2026,101 +1999,101 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self) switch (self) { #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_CONTAINS: -#line 2030 "SearchBoolean.c" +#line 2003 "SearchBoolean.c" { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 215 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = g_strdup ("CONTAINS"); #line 215 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp0_; #line 215 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2039 "SearchBoolean.c" +#line 2012 "SearchBoolean.c" } #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY: -#line 2043 "SearchBoolean.c" +#line 2016 "SearchBoolean.c" { - gchar* _tmp1_ = NULL; + gchar* _tmp1_; #line 218 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = g_strdup ("IS_EXACTLY"); #line 218 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp1_; #line 218 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2052 "SearchBoolean.c" +#line 2025 "SearchBoolean.c" } #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH: -#line 2056 "SearchBoolean.c" +#line 2029 "SearchBoolean.c" { - gchar* _tmp2_ = NULL; + gchar* _tmp2_; #line 221 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = g_strdup ("STARTS_WITH"); #line 221 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp2_; #line 221 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2065 "SearchBoolean.c" +#line 2038 "SearchBoolean.c" } #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH: -#line 2069 "SearchBoolean.c" +#line 2042 "SearchBoolean.c" { - gchar* _tmp3_ = NULL; + gchar* _tmp3_; #line 224 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = g_strdup ("ENDS_WITH"); #line 224 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp3_; #line 224 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2078 "SearchBoolean.c" +#line 2051 "SearchBoolean.c" } #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN: -#line 2082 "SearchBoolean.c" +#line 2055 "SearchBoolean.c" { - gchar* _tmp4_ = NULL; + gchar* _tmp4_; #line 227 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = g_strdup ("DOES_NOT_CONTAIN"); #line 227 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp4_; #line 227 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2091 "SearchBoolean.c" +#line 2064 "SearchBoolean.c" } #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET: -#line 2095 "SearchBoolean.c" +#line 2068 "SearchBoolean.c" { - gchar* _tmp5_ = NULL; + gchar* _tmp5_; #line 230 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp5_ = g_strdup ("IS_NOT_SET"); #line 230 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp5_; #line 230 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2104 "SearchBoolean.c" +#line 2077 "SearchBoolean.c" } #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_IS_SET: -#line 2108 "SearchBoolean.c" +#line 2081 "SearchBoolean.c" { - gchar* _tmp6_ = NULL; + gchar* _tmp6_; #line 233 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp6_ = g_strdup ("IS_SET"); #line 233 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp6_; #line 233 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2117 "SearchBoolean.c" +#line 2090 "SearchBoolean.c" } default: { #line 236 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:236: unrecognized text search context enumeration v" \ "alue"); -#line 2123 "SearchBoolean.c" +#line 2096 "SearchBoolean.c" } } } @@ -2128,7 +2101,7 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self) SearchConditionTextContext search_condition_text_context_from_string (const gchar* str) { SearchConditionTextContext result = 0; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 240 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (str != NULL, 0); #line 241 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2139,9 +2112,9 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha result = SEARCH_CONDITION_TEXT_CONTEXT_CONTAINS; #line 242 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2142 "SearchBoolean.c" +#line 2115 "SearchBoolean.c" } else { - const gchar* _tmp1_ = NULL; + const gchar* _tmp1_; #line 244 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = str; #line 244 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2150,9 +2123,9 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha result = SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY; #line 245 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2153 "SearchBoolean.c" +#line 2126 "SearchBoolean.c" } else { - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 247 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = str; #line 247 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2161,9 +2134,9 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha result = SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH; #line 248 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2164 "SearchBoolean.c" +#line 2137 "SearchBoolean.c" } else { - const gchar* _tmp3_ = NULL; + const gchar* _tmp3_; #line 250 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = str; #line 250 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2172,9 +2145,9 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha result = SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH; #line 251 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2175 "SearchBoolean.c" +#line 2148 "SearchBoolean.c" } else { - const gchar* _tmp4_ = NULL; + const gchar* _tmp4_; #line 253 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = str; #line 253 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2183,9 +2156,9 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha result = SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN; #line 254 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2186 "SearchBoolean.c" +#line 2159 "SearchBoolean.c" } else { - const gchar* _tmp5_ = NULL; + const gchar* _tmp5_; #line 256 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp5_ = str; #line 256 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2194,9 +2167,9 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha result = SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET; #line 257 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2197 "SearchBoolean.c" +#line 2170 "SearchBoolean.c" } else { - const gchar* _tmp6_ = NULL; + const gchar* _tmp6_; #line 259 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp6_ = str; #line 259 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2205,14 +2178,14 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha result = SEARCH_CONDITION_TEXT_CONTEXT_IS_SET; #line 260 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2208 "SearchBoolean.c" +#line 2181 "SearchBoolean.c" } else { - const gchar* _tmp7_ = NULL; + const gchar* _tmp7_; #line 263 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp7_ = str; #line 263 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:263: unrecognized text search context name: %s", _tmp7_); -#line 2215 "SearchBoolean.c" +#line 2188 "SearchBoolean.c" } } } @@ -2237,10 +2210,10 @@ GType search_condition_text_context_get_type (void) { SearchConditionText* search_condition_text_construct (GType object_type, SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context) { SearchConditionText* self = NULL; - SearchConditionSearchType _tmp0_ = 0; + SearchConditionSearchType _tmp0_; gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - SearchConditionTextContext _tmp8_ = 0; + const gchar* _tmp2_; + SearchConditionTextContext _tmp8_; #line 273 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = (SearchConditionText*) search_condition_construct (object_type); #line 274 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2251,11 +2224,11 @@ SearchConditionText* search_condition_text_construct (GType object_type, SearchC _tmp2_ = text; #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp2_ != NULL) { -#line 2254 "SearchBoolean.c" - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; +#line 2227 "SearchBoolean.c" + const gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = text; #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2270,16 +2243,16 @@ SearchConditionText* search_condition_text_construct (GType object_type, SearchC _tmp1_ = _tmp6_; #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp5_); -#line 2273 "SearchBoolean.c" +#line 2246 "SearchBoolean.c" } else { - gchar* _tmp7_ = NULL; + gchar* _tmp7_; #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp7_ = g_strdup (""); #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp1_); #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = _tmp7_; -#line 2282 "SearchBoolean.c" +#line 2255 "SearchBoolean.c" } #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_text_set_text (self, _tmp1_); @@ -2291,40 +2264,40 @@ SearchConditionText* search_condition_text_construct (GType object_type, SearchC _g_free0 (_tmp1_); #line 273 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 2294 "SearchBoolean.c" +#line 2267 "SearchBoolean.c" } SearchConditionText* search_condition_text_new (SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context) { #line 273 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return search_condition_text_construct (TYPE_SEARCH_CONDITION_TEXT, search_type, text, context); -#line 2301 "SearchBoolean.c" +#line 2274 "SearchBoolean.c" } 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.34/vapi/glib-2.0.vapi" + const gchar* _tmp0_; + gchar* _tmp1_; +#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2321 "SearchBoolean.c" +#line 2294 "SearchBoolean.c" } static gboolean search_condition_text_string_match (SearchConditionText* self, const gchar* needle, const gchar* haystack) { gboolean result = FALSE; - SearchConditionTextContext _tmp0_ = 0; + SearchConditionTextContext _tmp0_; #line 280 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SEARCH_CONDITION_TEXT (self), FALSE); #line 280 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2337,21 +2310,21 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c case SEARCH_CONDITION_TEXT_CONTEXT_CONTAINS: #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN: -#line 2340 "SearchBoolean.c" +#line 2313 "SearchBoolean.c" { gboolean _tmp1_ = FALSE; - const gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + const gchar* _tmp2_; + gboolean _tmp3_; #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = haystack; #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = is_string_empty (_tmp2_); #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (!_tmp3_) { -#line 2351 "SearchBoolean.c" - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; +#line 2324 "SearchBoolean.c" + const gchar* _tmp4_; + const gchar* _tmp5_; + gboolean _tmp6_; #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = haystack; #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2360,69 +2333,69 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c _tmp6_ = string_contains (_tmp4_, _tmp5_); #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = _tmp6_; -#line 2363 "SearchBoolean.c" +#line 2336 "SearchBoolean.c" } else { #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = FALSE; -#line 2367 "SearchBoolean.c" +#line 2340 "SearchBoolean.c" } #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp1_; #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2373 "SearchBoolean.c" +#line 2346 "SearchBoolean.c" } #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY: -#line 2377 "SearchBoolean.c" +#line 2350 "SearchBoolean.c" { gboolean _tmp7_ = FALSE; - const gchar* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; + const gchar* _tmp8_; + gboolean _tmp9_; #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp8_ = haystack; #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp9_ = is_string_empty (_tmp8_); #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (!_tmp9_) { -#line 2388 "SearchBoolean.c" - const gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; +#line 2361 "SearchBoolean.c" + const gchar* _tmp10_; + const gchar* _tmp11_; #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp10_ = haystack; #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp11_ = needle; #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp7_ = g_strcmp0 (_tmp10_, _tmp11_) == 0; -#line 2397 "SearchBoolean.c" +#line 2370 "SearchBoolean.c" } else { #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp7_ = FALSE; -#line 2401 "SearchBoolean.c" +#line 2374 "SearchBoolean.c" } #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp7_; #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2407 "SearchBoolean.c" +#line 2380 "SearchBoolean.c" } #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH: -#line 2411 "SearchBoolean.c" +#line 2384 "SearchBoolean.c" { gboolean _tmp12_ = FALSE; - const gchar* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; + const gchar* _tmp13_; + gboolean _tmp14_; #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp13_ = haystack; #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp14_ = is_string_empty (_tmp13_); #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (!_tmp14_) { -#line 2422 "SearchBoolean.c" - const gchar* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; +#line 2395 "SearchBoolean.c" + const gchar* _tmp15_; + const gchar* _tmp16_; + gboolean _tmp17_; #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp15_ = haystack; #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2431,35 +2404,35 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c _tmp17_ = g_str_has_prefix (_tmp15_, _tmp16_); #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp12_ = _tmp17_; -#line 2434 "SearchBoolean.c" +#line 2407 "SearchBoolean.c" } else { #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp12_ = FALSE; -#line 2438 "SearchBoolean.c" +#line 2411 "SearchBoolean.c" } #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp12_; #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2444 "SearchBoolean.c" +#line 2417 "SearchBoolean.c" } #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH: -#line 2448 "SearchBoolean.c" +#line 2421 "SearchBoolean.c" { gboolean _tmp18_ = FALSE; - const gchar* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; + const gchar* _tmp19_; + gboolean _tmp20_; #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp19_ = haystack; #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp20_ = is_string_empty (_tmp19_); #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (!_tmp20_) { -#line 2459 "SearchBoolean.c" - const gchar* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - gboolean _tmp23_ = FALSE; +#line 2432 "SearchBoolean.c" + const gchar* _tmp21_; + const gchar* _tmp22_; + gboolean _tmp23_; #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp21_ = haystack; #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2468,24 +2441,24 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c _tmp23_ = g_str_has_suffix (_tmp21_, _tmp22_); #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp18_ = _tmp23_; -#line 2471 "SearchBoolean.c" +#line 2444 "SearchBoolean.c" } else { #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp18_ = FALSE; -#line 2475 "SearchBoolean.c" +#line 2448 "SearchBoolean.c" } #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp18_; #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2481 "SearchBoolean.c" +#line 2454 "SearchBoolean.c" } #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET: -#line 2485 "SearchBoolean.c" +#line 2458 "SearchBoolean.c" { - const gchar* _tmp24_ = NULL; - gboolean _tmp25_ = FALSE; + const gchar* _tmp24_; + gboolean _tmp25_; #line 296 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp24_ = haystack; #line 296 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2494,14 +2467,14 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c result = _tmp25_; #line 296 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2497 "SearchBoolean.c" +#line 2470 "SearchBoolean.c" } #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_IS_SET: -#line 2501 "SearchBoolean.c" +#line 2474 "SearchBoolean.c" { - const gchar* _tmp26_ = NULL; - gboolean _tmp27_ = FALSE; + const gchar* _tmp26_; + gboolean _tmp27_; #line 299 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp26_ = haystack; #line 299 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2510,25 +2483,25 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c result = !_tmp27_; #line 299 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2513 "SearchBoolean.c" +#line 2486 "SearchBoolean.c" } default: #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" break; -#line 2518 "SearchBoolean.c" +#line 2491 "SearchBoolean.c" } #line 302 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = FALSE; #line 302 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2524 "SearchBoolean.c" +#line 2497 "SearchBoolean.c" } static gpointer _g_object_ref0 (gpointer self) { #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self ? g_object_ref (self) : NULL; -#line 2531 "SearchBoolean.c" +#line 2504 "SearchBoolean.c" } @@ -2537,22 +2510,22 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med gboolean result = FALSE; gboolean ret = FALSE; gboolean _tmp0_ = FALSE; - SearchConditionSearchType _tmp1_ = 0; - SearchConditionSearchType _tmp2_ = 0; + SearchConditionSearchType _tmp1_; + SearchConditionSearchType _tmp2_; gboolean _tmp21_ = FALSE; - SearchConditionSearchType _tmp22_ = 0; - SearchConditionSearchType _tmp23_ = 0; + SearchConditionSearchType _tmp22_; + SearchConditionSearchType _tmp23_; gboolean _tmp52_ = FALSE; - SearchConditionSearchType _tmp53_ = 0; - SearchConditionSearchType _tmp54_ = 0; + SearchConditionSearchType _tmp53_; + SearchConditionSearchType _tmp54_; gboolean _tmp75_ = FALSE; - SearchConditionSearchType _tmp76_ = 0; - SearchConditionSearchType _tmp77_ = 0; + SearchConditionSearchType _tmp76_; + SearchConditionSearchType _tmp77_; gboolean _tmp91_ = FALSE; - SearchConditionSearchType _tmp92_ = 0; - SearchConditionSearchType _tmp93_ = 0; + SearchConditionSearchType _tmp92_; + SearchConditionSearchType _tmp93_; gboolean _tmp106_ = FALSE; - SearchConditionTextContext _tmp107_ = 0; + SearchConditionTextContext _tmp107_; #line 306 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEARCH_CONDITION_TEXT, SearchConditionText); #line 306 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2567,32 +2540,32 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp2_) { #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = TRUE; -#line 2570 "SearchBoolean.c" +#line 2543 "SearchBoolean.c" } else { - SearchConditionSearchType _tmp3_ = 0; - SearchConditionSearchType _tmp4_ = 0; + SearchConditionSearchType _tmp3_; + SearchConditionSearchType _tmp4_; #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = _tmp3_; #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = SEARCH_CONDITION_SEARCH_TYPE_TITLE == _tmp4_; -#line 2580 "SearchBoolean.c" +#line 2553 "SearchBoolean.c" } #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp0_) { -#line 2584 "SearchBoolean.c" +#line 2557 "SearchBoolean.c" gchar* _tmp5_ = NULL; - MediaSource* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; + MediaSource* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gboolean _tmp9_; gchar* title = NULL; - gchar* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; - const gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; + gchar* _tmp16_; + gboolean _tmp17_; + const gchar* _tmp18_; + const gchar* _tmp19_; + gboolean _tmp20_; #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp6_ = source; #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2605,13 +2578,13 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _g_free0 (_tmp8_); #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp9_) { -#line 2608 "SearchBoolean.c" - MediaSource* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; +#line 2581 "SearchBoolean.c" + MediaSource* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp10_ = source; #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2632,13 +2605,13 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _g_free0 (_tmp14_); #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp12_); -#line 2635 "SearchBoolean.c" +#line 2608 "SearchBoolean.c" } else { #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp5_); #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp5_ = NULL; -#line 2641 "SearchBoolean.c" +#line 2614 "SearchBoolean.c" } #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp16_ = g_strdup (_tmp5_); @@ -2658,7 +2631,7 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _g_free0 (title); #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp5_); -#line 2661 "SearchBoolean.c" +#line 2634 "SearchBoolean.c" } #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp22_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); @@ -2668,26 +2641,26 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp23_) { #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp21_ = TRUE; -#line 2671 "SearchBoolean.c" +#line 2644 "SearchBoolean.c" } else { - SearchConditionSearchType _tmp24_ = 0; - SearchConditionSearchType _tmp25_ = 0; + SearchConditionSearchType _tmp24_; + SearchConditionSearchType _tmp25_; #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp24_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp25_ = _tmp24_; #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp21_ = SEARCH_CONDITION_SEARCH_TYPE_TAG == _tmp25_; -#line 2681 "SearchBoolean.c" +#line 2654 "SearchBoolean.c" } #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp21_) { -#line 2685 "SearchBoolean.c" +#line 2658 "SearchBoolean.c" GeeList* tag_list = NULL; - TagSourceCollection* _tmp26_ = NULL; - MediaSource* _tmp27_ = NULL; - GeeList* _tmp28_ = NULL; - GeeList* _tmp29_ = NULL; + TagSourceCollection* _tmp26_; + MediaSource* _tmp27_; + GeeList* _tmp28_; + GeeList* _tmp29_; #line 318 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp26_ = tag_global; #line 318 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2700,16 +2673,16 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _tmp29_ = tag_list; #line 319 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (NULL != _tmp29_) { -#line 2703 "SearchBoolean.c" +#line 2676 "SearchBoolean.c" gchar* itag = NULL; { GeeList* _tag_list = NULL; - GeeList* _tmp30_ = NULL; - GeeList* _tmp31_ = NULL; + GeeList* _tmp30_; + GeeList* _tmp31_; gint _tag_size = 0; - GeeList* _tmp32_ = NULL; - gint _tmp33_ = 0; - gint _tmp34_ = 0; + GeeList* _tmp32_; + gint _tmp33_; + gint _tmp34_; gint _tag_index = 0; #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp30_ = tag_list; @@ -2729,22 +2702,22 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _tag_index = -1; #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" while (TRUE) { -#line 2732 "SearchBoolean.c" - gint _tmp35_ = 0; - gint _tmp36_ = 0; - gint _tmp37_ = 0; +#line 2705 "SearchBoolean.c" + gint _tmp35_; + gint _tmp36_; + gint _tmp37_; Tag* tag = NULL; - GeeList* _tmp38_ = NULL; - gint _tmp39_ = 0; - gpointer _tmp40_ = NULL; - Tag* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; - gchar* _tmp43_ = NULL; - gchar* _tmp44_ = NULL; - gboolean _tmp45_ = FALSE; - const gchar* _tmp46_ = NULL; - const gchar* _tmp47_ = NULL; - gboolean _tmp48_ = FALSE; + GeeList* _tmp38_; + gint _tmp39_; + gpointer _tmp40_; + Tag* _tmp41_; + gchar* _tmp42_; + gchar* _tmp43_; + gchar* _tmp44_; + gboolean _tmp45_; + const gchar* _tmp46_; + const gchar* _tmp47_; + gboolean _tmp48_; #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp35_ = _tag_index; #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2757,7 +2730,7 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med if (!(_tmp36_ < _tmp37_)) { #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" break; -#line 2760 "SearchBoolean.c" +#line 2733 "SearchBoolean.c" } #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp38_ = _tag_list; @@ -2793,19 +2766,19 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med ret = _tmp45_ | _tmp48_; #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (tag); -#line 2796 "SearchBoolean.c" +#line 2769 "SearchBoolean.c" } #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (_tag_list); -#line 2800 "SearchBoolean.c" +#line 2773 "SearchBoolean.c" } #line 319 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (itag); -#line 2804 "SearchBoolean.c" +#line 2777 "SearchBoolean.c" } else { - gboolean _tmp49_ = FALSE; - const gchar* _tmp50_ = NULL; - gboolean _tmp51_ = FALSE; + gboolean _tmp49_; + const gchar* _tmp50_; + gboolean _tmp51_; #line 326 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp49_ = ret; #line 326 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2814,11 +2787,11 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _tmp51_ = search_condition_text_string_match (self, _tmp50_, NULL); #line 326 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ret = _tmp49_ | _tmp51_; -#line 2817 "SearchBoolean.c" +#line 2790 "SearchBoolean.c" } #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (tag_list); -#line 2821 "SearchBoolean.c" +#line 2794 "SearchBoolean.c" } #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp53_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); @@ -2828,32 +2801,32 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp54_) { #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp52_ = TRUE; -#line 2831 "SearchBoolean.c" +#line 2804 "SearchBoolean.c" } else { - SearchConditionSearchType _tmp55_ = 0; - SearchConditionSearchType _tmp56_ = 0; + SearchConditionSearchType _tmp55_; + SearchConditionSearchType _tmp56_; #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp55_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp56_ = _tmp55_; #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp52_ = SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME == _tmp56_; -#line 2841 "SearchBoolean.c" +#line 2814 "SearchBoolean.c" } #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp52_) { -#line 2845 "SearchBoolean.c" +#line 2818 "SearchBoolean.c" gchar* _tmp57_ = NULL; - MediaSource* _tmp58_ = NULL; - Event* _tmp59_ = NULL; - Event* _tmp60_ = NULL; - gboolean _tmp61_ = FALSE; + MediaSource* _tmp58_; + Event* _tmp59_; + Event* _tmp60_; + gboolean _tmp61_; gchar* event_name = NULL; - gchar* _tmp70_ = NULL; - gboolean _tmp71_ = FALSE; - const gchar* _tmp72_ = NULL; - const gchar* _tmp73_ = NULL; - gboolean _tmp74_ = FALSE; + gchar* _tmp70_; + gboolean _tmp71_; + const gchar* _tmp72_; + const gchar* _tmp73_; + gboolean _tmp74_; #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp58_ = source; #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2866,15 +2839,15 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _g_object_unref0 (_tmp60_); #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp61_) { -#line 2869 "SearchBoolean.c" - MediaSource* _tmp62_ = NULL; - Event* _tmp63_ = NULL; - Event* _tmp64_ = NULL; - gchar* _tmp65_ = NULL; - gchar* _tmp66_ = NULL; - gchar* _tmp67_ = NULL; - gchar* _tmp68_ = NULL; - gchar* _tmp69_ = NULL; +#line 2842 "SearchBoolean.c" + MediaSource* _tmp62_; + Event* _tmp63_; + Event* _tmp64_; + gchar* _tmp65_; + gchar* _tmp66_; + gchar* _tmp67_; + gchar* _tmp68_; + gchar* _tmp69_; #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp62_ = source; #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2901,13 +2874,13 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _g_free0 (_tmp66_); #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (_tmp64_); -#line 2904 "SearchBoolean.c" +#line 2877 "SearchBoolean.c" } else { #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp57_); #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp57_ = NULL; -#line 2910 "SearchBoolean.c" +#line 2883 "SearchBoolean.c" } #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp70_ = g_strdup (_tmp57_); @@ -2927,7 +2900,7 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _g_free0 (event_name); #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp57_); -#line 2930 "SearchBoolean.c" +#line 2903 "SearchBoolean.c" } #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp76_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); @@ -2937,25 +2910,25 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp77_) { #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp75_ = TRUE; -#line 2940 "SearchBoolean.c" +#line 2913 "SearchBoolean.c" } else { - SearchConditionSearchType _tmp78_ = 0; - SearchConditionSearchType _tmp79_ = 0; + SearchConditionSearchType _tmp78_; + SearchConditionSearchType _tmp79_; #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp78_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp79_ = _tmp78_; #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp75_ = SEARCH_CONDITION_SEARCH_TYPE_COMMENT == _tmp79_; -#line 2950 "SearchBoolean.c" +#line 2923 "SearchBoolean.c" } #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp75_) { -#line 2954 "SearchBoolean.c" +#line 2927 "SearchBoolean.c" gchar* comment = NULL; - MediaSource* _tmp80_ = NULL; - gchar* _tmp81_ = NULL; - const gchar* _tmp82_ = NULL; + MediaSource* _tmp80_; + gchar* _tmp81_; + const gchar* _tmp82_; #line 339 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp80_ = source; #line 339 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2966,15 +2939,15 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _tmp82_ = comment; #line 340 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (NULL != _tmp82_) { -#line 2969 "SearchBoolean.c" - gboolean _tmp83_ = FALSE; - const gchar* _tmp84_ = NULL; - const gchar* _tmp85_ = NULL; - gchar* _tmp86_ = NULL; - gchar* _tmp87_ = NULL; - gchar* _tmp88_ = NULL; - gchar* _tmp89_ = NULL; - gboolean _tmp90_ = FALSE; +#line 2942 "SearchBoolean.c" + gboolean _tmp83_; + const gchar* _tmp84_; + const gchar* _tmp85_; + gchar* _tmp86_; + gchar* _tmp87_; + gchar* _tmp88_; + gchar* _tmp89_; + gboolean _tmp90_; #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp83_ = ret; #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2997,11 +2970,11 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _g_free0 (_tmp89_); #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp87_); -#line 3000 "SearchBoolean.c" +#line 2973 "SearchBoolean.c" } #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (comment); -#line 3004 "SearchBoolean.c" +#line 2977 "SearchBoolean.c" } #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp92_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); @@ -3011,31 +2984,31 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp93_) { #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp91_ = TRUE; -#line 3014 "SearchBoolean.c" +#line 2987 "SearchBoolean.c" } else { - SearchConditionSearchType _tmp94_ = 0; - SearchConditionSearchType _tmp95_ = 0; + SearchConditionSearchType _tmp94_; + SearchConditionSearchType _tmp95_; #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp94_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp95_ = _tmp94_; #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp91_ = SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME == _tmp95_; -#line 3024 "SearchBoolean.c" +#line 2997 "SearchBoolean.c" } #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp91_) { -#line 3028 "SearchBoolean.c" - gboolean _tmp96_ = FALSE; - const gchar* _tmp97_ = NULL; - MediaSource* _tmp98_ = NULL; - gchar* _tmp99_ = NULL; - gchar* _tmp100_ = NULL; - gchar* _tmp101_ = NULL; - gchar* _tmp102_ = NULL; - gchar* _tmp103_ = NULL; - gchar* _tmp104_ = NULL; - gboolean _tmp105_ = FALSE; +#line 3001 "SearchBoolean.c" + gboolean _tmp96_; + const gchar* _tmp97_; + MediaSource* _tmp98_; + gchar* _tmp99_; + gchar* _tmp100_; + gchar* _tmp101_; + gchar* _tmp102_; + gchar* _tmp103_; + gchar* _tmp104_; + gboolean _tmp105_; #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp96_ = ret; #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3064,38 +3037,38 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _g_free0 (_tmp102_); #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp100_); -#line 3067 "SearchBoolean.c" +#line 3040 "SearchBoolean.c" } #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp107_ = self->priv->_context; #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp107_ == SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN) { -#line 3073 "SearchBoolean.c" - gboolean _tmp108_ = FALSE; +#line 3046 "SearchBoolean.c" + gboolean _tmp108_; #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp108_ = ret; #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp106_ = !_tmp108_; -#line 3079 "SearchBoolean.c" +#line 3052 "SearchBoolean.c" } else { - gboolean _tmp109_ = FALSE; + gboolean _tmp109_; #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp109_ = ret; #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp106_ = _tmp109_; -#line 3086 "SearchBoolean.c" +#line 3059 "SearchBoolean.c" } #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp106_; #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3092 "SearchBoolean.c" +#line 3065 "SearchBoolean.c" } const gchar* search_condition_text_get_text (SearchConditionText* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SEARCH_CONDITION_TEXT (self), NULL); #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3104,13 +3077,13 @@ const gchar* search_condition_text_get_text (SearchConditionText* self) { result = _tmp0_; #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3107 "SearchBoolean.c" +#line 3080 "SearchBoolean.c" } static void search_condition_text_set_text (SearchConditionText* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_TEXT (self)); #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3121,13 +3094,13 @@ static void search_condition_text_set_text (SearchConditionText* self, const gch _g_free0 (self->priv->_text); #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_text = _tmp1_; -#line 3124 "SearchBoolean.c" +#line 3097 "SearchBoolean.c" } SearchConditionTextContext search_condition_text_get_context (SearchConditionText* self) { SearchConditionTextContext result; - SearchConditionTextContext _tmp0_ = 0; + SearchConditionTextContext _tmp0_; #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SEARCH_CONDITION_TEXT (self), 0); #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3136,19 +3109,19 @@ SearchConditionTextContext search_condition_text_get_context (SearchConditionTex result = _tmp0_; #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3139 "SearchBoolean.c" +#line 3112 "SearchBoolean.c" } static void search_condition_text_set_context (SearchConditionText* self, SearchConditionTextContext value) { - SearchConditionTextContext _tmp0_ = 0; + SearchConditionTextContext _tmp0_; #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_TEXT (self)); #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = value; #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_context = _tmp0_; -#line 3151 "SearchBoolean.c" +#line 3124 "SearchBoolean.c" } @@ -3160,19 +3133,19 @@ static void search_condition_text_class_init (SearchConditionTextClass * klass) #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_class_add_private (klass, sizeof (SearchConditionTextPrivate)); #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_text_real_predicate; -#line 3164 "SearchBoolean.c" + ((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_text_real_predicate; +#line 3137 "SearchBoolean.c" } static void search_condition_text_instance_init (SearchConditionText * self) { #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SEARCH_CONDITION_TEXT_GET_PRIVATE (self); -#line 3171 "SearchBoolean.c" +#line 3144 "SearchBoolean.c" } -static void search_condition_text_finalize (SearchCondition* obj) { +static void search_condition_text_finalize (SearchCondition * obj) { SearchConditionText * self; #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_TEXT, SearchConditionText); @@ -3180,7 +3153,7 @@ static void search_condition_text_finalize (SearchCondition* obj) { _g_free0 (self->priv->_text); #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" SEARCH_CONDITION_CLASS (search_condition_text_parent_class)->finalize (obj); -#line 3183 "SearchBoolean.c" +#line 3156 "SearchBoolean.c" } @@ -3202,36 +3175,36 @@ gchar* search_condition_media_type_context_to_string (SearchConditionMediaTypeCo switch (self) { #line 360 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS: -#line 3205 "SearchBoolean.c" +#line 3178 "SearchBoolean.c" { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 362 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = g_strdup ("IS"); #line 362 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp0_; #line 362 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3214 "SearchBoolean.c" +#line 3187 "SearchBoolean.c" } #line 360 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT: -#line 3218 "SearchBoolean.c" +#line 3191 "SearchBoolean.c" { - gchar* _tmp1_ = NULL; + gchar* _tmp1_; #line 365 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = g_strdup ("IS_NOT"); #line 365 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp1_; #line 365 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3227 "SearchBoolean.c" +#line 3200 "SearchBoolean.c" } default: { #line 368 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:368: unrecognized media search context enumeration " \ "value"); -#line 3233 "SearchBoolean.c" +#line 3206 "SearchBoolean.c" } } } @@ -3239,7 +3212,7 @@ gchar* search_condition_media_type_context_to_string (SearchConditionMediaTypeCo SearchConditionMediaTypeContext search_condition_media_type_context_from_string (const gchar* str) { SearchConditionMediaTypeContext result = 0; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 372 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (str != NULL, 0); #line 373 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3250,9 +3223,9 @@ SearchConditionMediaTypeContext search_condition_media_type_context_from_string result = SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS; #line 374 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3252 "SearchBoolean.c" +#line 3225 "SearchBoolean.c" } else { - const gchar* _tmp1_ = NULL; + const gchar* _tmp1_; #line 376 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = str; #line 376 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3261,14 +3234,14 @@ SearchConditionMediaTypeContext search_condition_media_type_context_from_string result = SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT; #line 377 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3263 "SearchBoolean.c" +#line 3236 "SearchBoolean.c" } else { - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 380 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = str; #line 380 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:380: unrecognized media search context name: %s", _tmp2_); -#line 3270 "SearchBoolean.c" +#line 3243 "SearchBoolean.c" } } } @@ -3292,49 +3265,49 @@ gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTyp switch (self) { #line 390 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_ALL: -#line 3294 "SearchBoolean.c" +#line 3267 "SearchBoolean.c" { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 392 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = g_strdup ("PHOTO_ALL"); #line 392 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp0_; #line 392 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3303 "SearchBoolean.c" +#line 3276 "SearchBoolean.c" } #line 390 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW: -#line 3307 "SearchBoolean.c" +#line 3280 "SearchBoolean.c" { - gchar* _tmp1_ = NULL; + gchar* _tmp1_; #line 395 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = g_strdup ("PHOTO_RAW"); #line 395 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp1_; #line 395 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3316 "SearchBoolean.c" +#line 3289 "SearchBoolean.c" } #line 390 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO: -#line 3320 "SearchBoolean.c" +#line 3293 "SearchBoolean.c" { - gchar* _tmp2_ = NULL; + gchar* _tmp2_; #line 398 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = g_strdup ("VIDEO"); #line 398 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp2_; #line 398 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3329 "SearchBoolean.c" +#line 3302 "SearchBoolean.c" } default: { #line 401 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:401: unrecognized media search type enumeration val" \ "ue"); -#line 3335 "SearchBoolean.c" +#line 3308 "SearchBoolean.c" } } } @@ -3342,7 +3315,7 @@ gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTyp SearchConditionMediaTypeMediaType search_condition_media_type_media_type_from_string (const gchar* str) { SearchConditionMediaTypeMediaType result = 0; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 405 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (str != NULL, 0); #line 406 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3353,9 +3326,9 @@ SearchConditionMediaTypeMediaType search_condition_media_type_media_type_from_st result = SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_ALL; #line 407 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3354 "SearchBoolean.c" +#line 3327 "SearchBoolean.c" } else { - const gchar* _tmp1_ = NULL; + const gchar* _tmp1_; #line 409 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = str; #line 409 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3364,9 +3337,9 @@ SearchConditionMediaTypeMediaType search_condition_media_type_media_type_from_st result = SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW; #line 410 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3365 "SearchBoolean.c" +#line 3338 "SearchBoolean.c" } else { - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 412 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = str; #line 412 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3375,14 +3348,14 @@ SearchConditionMediaTypeMediaType search_condition_media_type_media_type_from_st result = SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO; #line 413 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3376 "SearchBoolean.c" +#line 3349 "SearchBoolean.c" } else { - const gchar* _tmp3_ = NULL; + const gchar* _tmp3_; #line 416 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = str; #line 416 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:416: unrecognized media search type name: %s", _tmp3_); -#line 3383 "SearchBoolean.c" +#line 3356 "SearchBoolean.c" } } } @@ -3403,9 +3376,9 @@ GType search_condition_media_type_media_type_get_type (void) { SearchConditionMediaType* search_condition_media_type_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type) { SearchConditionMediaType* self = NULL; - SearchConditionSearchType _tmp0_ = 0; - SearchConditionMediaTypeContext _tmp1_ = 0; - SearchConditionMediaTypeMediaType _tmp2_ = 0; + SearchConditionSearchType _tmp0_; + SearchConditionMediaTypeContext _tmp1_; + SearchConditionMediaTypeMediaType _tmp2_; #line 426 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = (SearchConditionMediaType*) search_condition_construct (object_type); #line 427 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3422,21 +3395,21 @@ SearchConditionMediaType* search_condition_media_type_construct (GType object_ty search_condition_media_type_set_media_type (self, _tmp2_); #line 426 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 3423 "SearchBoolean.c" +#line 3396 "SearchBoolean.c" } SearchConditionMediaType* search_condition_media_type_new (SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type) { #line 426 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return search_condition_media_type_construct (TYPE_SEARCH_CONDITION_MEDIA_TYPE, search_type, context, media_type); -#line 3430 "SearchBoolean.c" +#line 3403 "SearchBoolean.c" } static gboolean search_condition_media_type_real_predicate (SearchCondition* base, MediaSource* source) { SearchConditionMediaType * self; gboolean result = FALSE; - SearchConditionMediaTypeMediaType _tmp0_ = 0; + SearchConditionMediaTypeMediaType _tmp0_; #line 433 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEARCH_CONDITION_MEDIA_TYPE, SearchConditionMediaType); #line 433 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3447,107 +3420,107 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas switch (_tmp0_) { #line 436 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_ALL: -#line 3448 "SearchBoolean.c" +#line 3421 "SearchBoolean.c" { - MediaSource* _tmp1_ = NULL; + MediaSource* _tmp1_; #line 438 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = source; #line 438 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_PHOTO)) { -#line 3455 "SearchBoolean.c" - SearchConditionMediaTypeContext _tmp2_ = 0; +#line 3428 "SearchBoolean.c" + SearchConditionMediaTypeContext _tmp2_; #line 439 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = self->priv->_context; #line 439 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp2_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS; #line 439 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3463 "SearchBoolean.c" +#line 3436 "SearchBoolean.c" } else { - SearchConditionMediaTypeContext _tmp3_ = 0; + SearchConditionMediaTypeContext _tmp3_; #line 441 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = self->priv->_context; #line 441 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp3_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT; #line 441 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3472 "SearchBoolean.c" +#line 3445 "SearchBoolean.c" } } #line 436 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW: -#line 3477 "SearchBoolean.c" +#line 3450 "SearchBoolean.c" { gboolean _tmp4_ = FALSE; - MediaSource* _tmp5_ = NULL; + MediaSource* _tmp5_; #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp5_ = source; #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_PHOTO)) { -#line 3485 "SearchBoolean.c" - MediaSource* _tmp6_ = NULL; - PhotoFileFormat _tmp7_ = 0; +#line 3458 "SearchBoolean.c" + MediaSource* _tmp6_; + PhotoFileFormat _tmp7_; #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp6_ = source; #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp7_ = photo_get_master_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo)); #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = _tmp7_ == PHOTO_FILE_FORMAT_RAW; -#line 3494 "SearchBoolean.c" +#line 3467 "SearchBoolean.c" } else { #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = FALSE; -#line 3498 "SearchBoolean.c" +#line 3471 "SearchBoolean.c" } #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp4_) { -#line 3502 "SearchBoolean.c" - SearchConditionMediaTypeContext _tmp8_ = 0; +#line 3475 "SearchBoolean.c" + SearchConditionMediaTypeContext _tmp8_; #line 445 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp8_ = self->priv->_context; #line 445 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp8_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS; #line 445 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3510 "SearchBoolean.c" +#line 3483 "SearchBoolean.c" } else { - SearchConditionMediaTypeContext _tmp9_ = 0; + SearchConditionMediaTypeContext _tmp9_; #line 447 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp9_ = self->priv->_context; #line 447 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp9_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT; #line 447 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3519 "SearchBoolean.c" +#line 3492 "SearchBoolean.c" } } #line 436 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO: -#line 3524 "SearchBoolean.c" +#line 3497 "SearchBoolean.c" { - MediaSource* _tmp10_ = NULL; + MediaSource* _tmp10_; #line 450 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp10_ = source; #line 450 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_VIDEO_SOURCE)) { -#line 3531 "SearchBoolean.c" - SearchConditionMediaTypeContext _tmp11_ = 0; +#line 3504 "SearchBoolean.c" + SearchConditionMediaTypeContext _tmp11_; #line 451 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp11_ = self->priv->_context; #line 451 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp11_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS; #line 451 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3539 "SearchBoolean.c" +#line 3512 "SearchBoolean.c" } else { - SearchConditionMediaTypeContext _tmp12_ = 0; + SearchConditionMediaTypeContext _tmp12_; #line 453 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp12_ = self->priv->_context; #line 453 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp12_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT; #line 453 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3548 "SearchBoolean.c" +#line 3521 "SearchBoolean.c" } } default: @@ -3555,7 +3528,7 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas #line 456 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:456: unrecognized media search type enumeration val" \ "ue"); -#line 3555 "SearchBoolean.c" +#line 3528 "SearchBoolean.c" } } } @@ -3563,7 +3536,7 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas SearchConditionMediaTypeMediaType search_condition_media_type_get_media_type (SearchConditionMediaType* self) { SearchConditionMediaTypeMediaType result; - SearchConditionMediaTypeMediaType _tmp0_ = 0; + SearchConditionMediaTypeMediaType _tmp0_; #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SEARCH_CONDITION_MEDIA_TYPE (self), 0); #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3572,25 +3545,25 @@ SearchConditionMediaTypeMediaType search_condition_media_type_get_media_type (Se result = _tmp0_; #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3572 "SearchBoolean.c" +#line 3545 "SearchBoolean.c" } static void search_condition_media_type_set_media_type (SearchConditionMediaType* self, SearchConditionMediaTypeMediaType value) { - SearchConditionMediaTypeMediaType _tmp0_ = 0; + SearchConditionMediaTypeMediaType _tmp0_; #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_MEDIA_TYPE (self)); #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = value; #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_media_type = _tmp0_; -#line 3584 "SearchBoolean.c" +#line 3557 "SearchBoolean.c" } SearchConditionMediaTypeContext search_condition_media_type_get_context (SearchConditionMediaType* self) { SearchConditionMediaTypeContext result; - SearchConditionMediaTypeContext _tmp0_ = 0; + SearchConditionMediaTypeContext _tmp0_; #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SEARCH_CONDITION_MEDIA_TYPE (self), 0); #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3599,19 +3572,19 @@ SearchConditionMediaTypeContext search_condition_media_type_get_context (SearchC result = _tmp0_; #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3599 "SearchBoolean.c" +#line 3572 "SearchBoolean.c" } static void search_condition_media_type_set_context (SearchConditionMediaType* self, SearchConditionMediaTypeContext value) { - SearchConditionMediaTypeContext _tmp0_ = 0; + SearchConditionMediaTypeContext _tmp0_; #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_MEDIA_TYPE (self)); #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = value; #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_context = _tmp0_; -#line 3611 "SearchBoolean.c" +#line 3584 "SearchBoolean.c" } @@ -3623,25 +3596,25 @@ static void search_condition_media_type_class_init (SearchConditionMediaTypeClas #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_class_add_private (klass, sizeof (SearchConditionMediaTypePrivate)); #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_media_type_real_predicate; -#line 3624 "SearchBoolean.c" + ((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_media_type_real_predicate; +#line 3597 "SearchBoolean.c" } static void search_condition_media_type_instance_init (SearchConditionMediaType * self) { #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SEARCH_CONDITION_MEDIA_TYPE_GET_PRIVATE (self); -#line 3631 "SearchBoolean.c" +#line 3604 "SearchBoolean.c" } -static void search_condition_media_type_finalize (SearchCondition* obj) { +static void search_condition_media_type_finalize (SearchCondition * obj) { SearchConditionMediaType * self; #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_MEDIA_TYPE, SearchConditionMediaType); #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" SEARCH_CONDITION_CLASS (search_condition_media_type_parent_class)->finalize (obj); -#line 3641 "SearchBoolean.c" +#line 3614 "SearchBoolean.c" } @@ -3663,36 +3636,36 @@ gchar* search_condition_flagged_state_to_string (SearchConditionFlaggedState sel switch (self) { #line 468 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_FLAGGED_STATE_FLAGGED: -#line 3663 "SearchBoolean.c" +#line 3636 "SearchBoolean.c" { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 470 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = g_strdup ("FLAGGED"); #line 470 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp0_; #line 470 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3672 "SearchBoolean.c" +#line 3645 "SearchBoolean.c" } #line 468 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED: -#line 3676 "SearchBoolean.c" +#line 3649 "SearchBoolean.c" { - gchar* _tmp1_ = NULL; + gchar* _tmp1_; #line 473 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = g_strdup ("UNFLAGGED"); #line 473 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp1_; #line 473 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3685 "SearchBoolean.c" +#line 3658 "SearchBoolean.c" } default: { #line 476 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:476: unrecognized flagged search state enumeration " \ "value"); -#line 3691 "SearchBoolean.c" +#line 3664 "SearchBoolean.c" } } } @@ -3700,7 +3673,7 @@ gchar* search_condition_flagged_state_to_string (SearchConditionFlaggedState sel SearchConditionFlaggedState search_condition_flagged_state_from_string (const gchar* str) { SearchConditionFlaggedState result = 0; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 480 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (str != NULL, 0); #line 481 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3711,9 +3684,9 @@ SearchConditionFlaggedState search_condition_flagged_state_from_string (const gc result = SEARCH_CONDITION_FLAGGED_STATE_FLAGGED; #line 482 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3710 "SearchBoolean.c" +#line 3683 "SearchBoolean.c" } else { - const gchar* _tmp1_ = NULL; + const gchar* _tmp1_; #line 484 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = str; #line 484 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3722,14 +3695,14 @@ SearchConditionFlaggedState search_condition_flagged_state_from_string (const gc result = SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED; #line 485 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3721 "SearchBoolean.c" +#line 3694 "SearchBoolean.c" } else { - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 488 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = str; #line 488 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:488: unrecognized flagged search state name: %s", _tmp2_); -#line 3728 "SearchBoolean.c" +#line 3701 "SearchBoolean.c" } } } @@ -3749,8 +3722,8 @@ GType search_condition_flagged_state_get_type (void) { SearchConditionFlagged* search_condition_flagged_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionFlaggedState state) { SearchConditionFlagged* self = NULL; - SearchConditionSearchType _tmp0_ = 0; - SearchConditionFlaggedState _tmp1_ = 0; + SearchConditionSearchType _tmp0_; + SearchConditionFlaggedState _tmp1_; #line 495 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = (SearchConditionFlagged*) search_condition_construct (object_type); #line 496 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3763,21 +3736,21 @@ SearchConditionFlagged* search_condition_flagged_construct (GType object_type, S search_condition_flagged_set_state (self, _tmp1_); #line 495 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 3762 "SearchBoolean.c" +#line 3735 "SearchBoolean.c" } SearchConditionFlagged* search_condition_flagged_new (SearchConditionSearchType search_type, SearchConditionFlaggedState state) { #line 495 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return search_condition_flagged_construct (TYPE_SEARCH_CONDITION_FLAGGED, search_type, state); -#line 3769 "SearchBoolean.c" +#line 3742 "SearchBoolean.c" } static gboolean search_condition_flagged_real_predicate (SearchCondition* base, MediaSource* source) { SearchConditionFlagged * self; gboolean result = FALSE; - SearchConditionFlaggedState _tmp0_ = 0; + SearchConditionFlaggedState _tmp0_; #line 501 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEARCH_CONDITION_FLAGGED, SearchConditionFlagged); #line 501 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3786,9 +3759,9 @@ static gboolean search_condition_flagged_real_predicate (SearchCondition* base, _tmp0_ = self->priv->_state; #line 502 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp0_ == SEARCH_CONDITION_FLAGGED_STATE_FLAGGED) { -#line 3785 "SearchBoolean.c" - MediaSource* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; +#line 3758 "SearchBoolean.c" + MediaSource* _tmp1_; + gboolean _tmp2_; #line 503 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = source; #line 503 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3797,16 +3770,16 @@ static gboolean search_condition_flagged_real_predicate (SearchCondition* base, result = _tmp2_; #line 503 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3796 "SearchBoolean.c" +#line 3769 "SearchBoolean.c" } else { - SearchConditionFlaggedState _tmp3_ = 0; + SearchConditionFlaggedState _tmp3_; #line 504 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = self->priv->_state; #line 504 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp3_ == SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED) { -#line 3803 "SearchBoolean.c" - MediaSource* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; +#line 3776 "SearchBoolean.c" + MediaSource* _tmp4_; + gboolean _tmp5_; #line 505 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = source; #line 505 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3815,11 +3788,11 @@ static gboolean search_condition_flagged_real_predicate (SearchCondition* base, result = !_tmp5_; #line 505 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3814 "SearchBoolean.c" +#line 3787 "SearchBoolean.c" } else { #line 507 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:507: unrecognized flagged search state"); -#line 3818 "SearchBoolean.c" +#line 3791 "SearchBoolean.c" } } } @@ -3827,7 +3800,7 @@ static gboolean search_condition_flagged_real_predicate (SearchCondition* base, SearchConditionFlaggedState search_condition_flagged_get_state (SearchConditionFlagged* self) { SearchConditionFlaggedState result; - SearchConditionFlaggedState _tmp0_ = 0; + SearchConditionFlaggedState _tmp0_; #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SEARCH_CONDITION_FLAGGED (self), 0); #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3836,19 +3809,19 @@ SearchConditionFlaggedState search_condition_flagged_get_state (SearchConditionF result = _tmp0_; #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3835 "SearchBoolean.c" +#line 3808 "SearchBoolean.c" } static void search_condition_flagged_set_state (SearchConditionFlagged* self, SearchConditionFlaggedState value) { - SearchConditionFlaggedState _tmp0_ = 0; + SearchConditionFlaggedState _tmp0_; #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_FLAGGED (self)); #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = value; #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_state = _tmp0_; -#line 3847 "SearchBoolean.c" +#line 3820 "SearchBoolean.c" } @@ -3860,25 +3833,25 @@ static void search_condition_flagged_class_init (SearchConditionFlaggedClass * k #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_class_add_private (klass, sizeof (SearchConditionFlaggedPrivate)); #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_flagged_real_predicate; -#line 3860 "SearchBoolean.c" + ((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_flagged_real_predicate; +#line 3833 "SearchBoolean.c" } static void search_condition_flagged_instance_init (SearchConditionFlagged * self) { #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SEARCH_CONDITION_FLAGGED_GET_PRIVATE (self); -#line 3867 "SearchBoolean.c" +#line 3840 "SearchBoolean.c" } -static void search_condition_flagged_finalize (SearchCondition* obj) { +static void search_condition_flagged_finalize (SearchCondition * obj) { SearchConditionFlagged * self; #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_FLAGGED, SearchConditionFlagged); #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" SEARCH_CONDITION_CLASS (search_condition_flagged_parent_class)->finalize (obj); -#line 3877 "SearchBoolean.c" +#line 3850 "SearchBoolean.c" } @@ -3900,36 +3873,36 @@ gchar* search_condition_modified_context_to_string (SearchConditionModifiedConte switch (self) { #line 520 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MODIFIED_CONTEXT_HAS: -#line 3899 "SearchBoolean.c" +#line 3872 "SearchBoolean.c" { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 522 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = g_strdup ("HAS"); #line 522 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp0_; #line 522 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3908 "SearchBoolean.c" +#line 3881 "SearchBoolean.c" } #line 520 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MODIFIED_CONTEXT_HAS_NO: -#line 3912 "SearchBoolean.c" +#line 3885 "SearchBoolean.c" { - gchar* _tmp1_ = NULL; + gchar* _tmp1_; #line 525 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = g_strdup ("HAS_NO"); #line 525 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp1_; #line 525 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3921 "SearchBoolean.c" +#line 3894 "SearchBoolean.c" } default: { #line 528 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:528: unrecognized modified search context enumerati" \ "on value"); -#line 3927 "SearchBoolean.c" +#line 3900 "SearchBoolean.c" } } } @@ -3937,7 +3910,7 @@ gchar* search_condition_modified_context_to_string (SearchConditionModifiedConte SearchConditionModifiedContext search_condition_modified_context_from_string (const gchar* str) { SearchConditionModifiedContext result = 0; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 532 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (str != NULL, 0); #line 533 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3948,9 +3921,9 @@ SearchConditionModifiedContext search_condition_modified_context_from_string (co result = SEARCH_CONDITION_MODIFIED_CONTEXT_HAS; #line 534 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3946 "SearchBoolean.c" +#line 3919 "SearchBoolean.c" } else { - const gchar* _tmp1_ = NULL; + const gchar* _tmp1_; #line 536 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = str; #line 536 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3959,14 +3932,14 @@ SearchConditionModifiedContext search_condition_modified_context_from_string (co result = SEARCH_CONDITION_MODIFIED_CONTEXT_HAS_NO; #line 537 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3957 "SearchBoolean.c" +#line 3930 "SearchBoolean.c" } else { - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 540 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = str; #line 540 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:540: unrecognized modified search context name: %s", _tmp2_); -#line 3964 "SearchBoolean.c" +#line 3937 "SearchBoolean.c" } } } @@ -3990,49 +3963,49 @@ gchar* search_condition_modified_state_to_string (SearchConditionModifiedState s switch (self) { #line 550 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MODIFIED_STATE_MODIFIED: -#line 3988 "SearchBoolean.c" +#line 3961 "SearchBoolean.c" { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 552 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = g_strdup ("MODIFIED"); #line 552 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp0_; #line 552 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3997 "SearchBoolean.c" +#line 3970 "SearchBoolean.c" } #line 550 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MODIFIED_STATE_INTERNAL_CHANGES: -#line 4001 "SearchBoolean.c" +#line 3974 "SearchBoolean.c" { - gchar* _tmp1_ = NULL; + gchar* _tmp1_; #line 555 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = g_strdup ("INTERNAL_CHANGES"); #line 555 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp1_; #line 555 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4010 "SearchBoolean.c" +#line 3983 "SearchBoolean.c" } #line 550 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MODIFIED_STATE_EXTERNAL_CHANGES: -#line 4014 "SearchBoolean.c" +#line 3987 "SearchBoolean.c" { - gchar* _tmp2_ = NULL; + gchar* _tmp2_; #line 558 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = g_strdup ("EXTERNAL_CHANGES"); #line 558 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp2_; #line 558 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4023 "SearchBoolean.c" +#line 3996 "SearchBoolean.c" } default: { #line 561 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:561: unrecognized modified search state enumeration" \ " value"); -#line 4029 "SearchBoolean.c" +#line 4002 "SearchBoolean.c" } } } @@ -4040,7 +4013,7 @@ gchar* search_condition_modified_state_to_string (SearchConditionModifiedState s SearchConditionModifiedState search_condition_modified_state_from_string (const gchar* str) { SearchConditionModifiedState result = 0; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 565 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (str != NULL, 0); #line 566 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4051,9 +4024,9 @@ SearchConditionModifiedState search_condition_modified_state_from_string (const result = SEARCH_CONDITION_MODIFIED_STATE_MODIFIED; #line 567 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4048 "SearchBoolean.c" +#line 4021 "SearchBoolean.c" } else { - const gchar* _tmp1_ = NULL; + const gchar* _tmp1_; #line 569 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = str; #line 569 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4062,9 +4035,9 @@ SearchConditionModifiedState search_condition_modified_state_from_string (const result = SEARCH_CONDITION_MODIFIED_STATE_INTERNAL_CHANGES; #line 570 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4059 "SearchBoolean.c" +#line 4032 "SearchBoolean.c" } else { - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 572 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = str; #line 572 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4073,14 +4046,14 @@ SearchConditionModifiedState search_condition_modified_state_from_string (const result = SEARCH_CONDITION_MODIFIED_STATE_EXTERNAL_CHANGES; #line 573 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4070 "SearchBoolean.c" +#line 4043 "SearchBoolean.c" } else { - const gchar* _tmp3_ = NULL; + const gchar* _tmp3_; #line 576 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = str; #line 576 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:576: unrecognized modified search state name: %s", _tmp3_); -#line 4077 "SearchBoolean.c" +#line 4050 "SearchBoolean.c" } } } @@ -4101,9 +4074,9 @@ GType search_condition_modified_state_get_type (void) { SearchConditionModified* search_condition_modified_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state) { SearchConditionModified* self = NULL; - SearchConditionSearchType _tmp0_ = 0; - SearchConditionModifiedContext _tmp1_ = 0; - SearchConditionModifiedState _tmp2_ = 0; + SearchConditionSearchType _tmp0_; + SearchConditionModifiedContext _tmp1_; + SearchConditionModifiedState _tmp2_; #line 586 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = (SearchConditionModified*) search_condition_construct (object_type); #line 587 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4120,14 +4093,14 @@ SearchConditionModified* search_condition_modified_construct (GType object_type, search_condition_modified_set_state (self, _tmp2_); #line 586 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 4117 "SearchBoolean.c" +#line 4090 "SearchBoolean.c" } SearchConditionModified* search_condition_modified_new (SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state) { #line 586 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return search_condition_modified_construct (TYPE_SEARCH_CONDITION_MODIFIED, search_type, context, state); -#line 4124 "SearchBoolean.c" +#line 4097 "SearchBoolean.c" } @@ -4135,12 +4108,12 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base, SearchConditionModified * self; gboolean result = FALSE; Photo* photo = NULL; - MediaSource* _tmp0_ = NULL; - Photo* _tmp1_ = NULL; - Photo* _tmp2_ = NULL; + MediaSource* _tmp0_; + Photo* _tmp1_; + Photo* _tmp2_; gboolean match = FALSE; - SearchConditionModifiedState _tmp3_ = 0; - gboolean _tmp15_ = FALSE; + SearchConditionModifiedState _tmp3_; + gboolean _tmp15_; #line 593 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEARCH_CONDITION_MODIFIED, SearchConditionModified); #line 593 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4161,16 +4134,16 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base, _g_object_unref0 (photo); #line 597 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4158 "SearchBoolean.c" +#line 4131 "SearchBoolean.c" } #line 600 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = self->priv->_state; #line 600 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp3_ == SEARCH_CONDITION_MODIFIED_STATE_MODIFIED) { -#line 4164 "SearchBoolean.c" +#line 4137 "SearchBoolean.c" gboolean _tmp4_ = FALSE; - Photo* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + Photo* _tmp5_; + gboolean _tmp6_; #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp5_ = photo; #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4179,57 +4152,57 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base, if (_tmp6_) { #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = TRUE; -#line 4176 "SearchBoolean.c" +#line 4149 "SearchBoolean.c" } else { - Photo* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + Photo* _tmp7_; + gboolean _tmp8_; #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp7_ = photo; #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp8_ = photo_has_editable (_tmp7_); #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = _tmp8_; -#line 4186 "SearchBoolean.c" +#line 4159 "SearchBoolean.c" } #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" match = _tmp4_; -#line 4190 "SearchBoolean.c" +#line 4163 "SearchBoolean.c" } else { - SearchConditionModifiedState _tmp9_ = 0; + SearchConditionModifiedState _tmp9_; #line 602 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp9_ = self->priv->_state; #line 602 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp9_ == SEARCH_CONDITION_MODIFIED_STATE_INTERNAL_CHANGES) { -#line 4197 "SearchBoolean.c" - Photo* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; +#line 4170 "SearchBoolean.c" + Photo* _tmp10_; + gboolean _tmp11_; #line 603 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp10_ = photo; #line 603 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp11_ = photo_has_transformations (_tmp10_); #line 603 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" match = _tmp11_; -#line 4206 "SearchBoolean.c" +#line 4179 "SearchBoolean.c" } else { - SearchConditionModifiedState _tmp12_ = 0; + SearchConditionModifiedState _tmp12_; #line 604 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp12_ = self->priv->_state; #line 604 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp12_ == SEARCH_CONDITION_MODIFIED_STATE_EXTERNAL_CHANGES) { -#line 4213 "SearchBoolean.c" - Photo* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; +#line 4186 "SearchBoolean.c" + Photo* _tmp13_; + gboolean _tmp14_; #line 605 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp13_ = photo; #line 605 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp14_ = photo_has_editable (_tmp13_); #line 605 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" match = _tmp14_; -#line 4222 "SearchBoolean.c" +#line 4195 "SearchBoolean.c" } else { #line 607 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:607: unrecognized modified search state"); -#line 4226 "SearchBoolean.c" +#line 4199 "SearchBoolean.c" } } } @@ -4237,8 +4210,8 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base, _tmp15_ = match; #line 609 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp15_) { -#line 4234 "SearchBoolean.c" - SearchConditionModifiedContext _tmp16_ = 0; +#line 4207 "SearchBoolean.c" + SearchConditionModifiedContext _tmp16_; #line 610 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp16_ = self->priv->_context; #line 610 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4247,9 +4220,9 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base, _g_object_unref0 (photo); #line 610 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4244 "SearchBoolean.c" +#line 4217 "SearchBoolean.c" } else { - SearchConditionModifiedContext _tmp17_ = 0; + SearchConditionModifiedContext _tmp17_; #line 612 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp17_ = self->priv->_context; #line 612 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4258,17 +4231,17 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base, _g_object_unref0 (photo); #line 612 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4255 "SearchBoolean.c" +#line 4228 "SearchBoolean.c" } #line 593 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (photo); -#line 4259 "SearchBoolean.c" +#line 4232 "SearchBoolean.c" } SearchConditionModifiedState search_condition_modified_get_state (SearchConditionModified* self) { SearchConditionModifiedState result; - SearchConditionModifiedState _tmp0_ = 0; + SearchConditionModifiedState _tmp0_; #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SEARCH_CONDITION_MODIFIED (self), 0); #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4277,25 +4250,25 @@ SearchConditionModifiedState search_condition_modified_get_state (SearchConditio result = _tmp0_; #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4274 "SearchBoolean.c" +#line 4247 "SearchBoolean.c" } static void search_condition_modified_set_state (SearchConditionModified* self, SearchConditionModifiedState value) { - SearchConditionModifiedState _tmp0_ = 0; + SearchConditionModifiedState _tmp0_; #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_MODIFIED (self)); #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = value; #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_state = _tmp0_; -#line 4286 "SearchBoolean.c" +#line 4259 "SearchBoolean.c" } SearchConditionModifiedContext search_condition_modified_get_context (SearchConditionModified* self) { SearchConditionModifiedContext result; - SearchConditionModifiedContext _tmp0_ = 0; + SearchConditionModifiedContext _tmp0_; #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SEARCH_CONDITION_MODIFIED (self), 0); #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4304,19 +4277,19 @@ SearchConditionModifiedContext search_condition_modified_get_context (SearchCond result = _tmp0_; #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4301 "SearchBoolean.c" +#line 4274 "SearchBoolean.c" } static void search_condition_modified_set_context (SearchConditionModified* self, SearchConditionModifiedContext value) { - SearchConditionModifiedContext _tmp0_ = 0; + SearchConditionModifiedContext _tmp0_; #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_MODIFIED (self)); #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = value; #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_context = _tmp0_; -#line 4313 "SearchBoolean.c" +#line 4286 "SearchBoolean.c" } @@ -4328,25 +4301,25 @@ static void search_condition_modified_class_init (SearchConditionModifiedClass * #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_class_add_private (klass, sizeof (SearchConditionModifiedPrivate)); #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_modified_real_predicate; -#line 4326 "SearchBoolean.c" + ((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_modified_real_predicate; +#line 4299 "SearchBoolean.c" } static void search_condition_modified_instance_init (SearchConditionModified * self) { #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SEARCH_CONDITION_MODIFIED_GET_PRIVATE (self); -#line 4333 "SearchBoolean.c" +#line 4306 "SearchBoolean.c" } -static void search_condition_modified_finalize (SearchCondition* obj) { +static void search_condition_modified_finalize (SearchCondition * obj) { SearchConditionModified * self; #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_MODIFIED, SearchConditionModified); #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" SEARCH_CONDITION_CLASS (search_condition_modified_parent_class)->finalize (obj); -#line 4343 "SearchBoolean.c" +#line 4316 "SearchBoolean.c" } @@ -4368,49 +4341,49 @@ gchar* search_condition_rating_context_to_string (SearchConditionRatingContext s switch (self) { #line 625 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER: -#line 4365 "SearchBoolean.c" +#line 4338 "SearchBoolean.c" { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 627 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = g_strdup ("AND_HIGHER"); #line 627 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp0_; #line 627 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4374 "SearchBoolean.c" +#line 4347 "SearchBoolean.c" } #line 625 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_RATING_CONTEXT_ONLY: -#line 4378 "SearchBoolean.c" +#line 4351 "SearchBoolean.c" { - gchar* _tmp1_ = NULL; + gchar* _tmp1_; #line 630 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = g_strdup ("ONLY"); #line 630 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp1_; #line 630 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4387 "SearchBoolean.c" +#line 4360 "SearchBoolean.c" } #line 625 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER: -#line 4391 "SearchBoolean.c" +#line 4364 "SearchBoolean.c" { - gchar* _tmp2_ = NULL; + gchar* _tmp2_; #line 633 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = g_strdup ("AND_LOWER"); #line 633 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp2_; #line 633 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4400 "SearchBoolean.c" +#line 4373 "SearchBoolean.c" } default: { #line 636 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:636: unrecognized rating search context enumeration" \ " value"); -#line 4406 "SearchBoolean.c" +#line 4379 "SearchBoolean.c" } } } @@ -4418,7 +4391,7 @@ gchar* search_condition_rating_context_to_string (SearchConditionRatingContext s SearchConditionRatingContext search_condition_rating_context_from_string (const gchar* str) { SearchConditionRatingContext result = 0; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 640 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (str != NULL, 0); #line 641 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4429,9 +4402,9 @@ SearchConditionRatingContext search_condition_rating_context_from_string (const result = SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER; #line 642 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4425 "SearchBoolean.c" +#line 4398 "SearchBoolean.c" } else { - const gchar* _tmp1_ = NULL; + const gchar* _tmp1_; #line 644 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = str; #line 644 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4440,9 +4413,9 @@ SearchConditionRatingContext search_condition_rating_context_from_string (const result = SEARCH_CONDITION_RATING_CONTEXT_ONLY; #line 645 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4436 "SearchBoolean.c" +#line 4409 "SearchBoolean.c" } else { - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 647 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = str; #line 647 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4451,14 +4424,14 @@ SearchConditionRatingContext search_condition_rating_context_from_string (const result = SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER; #line 648 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4447 "SearchBoolean.c" +#line 4420 "SearchBoolean.c" } else { - const gchar* _tmp3_ = NULL; + const gchar* _tmp3_; #line 651 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = str; #line 651 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:651: unrecognized rating search context name: %s", _tmp3_); -#line 4454 "SearchBoolean.c" +#line 4427 "SearchBoolean.c" } } } @@ -4479,9 +4452,9 @@ GType search_condition_rating_context_get_type (void) { SearchConditionRating* search_condition_rating_construct (GType object_type, SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context) { SearchConditionRating* self = NULL; - SearchConditionSearchType _tmp0_ = 0; - Rating _tmp1_ = 0; - SearchConditionRatingContext _tmp2_ = 0; + SearchConditionSearchType _tmp0_; + Rating _tmp1_; + SearchConditionRatingContext _tmp2_; #line 661 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = (SearchConditionRating*) search_condition_construct (object_type); #line 662 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4498,14 +4471,14 @@ SearchConditionRating* search_condition_rating_construct (GType object_type, Sea search_condition_rating_set_context (self, _tmp2_); #line 661 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 4494 "SearchBoolean.c" +#line 4467 "SearchBoolean.c" } SearchConditionRating* search_condition_rating_new (SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context) { #line 661 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return search_condition_rating_construct (TYPE_SEARCH_CONDITION_RATING, search_type, rating, context); -#line 4501 "SearchBoolean.c" +#line 4474 "SearchBoolean.c" } @@ -4513,9 +4486,9 @@ static gboolean search_condition_rating_real_predicate (SearchCondition* base, M SearchConditionRating * self; gboolean result = FALSE; Rating source_rating = 0; - MediaSource* _tmp0_ = NULL; - Rating _tmp1_ = 0; - SearchConditionRatingContext _tmp2_ = 0; + MediaSource* _tmp0_; + Rating _tmp1_; + SearchConditionRatingContext _tmp2_; #line 668 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEARCH_CONDITION_RATING, SearchConditionRating); #line 668 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4530,9 +4503,9 @@ static gboolean search_condition_rating_real_predicate (SearchCondition* base, M _tmp2_ = self->priv->_context; #line 670 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp2_ == SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER) { -#line 4526 "SearchBoolean.c" - Rating _tmp3_ = 0; - Rating _tmp4_ = 0; +#line 4499 "SearchBoolean.c" + Rating _tmp3_; + Rating _tmp4_; #line 671 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = source_rating; #line 671 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4541,16 +4514,16 @@ static gboolean search_condition_rating_real_predicate (SearchCondition* base, M result = _tmp3_ >= _tmp4_; #line 671 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4537 "SearchBoolean.c" +#line 4510 "SearchBoolean.c" } else { - SearchConditionRatingContext _tmp5_ = 0; + SearchConditionRatingContext _tmp5_; #line 672 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp5_ = self->priv->_context; #line 672 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp5_ == SEARCH_CONDITION_RATING_CONTEXT_ONLY) { -#line 4544 "SearchBoolean.c" - Rating _tmp6_ = 0; - Rating _tmp7_ = 0; +#line 4517 "SearchBoolean.c" + Rating _tmp6_; + Rating _tmp7_; #line 673 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp6_ = source_rating; #line 673 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4559,16 +4532,16 @@ static gboolean search_condition_rating_real_predicate (SearchCondition* base, M result = _tmp6_ == _tmp7_; #line 673 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4555 "SearchBoolean.c" +#line 4528 "SearchBoolean.c" } else { - SearchConditionRatingContext _tmp8_ = 0; + SearchConditionRatingContext _tmp8_; #line 674 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp8_ = self->priv->_context; #line 674 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp8_ == SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER) { -#line 4562 "SearchBoolean.c" - Rating _tmp9_ = 0; - Rating _tmp10_ = 0; +#line 4535 "SearchBoolean.c" + Rating _tmp9_; + Rating _tmp10_; #line 675 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp9_ = source_rating; #line 675 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4577,11 +4550,11 @@ static gboolean search_condition_rating_real_predicate (SearchCondition* base, M result = _tmp9_ <= _tmp10_; #line 675 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4573 "SearchBoolean.c" +#line 4546 "SearchBoolean.c" } else { #line 677 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:677: unknown rating search context"); -#line 4577 "SearchBoolean.c" +#line 4550 "SearchBoolean.c" } } } @@ -4590,7 +4563,7 @@ static gboolean search_condition_rating_real_predicate (SearchCondition* base, M Rating search_condition_rating_get_rating (SearchConditionRating* self) { Rating result; - Rating _tmp0_ = 0; + Rating _tmp0_; #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SEARCH_CONDITION_RATING (self), 0); #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4599,25 +4572,25 @@ Rating search_condition_rating_get_rating (SearchConditionRating* self) { result = _tmp0_; #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4595 "SearchBoolean.c" +#line 4568 "SearchBoolean.c" } static void search_condition_rating_set_rating (SearchConditionRating* self, Rating value) { - Rating _tmp0_ = 0; + Rating _tmp0_; #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_RATING (self)); #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = value; #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_rating = _tmp0_; -#line 4607 "SearchBoolean.c" +#line 4580 "SearchBoolean.c" } SearchConditionRatingContext search_condition_rating_get_context (SearchConditionRating* self) { SearchConditionRatingContext result; - SearchConditionRatingContext _tmp0_ = 0; + SearchConditionRatingContext _tmp0_; #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SEARCH_CONDITION_RATING (self), 0); #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4626,19 +4599,19 @@ SearchConditionRatingContext search_condition_rating_get_context (SearchConditio result = _tmp0_; #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4622 "SearchBoolean.c" +#line 4595 "SearchBoolean.c" } static void search_condition_rating_set_context (SearchConditionRating* self, SearchConditionRatingContext value) { - SearchConditionRatingContext _tmp0_ = 0; + SearchConditionRatingContext _tmp0_; #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_RATING (self)); #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = value; #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_context = _tmp0_; -#line 4634 "SearchBoolean.c" +#line 4607 "SearchBoolean.c" } @@ -4650,25 +4623,25 @@ static void search_condition_rating_class_init (SearchConditionRatingClass * kla #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_class_add_private (klass, sizeof (SearchConditionRatingPrivate)); #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_rating_real_predicate; -#line 4647 "SearchBoolean.c" + ((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_rating_real_predicate; +#line 4620 "SearchBoolean.c" } static void search_condition_rating_instance_init (SearchConditionRating * self) { #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SEARCH_CONDITION_RATING_GET_PRIVATE (self); -#line 4654 "SearchBoolean.c" +#line 4627 "SearchBoolean.c" } -static void search_condition_rating_finalize (SearchCondition* obj) { +static void search_condition_rating_finalize (SearchCondition * obj) { SearchConditionRating * self; #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_RATING, SearchConditionRating); #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" SEARCH_CONDITION_CLASS (search_condition_rating_parent_class)->finalize (obj); -#line 4664 "SearchBoolean.c" +#line 4637 "SearchBoolean.c" } @@ -4690,75 +4663,75 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self) switch (self) { #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_EXACT: -#line 4686 "SearchBoolean.c" +#line 4659 "SearchBoolean.c" { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 694 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = g_strdup ("EXACT"); #line 694 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp0_; #line 694 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4695 "SearchBoolean.c" +#line 4668 "SearchBoolean.c" } #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_AFTER: -#line 4699 "SearchBoolean.c" +#line 4672 "SearchBoolean.c" { - gchar* _tmp1_ = NULL; + gchar* _tmp1_; #line 697 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = g_strdup ("AFTER"); #line 697 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp1_; #line 697 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4708 "SearchBoolean.c" +#line 4681 "SearchBoolean.c" } #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_BEFORE: -#line 4712 "SearchBoolean.c" +#line 4685 "SearchBoolean.c" { - gchar* _tmp2_ = NULL; + gchar* _tmp2_; #line 700 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = g_strdup ("BEFORE"); #line 700 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp2_; #line 700 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4721 "SearchBoolean.c" +#line 4694 "SearchBoolean.c" } #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_BETWEEN: -#line 4725 "SearchBoolean.c" +#line 4698 "SearchBoolean.c" { - gchar* _tmp3_ = NULL; + gchar* _tmp3_; #line 703 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = g_strdup ("BETWEEN"); #line 703 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp3_; #line 703 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4734 "SearchBoolean.c" +#line 4707 "SearchBoolean.c" } #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET: -#line 4738 "SearchBoolean.c" +#line 4711 "SearchBoolean.c" { - gchar* _tmp4_ = NULL; + gchar* _tmp4_; #line 706 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = g_strdup ("IS_NOT_SET"); #line 706 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp4_; #line 706 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4747 "SearchBoolean.c" +#line 4720 "SearchBoolean.c" } default: { #line 709 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:709: unrecognized date search context enumeration v" \ "alue"); -#line 4753 "SearchBoolean.c" +#line 4726 "SearchBoolean.c" } } } @@ -4766,8 +4739,8 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self) SearchConditionDateContext search_condition_date_context_from_string (const gchar* str) { SearchConditionDateContext result = 0; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; #line 713 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (str != NULL, 0); #line 714 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4778,7 +4751,7 @@ SearchConditionDateContext search_condition_date_context_from_string (const gcha result = SEARCH_CONDITION_DATE_CONTEXT_EXACT; #line 715 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4773 "SearchBoolean.c" +#line 4746 "SearchBoolean.c" } #line 717 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = str; @@ -4788,9 +4761,9 @@ SearchConditionDateContext search_condition_date_context_from_string (const gcha result = SEARCH_CONDITION_DATE_CONTEXT_AFTER; #line 718 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4783 "SearchBoolean.c" +#line 4756 "SearchBoolean.c" } else { - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 720 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = str; #line 720 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4799,9 +4772,9 @@ SearchConditionDateContext search_condition_date_context_from_string (const gcha result = SEARCH_CONDITION_DATE_CONTEXT_BEFORE; #line 721 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4794 "SearchBoolean.c" +#line 4767 "SearchBoolean.c" } else { - const gchar* _tmp3_ = NULL; + const gchar* _tmp3_; #line 723 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = str; #line 723 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4810,9 +4783,9 @@ SearchConditionDateContext search_condition_date_context_from_string (const gcha result = SEARCH_CONDITION_DATE_CONTEXT_BETWEEN; #line 724 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4805 "SearchBoolean.c" +#line 4778 "SearchBoolean.c" } else { - const gchar* _tmp4_ = NULL; + const gchar* _tmp4_; #line 726 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = str; #line 726 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4821,14 +4794,14 @@ SearchConditionDateContext search_condition_date_context_from_string (const gcha result = SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET; #line 727 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4816 "SearchBoolean.c" +#line 4789 "SearchBoolean.c" } else { - const gchar* _tmp5_ = NULL; + const gchar* _tmp5_; #line 730 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp5_ = str; #line 730 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:730: unrecognized date search context name: %s", _tmp5_); -#line 4823 "SearchBoolean.c" +#line 4796 "SearchBoolean.c" } } } @@ -4850,10 +4823,10 @@ GType search_condition_date_context_get_type (void) { SearchConditionDate* search_condition_date_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two) { SearchConditionDate* self = NULL; - SearchConditionSearchType _tmp0_ = 0; - SearchConditionDateContext _tmp1_ = 0; + SearchConditionSearchType _tmp0_; + SearchConditionDateContext _tmp1_; gboolean _tmp2_ = FALSE; - SearchConditionDateContext _tmp3_ = 0; + SearchConditionDateContext _tmp3_; #line 741 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (date_one != NULL, NULL); #line 741 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4874,11 +4847,11 @@ SearchConditionDate* search_condition_date_construct (GType object_type, SearchC if (_tmp3_ != SEARCH_CONDITION_DATE_CONTEXT_BETWEEN) { #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = TRUE; -#line 4869 "SearchBoolean.c" +#line 4842 "SearchBoolean.c" } else { - GDateTime* _tmp4_ = NULL; - GDateTime* _tmp5_ = NULL; - gint _tmp6_ = 0; + GDateTime* _tmp4_; + GDateTime* _tmp5_; + gint _tmp6_; #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = date_two; #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4887,13 +4860,13 @@ SearchConditionDate* search_condition_date_construct (GType object_type, SearchC _tmp6_ = g_date_time_compare (_tmp4_, _tmp5_); #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = _tmp6_ >= 1; -#line 4882 "SearchBoolean.c" +#line 4855 "SearchBoolean.c" } #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp2_) { -#line 4886 "SearchBoolean.c" - GDateTime* _tmp7_ = NULL; - GDateTime* _tmp8_ = NULL; +#line 4859 "SearchBoolean.c" + GDateTime* _tmp7_; + GDateTime* _tmp8_; #line 746 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp7_ = date_one; #line 746 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4902,10 +4875,10 @@ SearchConditionDate* search_condition_date_construct (GType object_type, SearchC _tmp8_ = date_two; #line 747 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_date_set_date_two (self, _tmp8_); -#line 4897 "SearchBoolean.c" +#line 4870 "SearchBoolean.c" } else { - GDateTime* _tmp9_ = NULL; - GDateTime* _tmp10_ = NULL; + GDateTime* _tmp9_; + GDateTime* _tmp10_; #line 749 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp9_ = date_two; #line 749 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4914,18 +4887,18 @@ SearchConditionDate* search_condition_date_construct (GType object_type, SearchC _tmp10_ = date_one; #line 750 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_date_set_date_two (self, _tmp10_); -#line 4909 "SearchBoolean.c" +#line 4882 "SearchBoolean.c" } #line 741 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 4913 "SearchBoolean.c" +#line 4886 "SearchBoolean.c" } SearchConditionDate* search_condition_date_new (SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two) { #line 741 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return search_condition_date_construct (TYPE_SEARCH_CONDITION_DATE, search_type, context, date_one, date_two); -#line 4920 "SearchBoolean.c" +#line 4893 "SearchBoolean.c" } @@ -4933,13 +4906,13 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med SearchConditionDate * self; gboolean result = FALSE; time_t exposure_time = 0; - MediaSource* _tmp0_ = NULL; - time_t _tmp1_ = 0; - time_t _tmp2_ = 0; + MediaSource* _tmp0_; + time_t _tmp1_; + time_t _tmp2_; GDateTime* dt = NULL; - time_t _tmp4_ = 0; - GDateTime* _tmp5_ = NULL; - SearchConditionDateContext _tmp6_ = 0; + time_t _tmp4_; + GDateTime* _tmp5_; + SearchConditionDateContext _tmp6_; #line 756 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEARCH_CONDITION_DATE, SearchConditionDate); #line 756 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4954,15 +4927,15 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med _tmp2_ = exposure_time; #line 758 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp2_ == ((time_t) 0)) { -#line 4949 "SearchBoolean.c" - SearchConditionDateContext _tmp3_ = 0; +#line 4922 "SearchBoolean.c" + SearchConditionDateContext _tmp3_; #line 759 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = self->priv->_context; #line 759 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp3_ == SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET; #line 759 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4957 "SearchBoolean.c" +#line 4930 "SearchBoolean.c" } #line 761 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = exposure_time; @@ -4976,15 +4949,15 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med switch (_tmp6_) { #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_EXACT: -#line 4971 "SearchBoolean.c" +#line 4944 "SearchBoolean.c" { GDateTime* second = NULL; - GDateTime* _tmp7_ = NULL; - GDateTime* _tmp8_ = NULL; + GDateTime* _tmp7_; + GDateTime* _tmp8_; gboolean _tmp9_ = FALSE; - GDateTime* _tmp10_ = NULL; - GDateTime* _tmp11_ = NULL; - gint _tmp12_ = 0; + GDateTime* _tmp10_; + GDateTime* _tmp11_; + gint _tmp12_; #line 764 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp7_ = self->priv->_date_one; #line 764 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4999,10 +4972,10 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med _tmp12_ = g_date_time_compare (_tmp10_, _tmp11_); #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp12_ >= 0) { -#line 4994 "SearchBoolean.c" - GDateTime* _tmp13_ = NULL; - GDateTime* _tmp14_ = NULL; - gint _tmp15_ = 0; +#line 4967 "SearchBoolean.c" + GDateTime* _tmp13_; + GDateTime* _tmp14_; + gint _tmp15_; #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp13_ = dt; #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5011,11 +4984,11 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med _tmp15_ = g_date_time_compare (_tmp13_, _tmp14_); #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp9_ = _tmp15_ < 0; -#line 5006 "SearchBoolean.c" +#line 4979 "SearchBoolean.c" } else { #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp9_ = FALSE; -#line 5010 "SearchBoolean.c" +#line 4983 "SearchBoolean.c" } #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp9_; @@ -5025,15 +4998,15 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med _g_date_time_unref0 (dt); #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5020 "SearchBoolean.c" +#line 4993 "SearchBoolean.c" } #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_AFTER: -#line 5024 "SearchBoolean.c" +#line 4997 "SearchBoolean.c" { - GDateTime* _tmp16_ = NULL; - GDateTime* _tmp17_ = NULL; - gint _tmp18_ = 0; + GDateTime* _tmp16_; + GDateTime* _tmp17_; + gint _tmp18_; #line 768 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp16_ = dt; #line 768 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5046,15 +5019,15 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med _g_date_time_unref0 (dt); #line 768 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5041 "SearchBoolean.c" +#line 5014 "SearchBoolean.c" } #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_BEFORE: -#line 5045 "SearchBoolean.c" +#line 5018 "SearchBoolean.c" { - GDateTime* _tmp19_ = NULL; - GDateTime* _tmp20_ = NULL; - gint _tmp21_ = 0; + GDateTime* _tmp19_; + GDateTime* _tmp20_; + gint _tmp21_; #line 771 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp19_ = dt; #line 771 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5067,19 +5040,19 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med _g_date_time_unref0 (dt); #line 771 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5062 "SearchBoolean.c" +#line 5035 "SearchBoolean.c" } #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_BETWEEN: -#line 5066 "SearchBoolean.c" +#line 5039 "SearchBoolean.c" { GDateTime* second = NULL; - GDateTime* _tmp22_ = NULL; - GDateTime* _tmp23_ = NULL; + GDateTime* _tmp22_; + GDateTime* _tmp23_; gboolean _tmp24_ = FALSE; - GDateTime* _tmp25_ = NULL; - GDateTime* _tmp26_ = NULL; - gint _tmp27_ = 0; + GDateTime* _tmp25_; + GDateTime* _tmp26_; + gint _tmp27_; #line 774 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp22_ = self->priv->_date_two; #line 774 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5094,10 +5067,10 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med _tmp27_ = g_date_time_compare (_tmp25_, _tmp26_); #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp27_ >= 0) { -#line 5089 "SearchBoolean.c" - GDateTime* _tmp28_ = NULL; - GDateTime* _tmp29_ = NULL; - gint _tmp30_ = 0; +#line 5062 "SearchBoolean.c" + GDateTime* _tmp28_; + GDateTime* _tmp29_; + gint _tmp30_; #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp28_ = dt; #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5106,11 +5079,11 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med _tmp30_ = g_date_time_compare (_tmp28_, _tmp29_); #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp24_ = _tmp30_ < 0; -#line 5101 "SearchBoolean.c" +#line 5074 "SearchBoolean.c" } else { #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp24_ = FALSE; -#line 5105 "SearchBoolean.c" +#line 5078 "SearchBoolean.c" } #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp24_; @@ -5120,11 +5093,11 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med _g_date_time_unref0 (dt); #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5115 "SearchBoolean.c" +#line 5088 "SearchBoolean.c" } #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET: -#line 5119 "SearchBoolean.c" +#line 5092 "SearchBoolean.c" { #line 778 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = FALSE; @@ -5132,25 +5105,25 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med _g_date_time_unref0 (dt); #line 778 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5127 "SearchBoolean.c" +#line 5100 "SearchBoolean.c" } default: { #line 781 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:781: unrecognized date search context enumeration v" \ "alue"); -#line 5133 "SearchBoolean.c" +#line 5106 "SearchBoolean.c" } } #line 756 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_date_time_unref0 (dt); -#line 5138 "SearchBoolean.c" +#line 5111 "SearchBoolean.c" } GDateTime* search_condition_date_get_date_one (SearchConditionDate* self) { GDateTime* result; - GDateTime* _tmp0_ = NULL; + GDateTime* _tmp0_; #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SEARCH_CONDITION_DATE (self), NULL); #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5159,20 +5132,20 @@ GDateTime* search_condition_date_get_date_one (SearchConditionDate* self) { result = _tmp0_; #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5153 "SearchBoolean.c" +#line 5126 "SearchBoolean.c" } static gpointer _g_date_time_ref0 (gpointer self) { #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self ? g_date_time_ref (self) : NULL; -#line 5160 "SearchBoolean.c" +#line 5133 "SearchBoolean.c" } static void search_condition_date_set_date_one (SearchConditionDate* self, GDateTime* value) { - GDateTime* _tmp0_ = NULL; - GDateTime* _tmp1_ = NULL; + GDateTime* _tmp0_; + GDateTime* _tmp1_; #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_DATE (self)); #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5183,13 +5156,13 @@ static void search_condition_date_set_date_one (SearchConditionDate* self, GDate _g_date_time_unref0 (self->priv->_date_one); #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_date_one = _tmp1_; -#line 5177 "SearchBoolean.c" +#line 5150 "SearchBoolean.c" } GDateTime* search_condition_date_get_date_two (SearchConditionDate* self) { GDateTime* result; - GDateTime* _tmp0_ = NULL; + GDateTime* _tmp0_; #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SEARCH_CONDITION_DATE (self), NULL); #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5198,13 +5171,13 @@ GDateTime* search_condition_date_get_date_two (SearchConditionDate* self) { result = _tmp0_; #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5192 "SearchBoolean.c" +#line 5165 "SearchBoolean.c" } static void search_condition_date_set_date_two (SearchConditionDate* self, GDateTime* value) { - GDateTime* _tmp0_ = NULL; - GDateTime* _tmp1_ = NULL; + GDateTime* _tmp0_; + GDateTime* _tmp1_; #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_DATE (self)); #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5215,13 +5188,13 @@ static void search_condition_date_set_date_two (SearchConditionDate* self, GDate _g_date_time_unref0 (self->priv->_date_two); #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_date_two = _tmp1_; -#line 5209 "SearchBoolean.c" +#line 5182 "SearchBoolean.c" } SearchConditionDateContext search_condition_date_get_context (SearchConditionDate* self) { SearchConditionDateContext result; - SearchConditionDateContext _tmp0_ = 0; + SearchConditionDateContext _tmp0_; #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SEARCH_CONDITION_DATE (self), 0); #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5230,19 +5203,19 @@ SearchConditionDateContext search_condition_date_get_context (SearchConditionDat result = _tmp0_; #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5224 "SearchBoolean.c" +#line 5197 "SearchBoolean.c" } static void search_condition_date_set_context (SearchConditionDate* self, SearchConditionDateContext value) { - SearchConditionDateContext _tmp0_ = 0; + SearchConditionDateContext _tmp0_; #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SEARCH_CONDITION_DATE (self)); #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = value; #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_context = _tmp0_; -#line 5236 "SearchBoolean.c" +#line 5209 "SearchBoolean.c" } @@ -5254,19 +5227,19 @@ static void search_condition_date_class_init (SearchConditionDateClass * klass) #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_class_add_private (klass, sizeof (SearchConditionDatePrivate)); #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_date_real_predicate; -#line 5249 "SearchBoolean.c" + ((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_date_real_predicate; +#line 5222 "SearchBoolean.c" } static void search_condition_date_instance_init (SearchConditionDate * self) { #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SEARCH_CONDITION_DATE_GET_PRIVATE (self); -#line 5256 "SearchBoolean.c" +#line 5229 "SearchBoolean.c" } -static void search_condition_date_finalize (SearchCondition* obj) { +static void search_condition_date_finalize (SearchCondition * obj) { SearchConditionDate * self; #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_DATE, SearchConditionDate); @@ -5276,7 +5249,7 @@ static void search_condition_date_finalize (SearchCondition* obj) { _g_date_time_unref0 (self->priv->_date_two); #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" SEARCH_CONDITION_CLASS (search_condition_date_parent_class)->finalize (obj); -#line 5270 "SearchBoolean.c" +#line 5243 "SearchBoolean.c" } @@ -5295,15 +5268,15 @@ GType search_condition_date_get_type (void) { static gpointer _saved_search_row_ref0 (gpointer self) { #line 797 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self ? saved_search_row_ref (self) : NULL; -#line 5289 "SearchBoolean.c" +#line 5262 "SearchBoolean.c" } SavedSearch* saved_search_construct (GType object_type, SavedSearchRow* row, gint64 object_id) { SavedSearch * self = NULL; - gint64 _tmp0_ = 0LL; - SavedSearchRow* _tmp1_ = NULL; - SavedSearchRow* _tmp2_ = NULL; + gint64 _tmp0_; + SavedSearchRow* _tmp1_; + SavedSearchRow* _tmp2_; #line 794 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SAVED_SEARCH_ROW (row), NULL); #line 795 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5320,23 +5293,23 @@ SavedSearch* saved_search_construct (GType object_type, SavedSearchRow* row, gin self->priv->row = _tmp2_; #line 794 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 5314 "SearchBoolean.c" +#line 5287 "SearchBoolean.c" } SavedSearch* saved_search_new (SavedSearchRow* row, gint64 object_id) { #line 794 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return saved_search_construct (TYPE_SAVED_SEARCH, row, object_id); -#line 5321 "SearchBoolean.c" +#line 5294 "SearchBoolean.c" } static gchar* saved_search_real_get_name (DataObject* base) { SavedSearch * self; gchar* result = NULL; - SavedSearchRow* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + SavedSearchRow* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 800 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH, SavedSearch); #line 801 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5349,17 +5322,17 @@ static gchar* saved_search_real_get_name (DataObject* base) { result = _tmp2_; #line 801 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5343 "SearchBoolean.c" +#line 5316 "SearchBoolean.c" } static gchar* saved_search_real_to_string (DataObject* base) { SavedSearch * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; #line 804 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH, SavedSearch); #line 805 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5376,14 +5349,14 @@ static gchar* saved_search_real_to_string (DataObject* base) { result = _tmp3_; #line 805 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5370 "SearchBoolean.c" +#line 5343 "SearchBoolean.c" } static gchar* saved_search_real_get_typename (DataSource* base) { SavedSearch * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 808 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH, SavedSearch); #line 809 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5392,13 +5365,13 @@ static gchar* saved_search_real_get_typename (DataSource* base) { result = _tmp0_; #line 809 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5386 "SearchBoolean.c" +#line 5359 "SearchBoolean.c" } void saved_search_get_saved_search_id (SavedSearch* self, SavedSearchID* result) { - SavedSearchRow* _tmp0_ = NULL; - SavedSearchID _tmp1_ = {0}; + SavedSearchRow* _tmp0_; + SavedSearchID _tmp1_; #line 812 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SAVED_SEARCH (self)); #line 813 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5409,7 +5382,7 @@ void saved_search_get_saved_search_id (SavedSearch* self, SavedSearchID* result) *result = _tmp1_; #line 813 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return; -#line 5403 "SearchBoolean.c" +#line 5376 "SearchBoolean.c" } @@ -5417,7 +5390,7 @@ static gint64 saved_search_real_get_instance_id (DataSource* base) { SavedSearch * self; gint64 result = 0LL; SavedSearchID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; + gint64 _tmp1_; #line 816 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH, SavedSearch); #line 817 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5428,19 +5401,19 @@ static gint64 saved_search_real_get_instance_id (DataSource* base) { result = _tmp1_; #line 817 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5422 "SearchBoolean.c" +#line 5395 "SearchBoolean.c" } gint saved_search_compare_names (void* a, void* b) { gint result = 0; SavedSearch* asearch = NULL; - void* _tmp0_ = NULL; + void* _tmp0_; SavedSearch* bsearch = NULL; - void* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gint _tmp4_ = 0; + void* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gint _tmp4_; #line 821 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = a; #line 821 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5459,7 +5432,7 @@ gint saved_search_compare_names (void* a, void* b) { result = _tmp4_; #line 824 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5453 "SearchBoolean.c" +#line 5426 "SearchBoolean.c" } @@ -5467,8 +5440,8 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { gboolean result = FALSE; gboolean ret = FALSE; gboolean _tmp0_ = FALSE; - SavedSearchRow* _tmp1_ = NULL; - SearchOperator _tmp2_ = 0; + SavedSearchRow* _tmp1_; + SearchOperator _tmp2_; #line 827 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SAVED_SEARCH (self), FALSE); #line 827 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5481,37 +5454,37 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { if (SEARCH_OPERATOR_ALL == _tmp2_) { #line 829 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = TRUE; -#line 5475 "SearchBoolean.c" +#line 5448 "SearchBoolean.c" } else { - SavedSearchRow* _tmp3_ = NULL; - SearchOperator _tmp4_ = 0; + SavedSearchRow* _tmp3_; + SearchOperator _tmp4_; #line 829 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = self->priv->row; #line 829 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = _tmp3_->operator; #line 829 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = SEARCH_OPERATOR_NONE == _tmp4_; -#line 5485 "SearchBoolean.c" +#line 5458 "SearchBoolean.c" } #line 829 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp0_) { #line 830 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ret = TRUE; -#line 5491 "SearchBoolean.c" +#line 5464 "SearchBoolean.c" } else { #line 832 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ret = FALSE; -#line 5495 "SearchBoolean.c" +#line 5468 "SearchBoolean.c" } { GeeList* _c_list = NULL; - SavedSearchRow* _tmp5_ = NULL; - GeeList* _tmp6_ = NULL; - GeeList* _tmp7_ = NULL; + SavedSearchRow* _tmp5_; + GeeList* _tmp6_; + GeeList* _tmp7_; gint _c_size = 0; - GeeList* _tmp8_ = NULL; - gint _tmp9_ = 0; - gint _tmp10_ = 0; + GeeList* _tmp8_; + gint _tmp9_; + gint _tmp10_; gint _c_index = 0; #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp5_ = self->priv->row; @@ -5533,16 +5506,16 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { _c_index = -1; #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" while (TRUE) { -#line 5527 "SearchBoolean.c" - gint _tmp11_ = 0; - gint _tmp12_ = 0; - gint _tmp13_ = 0; +#line 5500 "SearchBoolean.c" + gint _tmp11_; + gint _tmp12_; + gint _tmp13_; SearchCondition* c = NULL; - GeeList* _tmp14_ = NULL; - gint _tmp15_ = 0; - gpointer _tmp16_ = NULL; - SavedSearchRow* _tmp17_ = NULL; - SearchOperator _tmp18_ = 0; + GeeList* _tmp14_; + gint _tmp15_; + gpointer _tmp16_; + SavedSearchRow* _tmp17_; + SearchOperator _tmp18_; #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp11_ = _c_index; #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5555,7 +5528,7 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { if (!(_tmp12_ < _tmp13_)) { #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" break; -#line 5549 "SearchBoolean.c" +#line 5522 "SearchBoolean.c" } #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp14_ = _c_list; @@ -5571,11 +5544,11 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { _tmp18_ = _tmp17_->operator; #line 835 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (SEARCH_OPERATOR_ALL == _tmp18_) { -#line 5565 "SearchBoolean.c" - gboolean _tmp19_ = FALSE; - SearchCondition* _tmp20_ = NULL; - MediaSource* _tmp21_ = NULL; - gboolean _tmp22_ = FALSE; +#line 5538 "SearchBoolean.c" + gboolean _tmp19_; + SearchCondition* _tmp20_; + MediaSource* _tmp21_; + gboolean _tmp22_; #line 836 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp19_ = ret; #line 836 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5586,21 +5559,21 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { _tmp22_ = search_condition_predicate (_tmp20_, _tmp21_); #line 836 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ret = _tmp19_ & _tmp22_; -#line 5580 "SearchBoolean.c" +#line 5553 "SearchBoolean.c" } else { - SavedSearchRow* _tmp23_ = NULL; - SearchOperator _tmp24_ = 0; + SavedSearchRow* _tmp23_; + SearchOperator _tmp24_; #line 837 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp23_ = self->priv->row; #line 837 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp24_ = _tmp23_->operator; #line 837 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (SEARCH_OPERATOR_ANY == _tmp24_) { -#line 5590 "SearchBoolean.c" - gboolean _tmp25_ = FALSE; - SearchCondition* _tmp26_ = NULL; - MediaSource* _tmp27_ = NULL; - gboolean _tmp28_ = FALSE; +#line 5563 "SearchBoolean.c" + gboolean _tmp25_; + SearchCondition* _tmp26_; + MediaSource* _tmp27_; + gboolean _tmp28_; #line 838 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp25_ = ret; #line 838 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5611,21 +5584,21 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { _tmp28_ = search_condition_predicate (_tmp26_, _tmp27_); #line 838 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ret = _tmp25_ | _tmp28_; -#line 5605 "SearchBoolean.c" +#line 5578 "SearchBoolean.c" } else { - SavedSearchRow* _tmp29_ = NULL; - SearchOperator _tmp30_ = 0; + SavedSearchRow* _tmp29_; + SearchOperator _tmp30_; #line 839 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp29_ = self->priv->row; #line 839 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp30_ = _tmp29_->operator; #line 839 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (SEARCH_OPERATOR_NONE == _tmp30_) { -#line 5615 "SearchBoolean.c" - gboolean _tmp31_ = FALSE; - SearchCondition* _tmp32_ = NULL; - MediaSource* _tmp33_ = NULL; - gboolean _tmp34_ = FALSE; +#line 5588 "SearchBoolean.c" + gboolean _tmp31_; + SearchCondition* _tmp32_; + MediaSource* _tmp33_; + gboolean _tmp34_; #line 840 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp31_ = ret; #line 840 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5636,43 +5609,43 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { _tmp34_ = search_condition_predicate (_tmp32_, _tmp33_); #line 840 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ret = _tmp31_ & (!_tmp34_); -#line 5630 "SearchBoolean.c" +#line 5603 "SearchBoolean.c" } } } #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _search_condition_unref0 (c); -#line 5636 "SearchBoolean.c" +#line 5609 "SearchBoolean.c" } #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (_c_list); -#line 5640 "SearchBoolean.c" +#line 5613 "SearchBoolean.c" } #line 842 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = ret; #line 842 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5646 "SearchBoolean.c" +#line 5619 "SearchBoolean.c" } void saved_search_reconstitute (SavedSearch* self) { - SavedSearchTable* _tmp8_ = NULL; - SavedSearchTable* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; + SavedSearchTable* _tmp8_; + SavedSearchTable* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; GError * _inner_error_ = NULL; #line 845 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SAVED_SEARCH (self)); -#line 5658 "SearchBoolean.c" +#line 5631 "SearchBoolean.c" { SavedSearchID _tmp0_ = {0}; - SavedSearchDBTable* _tmp1_ = NULL; - SavedSearchDBTable* _tmp2_ = NULL; - SavedSearchRow* _tmp3_ = NULL; + SavedSearchDBTable* _tmp1_; + SavedSearchDBTable* _tmp2_; + SavedSearchRow* _tmp3_; SavedSearchID _tmp4_ = {0}; - SavedSearchID _tmp5_ = {0}; - SavedSearchRow* _tmp6_ = NULL; + SavedSearchID _tmp5_; + SavedSearchRow* _tmp6_; #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = saved_search_db_table_get_instance (); #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5691,8 +5664,8 @@ void saved_search_reconstitute (SavedSearch* self) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 5685 "SearchBoolean.c" - goto __catch77_database_error; +#line 5658 "SearchBoolean.c" + goto __catch78_database_error; } #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -5700,19 +5673,19 @@ void saved_search_reconstitute (SavedSearch* self) { g_clear_error (&_inner_error_); #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return; -#line 5694 "SearchBoolean.c" +#line 5667 "SearchBoolean.c" } #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp6_ = self->priv->row; #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp6_->search_id = _tmp0_; -#line 5700 "SearchBoolean.c" +#line 5673 "SearchBoolean.c" } - goto __finally77; - __catch77_database_error: + goto __finally78; + __catch78_database_error: { GError* err = NULL; - GError* _tmp7_ = NULL; + GError* _tmp7_; #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" err = _inner_error_; #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5723,9 +5696,9 @@ void saved_search_reconstitute (SavedSearch* self) { app_window_database_error (_tmp7_); #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_error_free0 (err); -#line 5717 "SearchBoolean.c" +#line 5690 "SearchBoolean.c" } - __finally77: + __finally78: #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5734,7 +5707,7 @@ void saved_search_reconstitute (SavedSearch* self) { g_clear_error (&_inner_error_); #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return; -#line 5728 "SearchBoolean.c" +#line 5701 "SearchBoolean.c" } #line 852 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp8_ = saved_search_table_get_instance (); @@ -5752,28 +5725,28 @@ void saved_search_reconstitute (SavedSearch* self) { g_debug ("SearchBoolean.vala:853: Reconstituted %s", _tmp11_); #line 853 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp11_); -#line 5746 "SearchBoolean.c" +#line 5719 "SearchBoolean.c" } gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) { gboolean result = FALSE; - const gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - SavedSearchTable* _tmp2_ = NULL; - SavedSearchTable* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - gboolean _tmp6_ = FALSE; - SavedSearchTable* _tmp15_ = NULL; - SavedSearchTable* _tmp16_ = NULL; - SavedSearchRow* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - SavedSearchTable* _tmp20_ = NULL; - SavedSearchTable* _tmp21_ = NULL; - LibraryWindow* _tmp22_ = NULL; - LibraryWindow* _tmp23_ = NULL; + const gchar* _tmp0_; + gboolean _tmp1_; + SavedSearchTable* _tmp2_; + SavedSearchTable* _tmp3_; + const gchar* _tmp4_; + gboolean _tmp5_; + gboolean _tmp6_; + SavedSearchTable* _tmp15_; + SavedSearchTable* _tmp16_; + SavedSearchRow* _tmp17_; + const gchar* _tmp18_; + gchar* _tmp19_; + SavedSearchTable* _tmp20_; + SavedSearchTable* _tmp21_; + LibraryWindow* _tmp22_; + LibraryWindow* _tmp23_; GError * _inner_error_ = NULL; #line 857 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SAVED_SEARCH (self), FALSE); @@ -5789,7 +5762,7 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) { result = FALSE; #line 859 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5783 "SearchBoolean.c" +#line 5756 "SearchBoolean.c" } #line 861 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = saved_search_table_get_instance (); @@ -5809,14 +5782,14 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) { result = FALSE; #line 862 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5803 "SearchBoolean.c" +#line 5776 "SearchBoolean.c" } { - SavedSearchDBTable* _tmp7_ = NULL; - SavedSearchDBTable* _tmp8_ = NULL; - SavedSearchRow* _tmp9_ = NULL; - SavedSearchID _tmp10_ = {0}; - const gchar* _tmp11_ = NULL; + SavedSearchDBTable* _tmp7_; + SavedSearchDBTable* _tmp8_; + SavedSearchRow* _tmp9_; + SavedSearchID _tmp10_; + const gchar* _tmp11_; #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp7_ = saved_search_db_table_get_instance (); #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5833,12 +5806,12 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) { _database_table_unref0 (_tmp8_); #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5827 "SearchBoolean.c" +#line 5800 "SearchBoolean.c" gboolean _tmp12_ = FALSE; #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 5831 "SearchBoolean.c" - goto __catch78_database_error; +#line 5804 "SearchBoolean.c" + goto __catch79_database_error; } #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -5846,14 +5819,14 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) { g_clear_error (&_inner_error_); #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return _tmp12_; -#line 5840 "SearchBoolean.c" +#line 5813 "SearchBoolean.c" } } - goto __finally78; - __catch78_database_error: + goto __finally79; + __catch79_database_error: { GError* err = NULL; - GError* _tmp13_ = NULL; + GError* _tmp13_; #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" err = _inner_error_; #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5868,12 +5841,12 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) { _g_error_free0 (err); #line 868 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5862 "SearchBoolean.c" +#line 5835 "SearchBoolean.c" } - __finally78: + __finally79: #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5867 "SearchBoolean.c" +#line 5840 "SearchBoolean.c" gboolean _tmp14_ = FALSE; #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -5881,7 +5854,7 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) { g_clear_error (&_inner_error_); #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return _tmp14_; -#line 5875 "SearchBoolean.c" +#line 5848 "SearchBoolean.c" } #line 871 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp15_ = saved_search_table_get_instance (); @@ -5921,16 +5894,16 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) { result = TRUE; #line 876 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5915 "SearchBoolean.c" +#line 5888 "SearchBoolean.c" } GeeList* saved_search_get_conditions (SavedSearch* self) { GeeList* result = NULL; - SavedSearchRow* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; - GeeList* _tmp2_ = NULL; - GeeList* _tmp3_ = NULL; + SavedSearchRow* _tmp0_; + GeeList* _tmp1_; + GeeList* _tmp2_; + GeeList* _tmp3_; #line 879 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SAVED_SEARCH (self), NULL); #line 880 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5945,14 +5918,14 @@ GeeList* saved_search_get_conditions (SavedSearch* self) { result = _tmp3_; #line 880 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5939 "SearchBoolean.c" +#line 5912 "SearchBoolean.c" } SearchOperator saved_search_get_operator (SavedSearch* self) { SearchOperator result = 0; - SavedSearchRow* _tmp0_ = NULL; - SearchOperator _tmp1_ = 0; + SavedSearchRow* _tmp0_; + SearchOperator _tmp1_; #line 883 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SAVED_SEARCH (self), 0); #line 884 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5963,7 +5936,7 @@ SearchOperator saved_search_get_operator (SavedSearch* self) { result = _tmp1_; #line 884 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5957 "SearchBoolean.c" +#line 5930 "SearchBoolean.c" } @@ -5973,27 +5946,27 @@ static void saved_search_class_init (SavedSearchClass * klass) { #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_class_add_private (klass, sizeof (SavedSearchPrivate)); #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) saved_search_real_get_name; + ((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) saved_search_real_get_name; #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) saved_search_real_to_string; + ((DataObjectClass *) klass)->to_string = (gchar* (*) (DataObject *)) saved_search_real_to_string; #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) saved_search_real_get_typename; + ((DataSourceClass *) klass)->get_typename = (gchar* (*) (DataSource *)) saved_search_real_get_typename; #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) saved_search_real_get_instance_id; + ((DataSourceClass *) klass)->get_instance_id = (gint64 (*) (DataSource *)) saved_search_real_get_instance_id; #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" G_OBJECT_CLASS (klass)->finalize = saved_search_finalize; -#line 5976 "SearchBoolean.c" +#line 5949 "SearchBoolean.c" } static void saved_search_instance_init (SavedSearch * self) { #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SAVED_SEARCH_GET_PRIVATE (self); -#line 5983 "SearchBoolean.c" +#line 5956 "SearchBoolean.c" } -static void saved_search_finalize (GObject* obj) { +static void saved_search_finalize (GObject * obj) { SavedSearch * self; #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH, SavedSearch); @@ -6001,7 +5974,7 @@ static void saved_search_finalize (GObject* obj) { _saved_search_row_unref0 (self->priv->row); #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" G_OBJECT_CLASS (saved_search_parent_class)->finalize (obj); -#line 5995 "SearchBoolean.c" +#line 5968 "SearchBoolean.c" } @@ -6022,13 +5995,13 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { GError * _inner_error_ = NULL; #line 897 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = (SavedSearchTable*) g_type_create_instance (object_type); -#line 6016 "SearchBoolean.c" +#line 5989 "SearchBoolean.c" { GeeList* _tmp0_ = NULL; - SavedSearchDBTable* _tmp1_ = NULL; - SavedSearchDBTable* _tmp2_ = NULL; - GeeList* _tmp3_ = NULL; - GeeList* _tmp4_ = NULL; + SavedSearchDBTable* _tmp1_; + SavedSearchDBTable* _tmp2_; + GeeList* _tmp3_; + GeeList* _tmp4_; #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = saved_search_db_table_get_instance (); #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6045,8 +6018,8 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6039 "SearchBoolean.c" - goto __catch79_database_error; +#line 6012 "SearchBoolean.c" + goto __catch80_database_error; } #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -6054,20 +6027,18 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { g_clear_error (&_inner_error_); #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 6048 "SearchBoolean.c" +#line 6021 "SearchBoolean.c" } { GeeList* _row_list = NULL; - GeeList* _tmp5_ = NULL; + GeeList* _tmp5_; gint _row_size = 0; - GeeList* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + GeeList* _tmp6_; + gint _tmp7_; + gint _tmp8_; gint _row_index = 0; #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp5_ = _tmp0_; -#line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = NULL; + _tmp5_ = _g_object_ref0 (_tmp0_); #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _row_list = _tmp5_; #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6082,17 +6053,17 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { _row_index = -1; #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" while (TRUE) { -#line 6076 "SearchBoolean.c" - gint _tmp9_ = 0; - gint _tmp10_ = 0; - gint _tmp11_ = 0; +#line 6047 "SearchBoolean.c" + gint _tmp9_; + gint _tmp10_; + gint _tmp11_; SavedSearchRow* row = NULL; - GeeList* _tmp12_ = NULL; - gint _tmp13_ = 0; - gpointer _tmp14_ = NULL; - SavedSearchRow* _tmp15_ = NULL; - SavedSearch* _tmp16_ = NULL; - SavedSearch* _tmp17_ = NULL; + GeeList* _tmp12_; + gint _tmp13_; + gpointer _tmp14_; + SavedSearchRow* _tmp15_; + SavedSearch* _tmp16_; + SavedSearch* _tmp17_; #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp9_ = _row_index; #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6105,7 +6076,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { if (!(_tmp10_ < _tmp11_)) { #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" break; -#line 6099 "SearchBoolean.c" +#line 6070 "SearchBoolean.c" } #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp12_ = _row_list; @@ -6127,21 +6098,21 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { _g_object_unref0 (_tmp17_); #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _saved_search_row_unref0 (row); -#line 6121 "SearchBoolean.c" +#line 6092 "SearchBoolean.c" } #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (_row_list); -#line 6125 "SearchBoolean.c" +#line 6096 "SearchBoolean.c" } #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (_tmp0_); -#line 6129 "SearchBoolean.c" +#line 6100 "SearchBoolean.c" } - goto __finally79; - __catch79_database_error: + goto __finally80; + __catch80_database_error: { GError* err = NULL; - GError* _tmp18_ = NULL; + GError* _tmp18_; #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" err = _inner_error_; #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6152,9 +6123,9 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { app_window_database_error (_tmp18_); #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_error_free0 (err); -#line 6146 "SearchBoolean.c" +#line 6117 "SearchBoolean.c" } - __finally79: + __finally80: #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6163,46 +6134,46 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { g_clear_error (&_inner_error_); #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 6157 "SearchBoolean.c" +#line 6128 "SearchBoolean.c" } #line 897 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 6161 "SearchBoolean.c" +#line 6132 "SearchBoolean.c" } static SavedSearchTable* saved_search_table_new (void) { #line 897 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return saved_search_table_construct (TYPE_SAVED_SEARCH_TABLE); -#line 6168 "SearchBoolean.c" +#line 6139 "SearchBoolean.c" } static gpointer _saved_search_table_ref0 (gpointer self) { #line 912 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self ? saved_search_table_ref (self) : NULL; -#line 6175 "SearchBoolean.c" +#line 6146 "SearchBoolean.c" } SavedSearchTable* saved_search_table_get_instance (void) { SavedSearchTable* result = NULL; - SavedSearchTable* _tmp0_ = NULL; - SavedSearchTable* _tmp2_ = NULL; - SavedSearchTable* _tmp3_ = NULL; + SavedSearchTable* _tmp0_; + SavedSearchTable* _tmp2_; + SavedSearchTable* _tmp3_; #line 909 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = saved_search_table_instance; #line 909 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp0_ == NULL) { -#line 6188 "SearchBoolean.c" - SavedSearchTable* _tmp1_ = NULL; +#line 6159 "SearchBoolean.c" + SavedSearchTable* _tmp1_; #line 910 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = saved_search_table_new (); #line 910 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _saved_search_table_unref0 (saved_search_table_instance); #line 910 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" saved_search_table_instance = _tmp1_; -#line 6196 "SearchBoolean.c" +#line 6167 "SearchBoolean.c" } #line 912 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = saved_search_table_instance; @@ -6212,15 +6183,15 @@ SavedSearchTable* saved_search_table_get_instance (void) { result = _tmp3_; #line 912 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6206 "SearchBoolean.c" +#line 6177 "SearchBoolean.c" } GeeCollection* saved_search_table_get_all (SavedSearchTable* self) { GeeCollection* result = NULL; - GeeHashMap* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; + GeeHashMap* _tmp0_; + GeeCollection* _tmp1_; + GeeCollection* _tmp2_; #line 915 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SAVED_SEARCH_TABLE (self), NULL); #line 916 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6233,17 +6204,17 @@ GeeCollection* saved_search_table_get_all (SavedSearchTable* self) { result = _tmp2_; #line 916 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6227 "SearchBoolean.c" +#line 6198 "SearchBoolean.c" } SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* name, SearchOperator operator, GeeArrayList* conditions) { SavedSearch* result = NULL; SavedSearch* search = NULL; - SavedSearch* _tmp10_ = NULL; - LibraryWindow* _tmp11_ = NULL; - LibraryWindow* _tmp12_ = NULL; - SavedSearch* _tmp13_ = NULL; + SavedSearch* _tmp10_; + LibraryWindow* _tmp11_; + LibraryWindow* _tmp12_; + SavedSearch* _tmp13_; GError * _inner_error_ = NULL; #line 921 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SAVED_SEARCH_TABLE (self), NULL); @@ -6253,17 +6224,17 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam g_return_val_if_fail (GEE_IS_ARRAY_LIST (conditions), NULL); #line 923 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search = NULL; -#line 6247 "SearchBoolean.c" +#line 6218 "SearchBoolean.c" { SavedSearchRow* _tmp0_ = NULL; - SavedSearchDBTable* _tmp1_ = NULL; - SavedSearchDBTable* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - SearchOperator _tmp4_ = 0; - GeeArrayList* _tmp5_ = NULL; - SavedSearchRow* _tmp6_ = NULL; - SavedSearchRow* _tmp7_ = NULL; - SavedSearch* _tmp8_ = NULL; + SavedSearchDBTable* _tmp1_; + SavedSearchDBTable* _tmp2_; + const gchar* _tmp3_; + SearchOperator _tmp4_; + GeeArrayList* _tmp5_; + SavedSearchRow* _tmp6_; + SavedSearchRow* _tmp7_; + SavedSearch* _tmp8_; #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = saved_search_db_table_get_instance (); #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6286,8 +6257,8 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam if (G_UNLIKELY (_inner_error_ != NULL)) { #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6280 "SearchBoolean.c" - goto __catch80_database_error; +#line 6251 "SearchBoolean.c" + goto __catch81_database_error; } #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (search); @@ -6297,7 +6268,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam g_clear_error (&_inner_error_); #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 6291 "SearchBoolean.c" +#line 6262 "SearchBoolean.c" } #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp8_ = saved_search_new (_tmp0_, DATA_OBJECT_INVALID_OBJECT_ID); @@ -6307,13 +6278,13 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam search = _tmp8_; #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _saved_search_row_unref0 (_tmp0_); -#line 6301 "SearchBoolean.c" +#line 6272 "SearchBoolean.c" } - goto __finally80; - __catch80_database_error: + goto __finally81; + __catch81_database_error: { GError* err = NULL; - GError* _tmp9_ = NULL; + GError* _tmp9_; #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" err = _inner_error_; #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6324,9 +6295,9 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam app_window_database_error (_tmp9_); #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_error_free0 (err); -#line 6318 "SearchBoolean.c" +#line 6289 "SearchBoolean.c" } - __finally80: + __finally81: #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6337,7 +6308,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam g_clear_error (&_inner_error_); #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 6331 "SearchBoolean.c" +#line 6302 "SearchBoolean.c" } #line 932 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp10_ = search; @@ -6357,22 +6328,22 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam result = search; #line 934 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6351 "SearchBoolean.c" +#line 6322 "SearchBoolean.c" } void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) { - SavedSearch* _tmp5_ = NULL; + SavedSearch* _tmp5_; GError * _inner_error_ = NULL; #line 938 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SAVED_SEARCH_TABLE (self)); #line 938 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SAVED_SEARCH (search)); -#line 6362 "SearchBoolean.c" +#line 6333 "SearchBoolean.c" { - SavedSearchDBTable* _tmp0_ = NULL; - SavedSearchDBTable* _tmp1_ = NULL; - SavedSearch* _tmp2_ = NULL; + SavedSearchDBTable* _tmp0_; + SavedSearchDBTable* _tmp1_; + SavedSearch* _tmp2_; SavedSearchID _tmp3_ = {0}; #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = saved_search_db_table_get_instance (); @@ -6390,8 +6361,8 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6384 "SearchBoolean.c" - goto __catch81_database_error; +#line 6355 "SearchBoolean.c" + goto __catch82_database_error; } #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -6399,14 +6370,14 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) { g_clear_error (&_inner_error_); #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return; -#line 6393 "SearchBoolean.c" +#line 6364 "SearchBoolean.c" } } - goto __finally81; - __catch81_database_error: + goto __finally82; + __catch82_database_error: { GError* err = NULL; - GError* _tmp4_ = NULL; + GError* _tmp4_; #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" err = _inner_error_; #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6417,9 +6388,9 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) { app_window_database_error (_tmp4_); #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_error_free0 (err); -#line 6411 "SearchBoolean.c" +#line 6382 "SearchBoolean.c" } - __finally81: + __finally82: #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6428,23 +6399,23 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) { g_clear_error (&_inner_error_); #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return; -#line 6422 "SearchBoolean.c" +#line 6393 "SearchBoolean.c" } #line 945 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp5_ = search; #line 945 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" saved_search_table_remove_from_map (self, _tmp5_); -#line 6428 "SearchBoolean.c" +#line 6399 "SearchBoolean.c" } void saved_search_table_add_to_map (SavedSearchTable* self, SavedSearch* search) { - GeeHashMap* _tmp0_ = NULL; - SavedSearch* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - SavedSearch* _tmp4_ = NULL; - SavedSearch* _tmp5_ = NULL; + GeeHashMap* _tmp0_; + SavedSearch* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + SavedSearch* _tmp4_; + SavedSearch* _tmp5_; #line 948 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SAVED_SEARCH_TABLE (self)); #line 948 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6466,17 +6437,17 @@ void saved_search_table_add_to_map (SavedSearchTable* self, SavedSearch* search) #line 950 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp5_ = search; #line 950 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - g_signal_emit_by_name (self, "search-added", _tmp5_); -#line 6461 "SearchBoolean.c" + g_signal_emit (self, saved_search_table_signals[SAVED_SEARCH_TABLE_SEARCH_ADDED_SIGNAL], 0, _tmp5_); +#line 6432 "SearchBoolean.c" } void saved_search_table_remove_from_map (SavedSearchTable* self, SavedSearch* search) { - GeeHashMap* _tmp0_ = NULL; - SavedSearch* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - SavedSearch* _tmp4_ = NULL; + GeeHashMap* _tmp0_; + SavedSearch* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + SavedSearch* _tmp4_; #line 953 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SAVED_SEARCH_TABLE (self)); #line 953 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6496,16 +6467,16 @@ void saved_search_table_remove_from_map (SavedSearchTable* self, SavedSearch* se #line 955 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = search; #line 955 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - g_signal_emit_by_name (self, "search-removed", _tmp4_); -#line 6491 "SearchBoolean.c" + g_signal_emit (self, saved_search_table_signals[SAVED_SEARCH_TABLE_SEARCH_REMOVED_SIGNAL], 0, _tmp4_); +#line 6462 "SearchBoolean.c" } GeeIterable* saved_search_table_get_saved_searches (SavedSearchTable* self) { GeeIterable* result = NULL; - GeeHashMap* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; + GeeHashMap* _tmp0_; + GeeCollection* _tmp1_; + GeeCollection* _tmp2_; #line 958 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SAVED_SEARCH_TABLE (self), NULL); #line 959 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6518,15 +6489,15 @@ GeeIterable* saved_search_table_get_saved_searches (SavedSearchTable* self) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable); #line 959 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6512 "SearchBoolean.c" +#line 6483 "SearchBoolean.c" } gint saved_search_table_get_count (SavedSearchTable* self) { gint result = 0; - GeeHashMap* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + GeeHashMap* _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 962 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SAVED_SEARCH_TABLE (self), 0); #line 963 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6539,15 +6510,15 @@ gint saved_search_table_get_count (SavedSearchTable* self) { result = _tmp2_; #line 963 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6533 "SearchBoolean.c" +#line 6504 "SearchBoolean.c" } gboolean saved_search_table_exists (SavedSearchTable* self, const gchar* search_name) { gboolean result = FALSE; - GeeHashMap* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GeeHashMap* _tmp0_; + const gchar* _tmp1_; + gboolean _tmp2_; #line 966 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SAVED_SEARCH_TABLE (self), FALSE); #line 966 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6562,43 +6533,43 @@ gboolean saved_search_table_exists (SavedSearchTable* self, const gchar* search_ result = _tmp2_; #line 967 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6556 "SearchBoolean.c" +#line 6527 "SearchBoolean.c" } gchar* saved_search_table_generate_unique_name (SavedSearchTable* self) { gchar* result = NULL; - gchar* _tmp7_ = NULL; + gchar* _tmp7_; #line 971 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SAVED_SEARCH_TABLE (self), NULL); -#line 6565 "SearchBoolean.c" +#line 6536 "SearchBoolean.c" { gint ctr = 0; #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ctr = 1; -#line 6570 "SearchBoolean.c" +#line 6541 "SearchBoolean.c" { gboolean _tmp0_ = FALSE; #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = TRUE; #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" while (TRUE) { -#line 6577 "SearchBoolean.c" - gint _tmp2_ = 0; +#line 6548 "SearchBoolean.c" + gint _tmp2_; gchar* name = NULL; - gint _tmp3_ = 0; - gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + gint _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; + gboolean _tmp6_; #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (!_tmp0_) { -#line 6586 "SearchBoolean.c" - gint _tmp1_ = 0; +#line 6557 "SearchBoolean.c" + gint _tmp1_; #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = ctr; #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ctr = _tmp1_ + 1; -#line 6592 "SearchBoolean.c" +#line 6563 "SearchBoolean.c" } #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = FALSE; @@ -6608,7 +6579,7 @@ gchar* saved_search_table_generate_unique_name (SavedSearchTable* self) { if (!(_tmp2_ < G_MAXINT)) { #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" break; -#line 6602 "SearchBoolean.c" +#line 6573 "SearchBoolean.c" } #line 973 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = ctr; @@ -6626,11 +6597,11 @@ gchar* saved_search_table_generate_unique_name (SavedSearchTable* self) { result = name; #line 976 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6620 "SearchBoolean.c" +#line 6591 "SearchBoolean.c" } #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (name); -#line 6624 "SearchBoolean.c" +#line 6595 "SearchBoolean.c" } } } @@ -6640,14 +6611,14 @@ gchar* saved_search_table_generate_unique_name (SavedSearchTable* self) { result = _tmp7_; #line 978 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6634 "SearchBoolean.c" +#line 6605 "SearchBoolean.c" } static void value_saved_search_table_init (GValue* value) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 6641 "SearchBoolean.c" +#line 6612 "SearchBoolean.c" } @@ -6656,7 +6627,7 @@ static void value_saved_search_table_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" saved_search_table_unref (value->data[0].v_pointer); -#line 6650 "SearchBoolean.c" +#line 6621 "SearchBoolean.c" } } @@ -6666,11 +6637,11 @@ static void value_saved_search_table_copy_value (const GValue* src_value, GValue if (src_value->data[0].v_pointer) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" dest_value->data[0].v_pointer = saved_search_table_ref (src_value->data[0].v_pointer); -#line 6660 "SearchBoolean.c" +#line 6631 "SearchBoolean.c" } else { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" dest_value->data[0].v_pointer = NULL; -#line 6664 "SearchBoolean.c" +#line 6635 "SearchBoolean.c" } } @@ -6678,66 +6649,66 @@ static void value_saved_search_table_copy_value (const GValue* src_value, GValue static gpointer value_saved_search_table_peek_pointer (const GValue* value) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return value->data[0].v_pointer; -#line 6672 "SearchBoolean.c" +#line 6643 "SearchBoolean.c" } static gchar* value_saved_search_table_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (collect_values[0].v_pointer) { -#line 6679 "SearchBoolean.c" - SavedSearchTable* object; +#line 6650 "SearchBoolean.c" + SavedSearchTable * object; object = collect_values[0].v_pointer; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (object->parent_instance.g_class == NULL) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6686 "SearchBoolean.c" +#line 6657 "SearchBoolean.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6690 "SearchBoolean.c" +#line 6661 "SearchBoolean.c" } #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = saved_search_table_ref (object); -#line 6694 "SearchBoolean.c" +#line 6665 "SearchBoolean.c" } else { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 6698 "SearchBoolean.c" +#line 6669 "SearchBoolean.c" } #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 6702 "SearchBoolean.c" +#line 6673 "SearchBoolean.c" } static gchar* value_saved_search_table_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - SavedSearchTable** object_p; + SavedSearchTable ** object_p; object_p = collect_values[0].v_pointer; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (!object_p) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 6713 "SearchBoolean.c" +#line 6684 "SearchBoolean.c" } #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (!value->data[0].v_pointer) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" *object_p = NULL; -#line 6719 "SearchBoolean.c" +#line 6690 "SearchBoolean.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" *object_p = value->data[0].v_pointer; -#line 6723 "SearchBoolean.c" +#line 6694 "SearchBoolean.c" } else { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" *object_p = saved_search_table_ref (value->data[0].v_pointer); -#line 6727 "SearchBoolean.c" +#line 6698 "SearchBoolean.c" } #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 6731 "SearchBoolean.c" +#line 6702 "SearchBoolean.c" } @@ -6751,7 +6722,7 @@ GParamSpec* param_spec_saved_search_table (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return G_PARAM_SPEC (spec); -#line 6745 "SearchBoolean.c" +#line 6716 "SearchBoolean.c" } @@ -6760,12 +6731,12 @@ gpointer value_get_saved_search_table (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_TABLE), NULL); #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return value->data[0].v_pointer; -#line 6754 "SearchBoolean.c" +#line 6725 "SearchBoolean.c" } void value_set_saved_search_table (GValue* value, gpointer v_object) { - SavedSearchTable* old; + SavedSearchTable * old; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_TABLE)); #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6780,23 +6751,23 @@ void value_set_saved_search_table (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" saved_search_table_ref (value->data[0].v_pointer); -#line 6774 "SearchBoolean.c" +#line 6745 "SearchBoolean.c" } else { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 6778 "SearchBoolean.c" +#line 6749 "SearchBoolean.c" } #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (old) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" saved_search_table_unref (old); -#line 6784 "SearchBoolean.c" +#line 6755 "SearchBoolean.c" } } void value_take_saved_search_table (GValue* value, gpointer v_object) { - SavedSearchTable* old; + SavedSearchTable * old; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_TABLE)); #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6809,17 +6780,17 @@ void value_take_saved_search_table (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = v_object; -#line 6803 "SearchBoolean.c" +#line 6774 "SearchBoolean.c" } else { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 6807 "SearchBoolean.c" +#line 6778 "SearchBoolean.c" } #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (old) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" saved_search_table_unref (old); -#line 6813 "SearchBoolean.c" +#line 6784 "SearchBoolean.c" } } @@ -6832,15 +6803,15 @@ static void saved_search_table_class_init (SavedSearchTableClass * klass) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_class_add_private (klass, sizeof (SavedSearchTablePrivate)); #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - g_signal_new ("search_added", TYPE_SAVED_SEARCH_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH); + saved_search_table_signals[SAVED_SEARCH_TABLE_SEARCH_ADDED_SIGNAL] = g_signal_new ("search-added", TYPE_SAVED_SEARCH_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH); #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - g_signal_new ("search_removed", TYPE_SAVED_SEARCH_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH); -#line 6829 "SearchBoolean.c" + saved_search_table_signals[SAVED_SEARCH_TABLE_SEARCH_REMOVED_SIGNAL] = g_signal_new ("search-removed", TYPE_SAVED_SEARCH_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH); +#line 6800 "SearchBoolean.c" } static void saved_search_table_instance_init (SavedSearchTable * self) { - GeeHashMap* _tmp0_ = NULL; + GeeHashMap* _tmp0_; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SAVED_SEARCH_TABLE_GET_PRIVATE (self); #line 892 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6849,11 +6820,11 @@ static void saved_search_table_instance_init (SavedSearchTable * self) { self->priv->search_map = _tmp0_; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->ref_count = 1; -#line 6843 "SearchBoolean.c" +#line 6814 "SearchBoolean.c" } -static void saved_search_table_finalize (SavedSearchTable* obj) { +static void saved_search_table_finalize (SavedSearchTable * obj) { SavedSearchTable * self; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_TABLE, SavedSearchTable); @@ -6861,7 +6832,7 @@ static void saved_search_table_finalize (SavedSearchTable* obj) { g_signal_handlers_destroy (self); #line 892 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (self->priv->search_map); -#line 6855 "SearchBoolean.c" +#line 6826 "SearchBoolean.c" } @@ -6880,18 +6851,18 @@ GType saved_search_table_get_type (void) { gpointer saved_search_table_ref (gpointer instance) { - SavedSearchTable* self; + SavedSearchTable * self; self = instance; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_atomic_int_inc (&self->ref_count); #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return instance; -#line 6880 "SearchBoolean.c" +#line 6851 "SearchBoolean.c" } void saved_search_table_unref (gpointer instance) { - SavedSearchTable* self; + SavedSearchTable * self; self = instance; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -6899,7 +6870,7 @@ void saved_search_table_unref (gpointer instance) { SAVED_SEARCH_TABLE_GET_CLASS (self)->finalize (self); #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_free_instance ((GTypeInstance *) self); -#line 6893 "SearchBoolean.c" +#line 6864 "SearchBoolean.c" } } diff --git a/src/searches/Searches.c b/src/searches/Searches.c index 33bbc33..70622ce 100644 --- a/src/searches/Searches.c +++ b/src/searches/Searches.c @@ -1,4 +1,4 @@ -/* Searches.c generated by valac 0.34.7, the Vala compiler +/* Searches.c generated by valac 0.36.6, the Vala compiler * generated from Searches.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. |