diff options
Diffstat (limited to 'src/sidebar/Branch.c')
| -rw-r--r-- | src/sidebar/Branch.c | 1094 |
1 files changed, 552 insertions, 542 deletions
diff --git a/src/sidebar/Branch.c b/src/sidebar/Branch.c index 26b9a21..a49cdac 100644 --- a/src/sidebar/Branch.c +++ b/src/sidebar/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. @@ -60,6 +60,16 @@ typedef struct _SidebarTreeClass SidebarTreeClass; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) typedef struct _SidebarBranchNodePrivate SidebarBranchNodePrivate; typedef struct _SidebarBranchParamSpecNode SidebarBranchParamSpecNode; +enum { + SIDEBAR_BRANCH_ENTRY_ADDED_SIGNAL, + SIDEBAR_BRANCH_ENTRY_REMOVED_SIGNAL, + SIDEBAR_BRANCH_ENTRY_MOVED_SIGNAL, + SIDEBAR_BRANCH_ENTRY_REPARENTED_SIGNAL, + SIDEBAR_BRANCH_CHILDREN_REORDERED_SIGNAL, + SIDEBAR_BRANCH_SHOW_BRANCH_SIGNAL, + SIDEBAR_BRANCH_LAST_SIGNAL +}; +static guint sidebar_branch_signals[SIDEBAR_BRANCH_LAST_SIGNAL] = {0}; #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; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -188,8 +198,8 @@ enum { static gint sidebar_branch_node_comparator_wrapper (SidebarBranchNode* anode, SidebarBranchNode* bnode); static gint _sidebar_branch_node_comparator_wrapper_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self, SidebarBranchNode* child); -static void sidebar_branch_node_finalize (SidebarBranchNode* obj); -static void sidebar_branch_finalize (GObject* obj); +static void sidebar_branch_node_finalize (SidebarBranchNode * obj); +static void sidebar_branch_finalize (GObject * obj); gboolean sidebar_branch_options_is_hide_if_empty (SidebarBranchOptions self) { @@ -198,7 +208,7 @@ gboolean sidebar_branch_options_is_hide_if_empty (SidebarBranchOptions self) { result = (self & SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY) != 0; #line 19 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 202 "Branch.c" +#line 212 "Branch.c" } @@ -208,7 +218,7 @@ gboolean sidebar_branch_options_is_auto_open_on_new_child (SidebarBranchOptions result = (self & SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD) != 0; #line 23 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 212 "Branch.c" +#line 222 "Branch.c" } @@ -218,7 +228,7 @@ gboolean sidebar_branch_options_is_startup_expand_to_first_child (SidebarBranchO result = (self & SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD) != 0; #line 27 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 222 "Branch.c" +#line 232 "Branch.c" } @@ -228,7 +238,7 @@ gboolean sidebar_branch_options_is_startup_open_grouping (SidebarBranchOptions s result = (self & SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING) != 0; #line 31 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 232 "Branch.c" +#line 242 "Branch.c" } @@ -246,17 +256,17 @@ GType sidebar_branch_options_get_type (void) { SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator) { SidebarBranch * self = NULL; - GCompareFunc _tmp0_ = NULL; + GCompareFunc _tmp0_; GCompareFunc _tmp1_ = NULL; - GCompareFunc _tmp2_ = NULL; - SidebarEntry* _tmp5_ = NULL; - SidebarBranchNode* _tmp6_ = NULL; - SidebarBranchOptions _tmp7_ = 0; - GeeHashMap* _tmp8_ = NULL; - SidebarEntry* _tmp9_ = NULL; - SidebarBranchNode* _tmp10_ = NULL; - SidebarBranchOptions _tmp11_ = 0; - gboolean _tmp12_ = FALSE; + GCompareFunc _tmp2_; + SidebarEntry* _tmp5_; + SidebarBranchNode* _tmp6_; + SidebarBranchOptions _tmp7_; + GeeHashMap* _tmp8_; + SidebarEntry* _tmp9_; + SidebarBranchNode* _tmp10_; + SidebarBranchOptions _tmp11_; + gboolean _tmp12_; #line 206 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (root), NULL); #line 206 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -269,20 +279,20 @@ SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, _tmp2_ = root_comparator; #line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (_tmp2_ != NULL) { -#line 273 "Branch.c" - GCompareFunc _tmp3_ = NULL; +#line 283 "Branch.c" + GCompareFunc _tmp3_; #line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp3_ = root_comparator; #line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp1_ = _tmp3_; -#line 279 "Branch.c" +#line 289 "Branch.c" } else { - GCompareFunc _tmp4_ = NULL; + GCompareFunc _tmp4_; #line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp4_ = default_comparator; #line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp1_ = _tmp4_; -#line 286 "Branch.c" +#line 296 "Branch.c" } #line 209 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp5_ = root; @@ -312,33 +322,33 @@ SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, if (_tmp12_) { #line 216 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_set_show_branch (self, FALSE); -#line 316 "Branch.c" +#line 326 "Branch.c" } #line 206 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return self; -#line 320 "Branch.c" +#line 330 "Branch.c" } SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator) { #line 206 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return sidebar_branch_construct (SIDEBAR_TYPE_BRANCH, root, options, default_comparator, root_comparator); -#line 327 "Branch.c" +#line 337 "Branch.c" } static gpointer _g_object_ref0 (gpointer self) { #line 220 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return self ? g_object_ref (self) : NULL; -#line 334 "Branch.c" +#line 344 "Branch.c" } SidebarEntry* sidebar_branch_get_root (SidebarBranch* self) { SidebarEntry* result = NULL; - SidebarBranchNode* _tmp0_ = NULL; - SidebarEntry* _tmp1_ = NULL; - SidebarEntry* _tmp2_ = NULL; + SidebarBranchNode* _tmp0_; + SidebarEntry* _tmp1_; + SidebarEntry* _tmp2_; #line 219 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL); #line 220 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -351,15 +361,15 @@ SidebarEntry* sidebar_branch_get_root (SidebarBranch* self) { result = _tmp2_; #line 220 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 355 "Branch.c" +#line 365 "Branch.c" } void sidebar_branch_set_show_branch (SidebarBranch* self, gboolean shown) { - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; + gboolean _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; #line 223 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); #line 224 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -370,7 +380,7 @@ void sidebar_branch_set_show_branch (SidebarBranch* self, gboolean shown) { if (_tmp0_ == _tmp1_) { #line 225 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return; -#line 374 "Branch.c" +#line 384 "Branch.c" } #line 227 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp2_ = shown; @@ -379,14 +389,14 @@ void sidebar_branch_set_show_branch (SidebarBranch* self, gboolean shown) { #line 228 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp3_ = shown; #line 228 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - g_signal_emit_by_name (self, "show-branch", _tmp3_); -#line 384 "Branch.c" + g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_SHOW_BRANCH_SIGNAL], 0, _tmp3_); +#line 394 "Branch.c" } gboolean sidebar_branch_get_show_branch (SidebarBranch* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 231 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE); #line 232 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -395,14 +405,14 @@ gboolean sidebar_branch_get_show_branch (SidebarBranch* self) { result = _tmp0_; #line 232 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 399 "Branch.c" +#line 409 "Branch.c" } gboolean sidebar_branch_is_auto_open_on_new_child (SidebarBranch* self) { gboolean result = FALSE; - SidebarBranchOptions _tmp0_ = 0; - gboolean _tmp1_ = FALSE; + SidebarBranchOptions _tmp0_; + gboolean _tmp1_; #line 235 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE); #line 236 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -413,14 +423,14 @@ gboolean sidebar_branch_is_auto_open_on_new_child (SidebarBranch* self) { result = _tmp1_; #line 236 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 417 "Branch.c" +#line 427 "Branch.c" } gboolean sidebar_branch_is_startup_expand_to_first_child (SidebarBranch* self) { gboolean result = FALSE; - SidebarBranchOptions _tmp0_ = 0; - gboolean _tmp1_ = FALSE; + SidebarBranchOptions _tmp0_; + gboolean _tmp1_; #line 239 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE); #line 240 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -431,14 +441,14 @@ gboolean sidebar_branch_is_startup_expand_to_first_child (SidebarBranch* self) { result = _tmp1_; #line 240 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 435 "Branch.c" +#line 445 "Branch.c" } gboolean sidebar_branch_is_startup_open_grouping (SidebarBranch* self) { gboolean result = FALSE; - SidebarBranchOptions _tmp0_ = 0; - gboolean _tmp1_ = FALSE; + SidebarBranchOptions _tmp0_; + gboolean _tmp1_; #line 243 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE); #line 244 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -449,33 +459,33 @@ gboolean sidebar_branch_is_startup_open_grouping (SidebarBranch* self) { result = _tmp1_; #line 244 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 453 "Branch.c" +#line 463 "Branch.c" } void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator) { - GeeHashMap* _tmp0_ = NULL; - SidebarEntry* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - GeeHashMap* _tmp3_ = NULL; - SidebarEntry* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - SidebarBranchOptions _tmp6_ = 0; - gboolean _tmp7_ = FALSE; + GeeHashMap* _tmp0_; + SidebarEntry* _tmp1_; + gboolean _tmp2_; + GeeHashMap* _tmp3_; + SidebarEntry* _tmp4_; + gboolean _tmp5_; + SidebarBranchOptions _tmp6_; + gboolean _tmp7_; SidebarBranchNode* parent_node = NULL; - GeeHashMap* _tmp8_ = NULL; - SidebarEntry* _tmp9_ = NULL; - gpointer _tmp10_ = NULL; + GeeHashMap* _tmp8_; + SidebarEntry* _tmp9_; + gpointer _tmp10_; GCompareFunc _tmp11_ = NULL; - GCompareFunc _tmp12_ = NULL; + GCompareFunc _tmp12_; SidebarBranchNode* entry_node = NULL; - SidebarEntry* _tmp15_ = NULL; - SidebarBranchNode* _tmp16_ = NULL; - SidebarBranchNode* _tmp17_ = NULL; - SidebarBranchNode* _tmp18_ = NULL; - GeeHashMap* _tmp19_ = NULL; - SidebarEntry* _tmp20_ = NULL; - SidebarEntry* _tmp21_ = NULL; + SidebarEntry* _tmp15_; + SidebarBranchNode* _tmp16_; + SidebarBranchNode* _tmp17_; + SidebarBranchNode* _tmp18_; + GeeHashMap* _tmp19_; + SidebarEntry* _tmp20_; + SidebarEntry* _tmp21_; #line 247 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); #line 247 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -506,7 +516,7 @@ void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEnt if (_tmp7_) { #line 253 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_set_show_branch (self, TRUE); -#line 510 "Branch.c" +#line 520 "Branch.c" } #line 255 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp8_ = self->priv->map; @@ -520,20 +530,20 @@ void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEnt _tmp12_ = comparator; #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (_tmp12_ != NULL) { -#line 524 "Branch.c" - GCompareFunc _tmp13_ = NULL; +#line 534 "Branch.c" + GCompareFunc _tmp13_; #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp13_ = comparator; #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp11_ = _tmp13_; -#line 530 "Branch.c" +#line 540 "Branch.c" } else { - GCompareFunc _tmp14_ = NULL; + GCompareFunc _tmp14_; #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp14_ = self->priv->default_comparator; #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp11_ = _tmp14_; -#line 537 "Branch.c" +#line 547 "Branch.c" } #line 256 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp15_ = entry; @@ -556,48 +566,48 @@ void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEnt #line 262 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp21_ = entry; #line 262 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - g_signal_emit_by_name (self, "entry-added", _tmp21_); + g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_ADDED_SIGNAL], 0, _tmp21_); #line 247 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (entry_node); #line 247 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (parent_node); -#line 565 "Branch.c" +#line 575 "Branch.c" } static void _sidebar_branch_prune_callback_sidebar_branch_node_prune_callback (SidebarBranchNode* node, gpointer self) { #line 272 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_prune_callback ((SidebarBranch*) self, node); -#line 572 "Branch.c" +#line 582 "Branch.c" } void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry) { - SidebarEntry* _tmp0_ = NULL; - SidebarBranchNode* _tmp1_ = NULL; - SidebarEntry* _tmp2_ = NULL; - GeeHashMap* _tmp3_ = NULL; - SidebarEntry* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + SidebarEntry* _tmp0_; + SidebarBranchNode* _tmp1_; + SidebarEntry* _tmp2_; + GeeHashMap* _tmp3_; + SidebarEntry* _tmp4_; + gboolean _tmp5_; SidebarBranchNode* entry_node = NULL; - GeeHashMap* _tmp6_ = NULL; - SidebarEntry* _tmp7_ = NULL; - gpointer _tmp8_ = NULL; - SidebarBranchNode* _tmp9_ = NULL; - SidebarBranchNode* _tmp10_ = NULL; - SidebarBranchNode* _tmp11_ = NULL; - SidebarBranchNode* _tmp12_ = NULL; - SidebarBranchNode* _tmp13_ = NULL; - SidebarBranchNode* _tmp14_ = NULL; + GeeHashMap* _tmp6_; + SidebarEntry* _tmp7_; + gpointer _tmp8_; + SidebarBranchNode* _tmp9_; + SidebarBranchNode* _tmp10_; + SidebarBranchNode* _tmp11_; + SidebarBranchNode* _tmp12_; + SidebarBranchNode* _tmp13_; + SidebarBranchNode* _tmp14_; gboolean removed = FALSE; - GeeHashMap* _tmp15_ = NULL; - SidebarEntry* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; - gboolean _tmp18_ = FALSE; - SidebarEntry* _tmp19_ = NULL; + GeeHashMap* _tmp15_; + SidebarEntry* _tmp16_; + gboolean _tmp17_; + gboolean _tmp18_; + SidebarEntry* _tmp19_; gboolean _tmp20_ = FALSE; - SidebarBranchOptions _tmp21_ = 0; - gboolean _tmp22_ = FALSE; + SidebarBranchOptions _tmp21_; + gboolean _tmp22_; #line 266 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); #line 266 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -659,65 +669,65 @@ void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry) { #line 280 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp19_ = entry; #line 280 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - g_signal_emit_by_name (self, "entry-removed", _tmp19_); + g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REMOVED_SIGNAL], 0, _tmp19_); #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp21_ = self->priv->options; #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp22_ = sidebar_branch_options_is_hide_if_empty (_tmp21_); #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (_tmp22_) { -#line 670 "Branch.c" - SidebarBranchNode* _tmp23_ = NULL; - gboolean _tmp24_ = FALSE; +#line 680 "Branch.c" + SidebarBranchNode* _tmp23_; + gboolean _tmp24_; #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp23_ = self->priv->root; #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp24_ = sidebar_branch_node_has_children (_tmp23_); #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp20_ = !_tmp24_; -#line 679 "Branch.c" +#line 689 "Branch.c" } else { #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp20_ = FALSE; -#line 683 "Branch.c" +#line 693 "Branch.c" } #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (_tmp20_) { #line 283 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_set_show_branch (self, FALSE); -#line 689 "Branch.c" +#line 699 "Branch.c" } #line 266 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (entry_node); -#line 693 "Branch.c" +#line 703 "Branch.c" } void sidebar_branch_reparent (SidebarBranch* self, SidebarEntry* new_parent, SidebarEntry* entry) { - SidebarEntry* _tmp0_ = NULL; - SidebarBranchNode* _tmp1_ = NULL; - SidebarEntry* _tmp2_ = NULL; - GeeHashMap* _tmp3_ = NULL; - SidebarEntry* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - GeeHashMap* _tmp6_ = NULL; - SidebarEntry* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + SidebarEntry* _tmp0_; + SidebarBranchNode* _tmp1_; + SidebarEntry* _tmp2_; + GeeHashMap* _tmp3_; + SidebarEntry* _tmp4_; + gboolean _tmp5_; + GeeHashMap* _tmp6_; + SidebarEntry* _tmp7_; + gboolean _tmp8_; SidebarBranchNode* entry_node = NULL; - GeeHashMap* _tmp9_ = NULL; - SidebarEntry* _tmp10_ = NULL; - gpointer _tmp11_ = NULL; + GeeHashMap* _tmp9_; + SidebarEntry* _tmp10_; + gpointer _tmp11_; SidebarBranchNode* new_parent_node = NULL; - GeeHashMap* _tmp12_ = NULL; - SidebarEntry* _tmp13_ = NULL; - gpointer _tmp14_ = NULL; - SidebarBranchNode* _tmp15_ = NULL; + GeeHashMap* _tmp12_; + SidebarEntry* _tmp13_; + gpointer _tmp14_; + SidebarBranchNode* _tmp15_; SidebarEntry* old_parent = NULL; - SidebarBranchNode* _tmp16_ = NULL; - SidebarEntry* _tmp17_ = NULL; - SidebarEntry* _tmp18_ = NULL; - SidebarBranchNode* _tmp19_ = NULL; - SidebarEntry* _tmp20_ = NULL; + SidebarBranchNode* _tmp16_; + SidebarEntry* _tmp17_; + SidebarEntry* _tmp18_; + SidebarBranchNode* _tmp19_; + SidebarEntry* _tmp20_; #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -785,23 +795,23 @@ void sidebar_branch_reparent (SidebarBranch* self, SidebarEntry* new_parent, Sid #line 301 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp20_ = entry; #line 301 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - g_signal_emit_by_name (self, "entry-reparented", _tmp20_, old_parent); + g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REPARENTED_SIGNAL], 0, _tmp20_, old_parent); #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (old_parent); #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (new_parent_node); #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (entry_node); -#line 796 "Branch.c" +#line 806 "Branch.c" } gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - SidebarBranchNode* _tmp1_ = NULL; - SidebarEntry* _tmp2_ = NULL; - SidebarEntry* _tmp3_ = NULL; + SidebarBranchNode* _tmp1_; + SidebarEntry* _tmp2_; + SidebarEntry* _tmp3_; #line 304 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE); #line 304 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -816,11 +826,11 @@ gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry) { if (_tmp2_ == _tmp3_) { #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp0_ = TRUE; -#line 820 "Branch.c" +#line 830 "Branch.c" } else { - GeeHashMap* _tmp4_ = NULL; - SidebarEntry* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + GeeHashMap* _tmp4_; + SidebarEntry* _tmp5_; + gboolean _tmp6_; #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp4_ = self->priv->map; #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -829,31 +839,31 @@ gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry) { _tmp6_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_); #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp0_ = _tmp6_; -#line 833 "Branch.c" +#line 843 "Branch.c" } #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = _tmp0_; #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 839 "Branch.c" +#line 849 "Branch.c" } void sidebar_branch_reorder (SidebarBranch* self, SidebarEntry* entry) { - SidebarEntry* _tmp0_ = NULL; - SidebarBranchNode* _tmp1_ = NULL; - SidebarEntry* _tmp2_ = NULL; + SidebarEntry* _tmp0_; + SidebarBranchNode* _tmp1_; + SidebarEntry* _tmp2_; SidebarBranchNode* entry_node = NULL; - GeeHashMap* _tmp3_ = NULL; - SidebarEntry* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - SidebarBranchNode* _tmp6_ = NULL; - SidebarBranchNode* _tmp7_ = NULL; - SidebarBranchNode* _tmp8_ = NULL; - SidebarBranchNode* _tmp9_ = NULL; - SidebarBranchNode* _tmp10_ = NULL; - SidebarBranchNode* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; + GeeHashMap* _tmp3_; + SidebarEntry* _tmp4_; + gpointer _tmp5_; + SidebarBranchNode* _tmp6_; + SidebarBranchNode* _tmp7_; + SidebarBranchNode* _tmp8_; + SidebarBranchNode* _tmp9_; + SidebarBranchNode* _tmp10_; + SidebarBranchNode* _tmp11_; + gboolean _tmp12_; #line 310 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); #line 310 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -894,45 +904,45 @@ void sidebar_branch_reorder (SidebarBranch* self, SidebarEntry* entry) { _tmp12_ = sidebar_branch_node_reorder_child (_tmp10_, _tmp11_); #line 317 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (_tmp12_) { -#line 898 "Branch.c" - SidebarEntry* _tmp13_ = NULL; +#line 908 "Branch.c" + SidebarEntry* _tmp13_; #line 318 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp13_ = entry; #line 318 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - g_signal_emit_by_name (self, "entry-moved", _tmp13_); -#line 904 "Branch.c" + g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_MOVED_SIGNAL], 0, _tmp13_); +#line 914 "Branch.c" } #line 310 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (entry_node); -#line 908 "Branch.c" +#line 918 "Branch.c" } static void _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback (SidebarBranchNode* node, gpointer self) { #line 323 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_children_reordered_callback ((SidebarBranch*) self, node); -#line 915 "Branch.c" +#line 925 "Branch.c" } void sidebar_branch_reorder_all (SidebarBranch* self) { - SidebarBranchNode* _tmp0_ = NULL; + SidebarBranchNode* _tmp0_; #line 322 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); #line 323 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp0_ = self->priv->root; #line 323 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_node_reorder_children (_tmp0_, TRUE, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self); -#line 927 "Branch.c" +#line 937 "Branch.c" } void sidebar_branch_reorder_children (SidebarBranch* self, SidebarEntry* entry, gboolean recursive) { SidebarBranchNode* entry_node = NULL; - GeeHashMap* _tmp0_ = NULL; - SidebarEntry* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + GeeHashMap* _tmp0_; + SidebarEntry* _tmp1_; + gpointer _tmp2_; + gboolean _tmp3_; #line 327 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); #line 327 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -953,13 +963,13 @@ void sidebar_branch_reorder_children (SidebarBranch* self, SidebarEntry* entry, sidebar_branch_node_reorder_children (entry_node, _tmp3_, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self); #line 327 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (entry_node); -#line 957 "Branch.c" +#line 967 "Branch.c" } void sidebar_branch_change_all_comparators (SidebarBranch* self, GCompareFunc comparator) { - SidebarBranchNode* _tmp0_ = NULL; - GCompareFunc _tmp1_ = NULL; + SidebarBranchNode* _tmp0_; + GCompareFunc _tmp1_; #line 334 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); #line 335 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -968,17 +978,17 @@ void sidebar_branch_change_all_comparators (SidebarBranch* self, GCompareFunc co _tmp1_ = comparator; #line 335 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_node_change_comparator (_tmp0_, _tmp1_, TRUE, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self); -#line 972 "Branch.c" +#line 982 "Branch.c" } void sidebar_branch_change_comparator (SidebarBranch* self, SidebarEntry* entry, gboolean recursive, GCompareFunc comparator) { SidebarBranchNode* entry_node = NULL; - GeeHashMap* _tmp0_ = NULL; - SidebarEntry* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; - GCompareFunc _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + GeeHashMap* _tmp0_; + SidebarEntry* _tmp1_; + gpointer _tmp2_; + GCompareFunc _tmp3_; + gboolean _tmp4_; #line 338 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); #line 338 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1001,20 +1011,20 @@ void sidebar_branch_change_comparator (SidebarBranch* self, SidebarEntry* entry, sidebar_branch_node_change_comparator (entry_node, _tmp3_, _tmp4_, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self); #line 338 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (entry_node); -#line 1005 "Branch.c" +#line 1015 "Branch.c" } gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent) { gint result = 0; SidebarBranchNode* parent_node = NULL; - GeeHashMap* _tmp0_ = NULL; - SidebarEntry* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; - SidebarBranchNode* _tmp3_ = NULL; + GeeHashMap* _tmp0_; + SidebarEntry* _tmp1_; + gpointer _tmp2_; + SidebarBranchNode* _tmp3_; gint _tmp4_ = 0; - SidebarBranchNode* _tmp5_ = NULL; - GeeSortedSet* _tmp6_ = NULL; + SidebarBranchNode* _tmp5_; + GeeSortedSet* _tmp6_; #line 346 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), 0); #line 346 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1037,11 +1047,11 @@ gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent) _tmp6_ = _tmp5_->children; #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (_tmp6_ != NULL) { -#line 1041 "Branch.c" - SidebarBranchNode* _tmp7_ = NULL; - GeeSortedSet* _tmp8_ = NULL; - gint _tmp9_ = 0; - gint _tmp10_ = 0; +#line 1051 "Branch.c" + SidebarBranchNode* _tmp7_; + GeeSortedSet* _tmp8_; + gint _tmp9_; + gint _tmp10_; #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp7_ = parent_node; #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1052,11 +1062,11 @@ gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent) _tmp10_ = _tmp9_; #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp4_ = _tmp10_; -#line 1056 "Branch.c" +#line 1066 "Branch.c" } else { #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp4_ = 0; -#line 1060 "Branch.c" +#line 1070 "Branch.c" } #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = _tmp4_; @@ -1064,23 +1074,23 @@ gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent) _sidebar_branch_node_unref0 (parent_node); #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1068 "Branch.c" +#line 1078 "Branch.c" } GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent) { GeeList* result = NULL; - GeeHashMap* _tmp0_ = NULL; - SidebarEntry* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GeeHashMap* _tmp0_; + SidebarEntry* _tmp1_; + gboolean _tmp2_; SidebarBranchNode* parent_node = NULL; - GeeHashMap* _tmp3_ = NULL; - SidebarEntry* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - SidebarBranchNode* _tmp6_ = NULL; - GeeSortedSet* _tmp7_ = NULL; + GeeHashMap* _tmp3_; + SidebarEntry* _tmp4_; + gpointer _tmp5_; + SidebarBranchNode* _tmp6_; + GeeSortedSet* _tmp7_; GeeList* child_entries = NULL; - GeeArrayList* _tmp8_ = NULL; + GeeArrayList* _tmp8_; #line 355 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL); #line 355 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1113,18 +1123,18 @@ GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent) _sidebar_branch_node_unref0 (parent_node); #line 360 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1117 "Branch.c" +#line 1127 "Branch.c" } #line 362 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp8_ = gee_array_list_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 362 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" child_entries = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_LIST, GeeList); -#line 1123 "Branch.c" +#line 1133 "Branch.c" { GeeIterator* _child_it = NULL; - SidebarBranchNode* _tmp9_ = NULL; - GeeSortedSet* _tmp10_ = NULL; - GeeIterator* _tmp11_ = NULL; + SidebarBranchNode* _tmp9_; + GeeSortedSet* _tmp10_; + GeeIterator* _tmp11_; #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp9_ = parent_node; #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1135,15 +1145,15 @@ GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent) _child_it = _tmp11_; #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" while (TRUE) { -#line 1139 "Branch.c" - GeeIterator* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; +#line 1149 "Branch.c" + GeeIterator* _tmp12_; + gboolean _tmp13_; SidebarBranchNode* child = NULL; - GeeIterator* _tmp14_ = NULL; - gpointer _tmp15_ = NULL; - GeeList* _tmp16_ = NULL; - SidebarBranchNode* _tmp17_ = NULL; - SidebarEntry* _tmp18_ = NULL; + GeeIterator* _tmp14_; + gpointer _tmp15_; + GeeList* _tmp16_; + SidebarBranchNode* _tmp17_; + SidebarEntry* _tmp18_; #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp12_ = _child_it; #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1152,7 +1162,7 @@ GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent) if (!_tmp13_) { #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" break; -#line 1156 "Branch.c" +#line 1166 "Branch.c" } #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp14_ = _child_it; @@ -1170,11 +1180,11 @@ GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent) gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), _tmp18_); #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (child); -#line 1174 "Branch.c" +#line 1184 "Branch.c" } #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (_child_it); -#line 1178 "Branch.c" +#line 1188 "Branch.c" } #line 366 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = child_entries; @@ -1182,19 +1192,19 @@ GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent) _sidebar_branch_node_unref0 (parent_node); #line 366 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1186 "Branch.c" +#line 1196 "Branch.c" } SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry* parent, Locator locator, void* locator_target) { SidebarEntry* result = NULL; SidebarBranchNode* parent_node = NULL; - GeeHashMap* _tmp0_ = NULL; - SidebarEntry* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; - SidebarBranchNode* _tmp3_ = NULL; - SidebarBranchNode* _tmp4_ = NULL; - GeeSortedSet* _tmp5_ = NULL; + GeeHashMap* _tmp0_; + SidebarEntry* _tmp1_; + gpointer _tmp2_; + SidebarBranchNode* _tmp3_; + SidebarBranchNode* _tmp4_; + GeeSortedSet* _tmp5_; #line 369 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL); #line 369 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1223,13 +1233,13 @@ SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry _sidebar_branch_node_unref0 (parent_node); #line 374 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1227 "Branch.c" +#line 1237 "Branch.c" } { GeeIterator* _child_it = NULL; - SidebarBranchNode* _tmp6_ = NULL; - GeeSortedSet* _tmp7_ = NULL; - GeeIterator* _tmp8_ = NULL; + SidebarBranchNode* _tmp6_; + GeeSortedSet* _tmp7_; + GeeIterator* _tmp8_; #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp6_ = parent_node; #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1240,17 +1250,17 @@ SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry _child_it = _tmp8_; #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" while (TRUE) { -#line 1244 "Branch.c" - GeeIterator* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; +#line 1254 "Branch.c" + GeeIterator* _tmp9_; + gboolean _tmp10_; SidebarBranchNode* child = NULL; - GeeIterator* _tmp11_ = NULL; - gpointer _tmp12_ = NULL; - Locator _tmp13_ = NULL; - void* _tmp13__target = NULL; - SidebarBranchNode* _tmp14_ = NULL; - SidebarEntry* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; + GeeIterator* _tmp11_; + gpointer _tmp12_; + Locator _tmp13_; + void* _tmp13__target; + SidebarBranchNode* _tmp14_; + SidebarEntry* _tmp15_; + gboolean _tmp16_; #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp9_ = _child_it; #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1259,7 +1269,7 @@ SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry if (!_tmp10_) { #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" break; -#line 1263 "Branch.c" +#line 1273 "Branch.c" } #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp11_ = _child_it; @@ -1279,10 +1289,10 @@ SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry _tmp16_ = _tmp13_ (_tmp15_, _tmp13__target); #line 377 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (_tmp16_) { -#line 1283 "Branch.c" - SidebarBranchNode* _tmp17_ = NULL; - SidebarEntry* _tmp18_ = NULL; - SidebarEntry* _tmp19_ = NULL; +#line 1293 "Branch.c" + SidebarBranchNode* _tmp17_; + SidebarEntry* _tmp18_; + SidebarEntry* _tmp19_; #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp17_ = child; #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1299,15 +1309,15 @@ SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry _sidebar_branch_node_unref0 (parent_node); #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1303 "Branch.c" +#line 1313 "Branch.c" } #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (child); -#line 1307 "Branch.c" +#line 1317 "Branch.c" } #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (_child_it); -#line 1311 "Branch.c" +#line 1321 "Branch.c" } #line 381 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = NULL; @@ -1315,26 +1325,26 @@ SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry _sidebar_branch_node_unref0 (parent_node); #line 381 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1319 "Branch.c" +#line 1329 "Branch.c" } SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entry) { SidebarEntry* result = NULL; - SidebarEntry* _tmp0_ = NULL; - SidebarBranchNode* _tmp1_ = NULL; - SidebarEntry* _tmp2_ = NULL; + SidebarEntry* _tmp0_; + SidebarBranchNode* _tmp1_; + SidebarEntry* _tmp2_; SidebarBranchNode* entry_node = NULL; - GeeHashMap* _tmp3_ = NULL; - SidebarEntry* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - SidebarBranchNode* _tmp6_ = NULL; - SidebarBranchNode* _tmp7_ = NULL; - SidebarBranchNode* _tmp8_ = NULL; - SidebarBranchNode* _tmp9_ = NULL; - SidebarBranchNode* _tmp10_ = NULL; - SidebarEntry* _tmp11_ = NULL; - SidebarEntry* _tmp12_ = NULL; + GeeHashMap* _tmp3_; + SidebarEntry* _tmp4_; + gpointer _tmp5_; + SidebarBranchNode* _tmp6_; + SidebarBranchNode* _tmp7_; + SidebarBranchNode* _tmp8_; + SidebarBranchNode* _tmp9_; + SidebarBranchNode* _tmp10_; + SidebarEntry* _tmp11_; + SidebarEntry* _tmp12_; #line 385 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL); #line 385 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1351,7 +1361,7 @@ SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entr result = NULL; #line 387 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1355 "Branch.c" +#line 1365 "Branch.c" } #line 389 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp3_ = self->priv->map; @@ -1385,34 +1395,34 @@ SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entr _sidebar_branch_node_unref0 (entry_node); #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1389 "Branch.c" +#line 1399 "Branch.c" } SidebarEntry* sidebar_branch_get_previous_sibling (SidebarBranch* self, SidebarEntry* entry) { SidebarEntry* result = NULL; - SidebarEntry* _tmp0_ = NULL; - SidebarBranchNode* _tmp1_ = NULL; - SidebarEntry* _tmp2_ = NULL; + SidebarEntry* _tmp0_; + SidebarBranchNode* _tmp1_; + SidebarEntry* _tmp2_; SidebarBranchNode* entry_node = NULL; - GeeHashMap* _tmp3_ = NULL; - SidebarEntry* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - SidebarBranchNode* _tmp6_ = NULL; - SidebarBranchNode* _tmp7_ = NULL; - SidebarBranchNode* _tmp8_ = NULL; - SidebarBranchNode* _tmp9_ = NULL; - SidebarBranchNode* _tmp10_ = NULL; - GeeSortedSet* _tmp11_ = NULL; + GeeHashMap* _tmp3_; + SidebarEntry* _tmp4_; + gpointer _tmp5_; + SidebarBranchNode* _tmp6_; + SidebarBranchNode* _tmp7_; + SidebarBranchNode* _tmp8_; + SidebarBranchNode* _tmp9_; + SidebarBranchNode* _tmp10_; + GeeSortedSet* _tmp11_; SidebarBranchNode* sibling = NULL; - SidebarBranchNode* _tmp12_ = NULL; - SidebarBranchNode* _tmp13_ = NULL; - GeeSortedSet* _tmp14_ = NULL; - SidebarBranchNode* _tmp15_ = NULL; - gpointer _tmp16_ = NULL; + SidebarBranchNode* _tmp12_; + SidebarBranchNode* _tmp13_; + GeeSortedSet* _tmp14_; + SidebarBranchNode* _tmp15_; + gpointer _tmp16_; SidebarEntry* _tmp17_ = NULL; - SidebarBranchNode* _tmp18_ = NULL; - SidebarEntry* _tmp21_ = NULL; + SidebarBranchNode* _tmp18_; + SidebarEntry* _tmp21_; #line 397 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL); #line 397 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1429,7 +1439,7 @@ SidebarEntry* sidebar_branch_get_previous_sibling (SidebarBranch* self, SidebarE result = NULL; #line 399 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1433 "Branch.c" +#line 1443 "Branch.c" } #line 401 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp3_ = self->priv->map; @@ -1473,20 +1483,20 @@ SidebarEntry* sidebar_branch_get_previous_sibling (SidebarBranch* self, SidebarE _tmp18_ = sibling; #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (_tmp18_ != NULL) { -#line 1477 "Branch.c" - SidebarBranchNode* _tmp19_ = NULL; - SidebarEntry* _tmp20_ = NULL; +#line 1487 "Branch.c" + SidebarBranchNode* _tmp19_; + SidebarEntry* _tmp20_; #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp19_ = sibling; #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp20_ = _tmp19_->entry; #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp17_ = _tmp20_; -#line 1486 "Branch.c" +#line 1496 "Branch.c" } else { #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp17_ = NULL; -#line 1490 "Branch.c" +#line 1500 "Branch.c" } #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp21_ = _g_object_ref0 (_tmp17_); @@ -1498,34 +1508,34 @@ SidebarEntry* sidebar_branch_get_previous_sibling (SidebarBranch* self, SidebarE _sidebar_branch_node_unref0 (entry_node); #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1502 "Branch.c" +#line 1512 "Branch.c" } SidebarEntry* sidebar_branch_get_next_sibling (SidebarBranch* self, SidebarEntry* entry) { SidebarEntry* result = NULL; - SidebarEntry* _tmp0_ = NULL; - SidebarBranchNode* _tmp1_ = NULL; - SidebarEntry* _tmp2_ = NULL; + SidebarEntry* _tmp0_; + SidebarBranchNode* _tmp1_; + SidebarEntry* _tmp2_; SidebarBranchNode* entry_node = NULL; - GeeHashMap* _tmp3_ = NULL; - SidebarEntry* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - SidebarBranchNode* _tmp6_ = NULL; - SidebarBranchNode* _tmp7_ = NULL; - SidebarBranchNode* _tmp8_ = NULL; - SidebarBranchNode* _tmp9_ = NULL; - SidebarBranchNode* _tmp10_ = NULL; - GeeSortedSet* _tmp11_ = NULL; + GeeHashMap* _tmp3_; + SidebarEntry* _tmp4_; + gpointer _tmp5_; + SidebarBranchNode* _tmp6_; + SidebarBranchNode* _tmp7_; + SidebarBranchNode* _tmp8_; + SidebarBranchNode* _tmp9_; + SidebarBranchNode* _tmp10_; + GeeSortedSet* _tmp11_; SidebarBranchNode* sibling = NULL; - SidebarBranchNode* _tmp12_ = NULL; - SidebarBranchNode* _tmp13_ = NULL; - GeeSortedSet* _tmp14_ = NULL; - SidebarBranchNode* _tmp15_ = NULL; - gpointer _tmp16_ = NULL; + SidebarBranchNode* _tmp12_; + SidebarBranchNode* _tmp13_; + GeeSortedSet* _tmp14_; + SidebarBranchNode* _tmp15_; + gpointer _tmp16_; SidebarEntry* _tmp17_ = NULL; - SidebarBranchNode* _tmp18_ = NULL; - SidebarEntry* _tmp21_ = NULL; + SidebarBranchNode* _tmp18_; + SidebarEntry* _tmp21_; #line 412 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL); #line 412 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1542,7 +1552,7 @@ SidebarEntry* sidebar_branch_get_next_sibling (SidebarBranch* self, SidebarEntry result = NULL; #line 414 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1546 "Branch.c" +#line 1556 "Branch.c" } #line 416 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp3_ = self->priv->map; @@ -1586,20 +1596,20 @@ SidebarEntry* sidebar_branch_get_next_sibling (SidebarBranch* self, SidebarEntry _tmp18_ = sibling; #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (_tmp18_ != NULL) { -#line 1590 "Branch.c" - SidebarBranchNode* _tmp19_ = NULL; - SidebarEntry* _tmp20_ = NULL; +#line 1600 "Branch.c" + SidebarBranchNode* _tmp19_; + SidebarEntry* _tmp20_; #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp19_ = sibling; #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp20_ = _tmp19_->entry; #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp17_ = _tmp20_; -#line 1599 "Branch.c" +#line 1609 "Branch.c" } else { #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp17_ = NULL; -#line 1603 "Branch.c" +#line 1613 "Branch.c" } #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp21_ = _g_object_ref0 (_tmp17_); @@ -1611,13 +1621,13 @@ SidebarEntry* sidebar_branch_get_next_sibling (SidebarBranch* self, SidebarEntry _sidebar_branch_node_unref0 (entry_node); #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1615 "Branch.c" +#line 1625 "Branch.c" } static void sidebar_branch_prune_callback (SidebarBranch* self, SidebarBranchNode* node) { - SidebarBranchNode* _tmp0_ = NULL; - SidebarEntry* _tmp1_ = NULL; + SidebarBranchNode* _tmp0_; + SidebarEntry* _tmp1_; #line 426 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); #line 426 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1627,14 +1637,14 @@ static void sidebar_branch_prune_callback (SidebarBranch* self, SidebarBranchNod #line 427 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp1_ = _tmp0_->entry; #line 427 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - g_signal_emit_by_name (self, "entry-removed", _tmp1_); -#line 1632 "Branch.c" + g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REMOVED_SIGNAL], 0, _tmp1_); +#line 1642 "Branch.c" } static void sidebar_branch_children_reordered_callback (SidebarBranch* self, SidebarBranchNode* node) { - SidebarBranchNode* _tmp0_ = NULL; - SidebarEntry* _tmp1_ = NULL; + SidebarBranchNode* _tmp0_; + SidebarEntry* _tmp1_; #line 430 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (self)); #line 430 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1644,8 +1654,8 @@ static void sidebar_branch_children_reordered_callback (SidebarBranch* self, Sid #line 431 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp1_ = _tmp0_->entry; #line 431 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - g_signal_emit_by_name (self, "children-reordered", _tmp1_); -#line 1649 "Branch.c" + g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_CHILDREN_REORDERED_SIGNAL], 0, _tmp1_); +#line 1659 "Branch.c" } @@ -1664,28 +1674,28 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa data1 = closure->data; #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" data2 = param_values->data[0].v_pointer; -#line 1668 "Branch.c" +#line 1678 "Branch.c" } else { #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" data1 = param_values->data[0].v_pointer; #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" data2 = closure->data; -#line 1674 "Branch.c" +#line 1684 "Branch.c" } #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 1680 "Branch.c" +#line 1690 "Branch.c" } static SidebarBranchNode* sidebar_branch_node_construct (GType object_type, SidebarEntry* entry, SidebarBranchNode* parent, GCompareFunc comparator) { SidebarBranchNode* self = NULL; - SidebarEntry* _tmp0_ = NULL; - SidebarEntry* _tmp1_ = NULL; - SidebarBranchNode* _tmp2_ = NULL; - GCompareFunc _tmp3_ = NULL; + SidebarEntry* _tmp0_; + SidebarEntry* _tmp1_; + SidebarBranchNode* _tmp2_; + GCompareFunc _tmp3_; #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL); #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1710,33 +1720,33 @@ static SidebarBranchNode* sidebar_branch_node_construct (GType object_type, Side self->comparator = _tmp3_; #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return self; -#line 1714 "Branch.c" +#line 1724 "Branch.c" } static SidebarBranchNode* sidebar_branch_node_new (SidebarEntry* entry, SidebarBranchNode* parent, GCompareFunc comparator) { #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return sidebar_branch_node_construct (SIDEBAR_BRANCH_TYPE_NODE, entry, parent, comparator); -#line 1721 "Branch.c" +#line 1731 "Branch.c" } static gint sidebar_branch_node_comparator_wrapper (SidebarBranchNode* anode, SidebarBranchNode* bnode) { gint result = 0; - SidebarBranchNode* _tmp0_ = NULL; - SidebarBranchNode* _tmp1_ = NULL; - SidebarBranchNode* _tmp2_ = NULL; - SidebarBranchNode* _tmp3_ = NULL; - SidebarBranchNode* _tmp4_ = NULL; - SidebarBranchNode* _tmp5_ = NULL; - SidebarBranchNode* _tmp6_ = NULL; - SidebarBranchNode* _tmp7_ = NULL; - GCompareFunc _tmp8_ = NULL; - SidebarBranchNode* _tmp9_ = NULL; - SidebarEntry* _tmp10_ = NULL; - SidebarBranchNode* _tmp11_ = NULL; - SidebarEntry* _tmp12_ = NULL; - gint _tmp13_ = 0; + SidebarBranchNode* _tmp0_; + SidebarBranchNode* _tmp1_; + SidebarBranchNode* _tmp2_; + SidebarBranchNode* _tmp3_; + SidebarBranchNode* _tmp4_; + SidebarBranchNode* _tmp5_; + SidebarBranchNode* _tmp6_; + SidebarBranchNode* _tmp7_; + GCompareFunc _tmp8_; + SidebarBranchNode* _tmp9_; + SidebarEntry* _tmp10_; + SidebarBranchNode* _tmp11_; + SidebarEntry* _tmp12_; + gint _tmp13_; #line 51 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_BRANCH_IS_NODE (anode), 0); #line 51 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1751,7 +1761,7 @@ static gint sidebar_branch_node_comparator_wrapper (SidebarBranchNode* anode, Si result = 0; #line 53 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1755 "Branch.c" +#line 1765 "Branch.c" } #line 55 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp2_ = anode; @@ -1783,24 +1793,24 @@ static gint sidebar_branch_node_comparator_wrapper (SidebarBranchNode* anode, Si result = _tmp13_; #line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1787 "Branch.c" +#line 1797 "Branch.c" } static gboolean sidebar_branch_node_has_children (SidebarBranchNode* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - GeeSortedSet* _tmp1_ = NULL; + GeeSortedSet* _tmp1_; #line 60 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_BRANCH_IS_NODE (self), FALSE); #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp1_ = self->children; #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (_tmp1_ != NULL) { -#line 1801 "Branch.c" - GeeSortedSet* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; +#line 1811 "Branch.c" + GeeSortedSet* _tmp2_; + gint _tmp3_; + gint _tmp4_; #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp2_ = self->children; #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1809,17 +1819,17 @@ static gboolean sidebar_branch_node_has_children (SidebarBranchNode* self) { _tmp4_ = _tmp3_; #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp0_ = _tmp4_ > 0; -#line 1813 "Branch.c" +#line 1823 "Branch.c" } else { #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp0_ = FALSE; -#line 1817 "Branch.c" +#line 1827 "Branch.c" } #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = _tmp0_; #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1823 "Branch.c" +#line 1833 "Branch.c" } @@ -1828,17 +1838,17 @@ static gint _sidebar_branch_node_comparator_wrapper_gcompare_data_func (gconstpo result = sidebar_branch_node_comparator_wrapper ((SidebarBranchNode*) a, (SidebarBranchNode*) b); #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 1832 "Branch.c" +#line 1842 "Branch.c" } static void sidebar_branch_node_add_child (SidebarBranchNode* self, SidebarBranchNode* child) { - SidebarBranchNode* _tmp0_ = NULL; - GeeSortedSet* _tmp1_ = NULL; + SidebarBranchNode* _tmp0_; + GeeSortedSet* _tmp1_; gboolean added = FALSE; - GeeSortedSet* _tmp3_ = NULL; - SidebarBranchNode* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + GeeSortedSet* _tmp3_; + SidebarBranchNode* _tmp4_; + gboolean _tmp5_; #line 64 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self)); #line 64 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1851,15 +1861,15 @@ static void sidebar_branch_node_add_child (SidebarBranchNode* self, SidebarBranc _tmp1_ = self->children; #line 67 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (_tmp1_ == NULL) { -#line 1855 "Branch.c" - GeeTreeSet* _tmp2_ = NULL; +#line 1865 "Branch.c" + GeeTreeSet* _tmp2_; #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp2_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL); #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (self->children); #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self->children = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_SORTED_SET, GeeSortedSet); -#line 1863 "Branch.c" +#line 1873 "Branch.c" } #line 70 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp3_ = self->children; @@ -1871,20 +1881,20 @@ static void sidebar_branch_node_add_child (SidebarBranchNode* self, SidebarBranc added = _tmp5_; #line 71 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _vala_assert (added, "added"); -#line 1875 "Branch.c" +#line 1885 "Branch.c" } static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBranchNode* child) { - GeeSortedSet* _tmp0_ = NULL; + GeeSortedSet* _tmp0_; GeeSortedSet* new_children = NULL; - GeeTreeSet* _tmp1_ = NULL; + GeeTreeSet* _tmp1_; gboolean found = FALSE; - gboolean _tmp12_ = FALSE; - GeeSortedSet* _tmp13_ = NULL; - gint _tmp14_ = 0; - gint _tmp15_ = 0; - SidebarBranchNode* _tmp18_ = NULL; + gboolean _tmp12_; + GeeSortedSet* _tmp13_; + gint _tmp14_; + gint _tmp15_; + SidebarBranchNode* _tmp18_; #line 74 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self)); #line 74 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1899,11 +1909,11 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr new_children = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet); #line 81 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" found = FALSE; -#line 1903 "Branch.c" +#line 1913 "Branch.c" { GeeIterator* _c_it = NULL; - GeeSortedSet* _tmp2_ = NULL; - GeeIterator* _tmp3_ = NULL; + GeeSortedSet* _tmp2_; + GeeIterator* _tmp3_; #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp2_ = self->children; #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1912,14 +1922,14 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr _c_it = _tmp3_; #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" while (TRUE) { -#line 1916 "Branch.c" - GeeIterator* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; +#line 1926 "Branch.c" + GeeIterator* _tmp4_; + gboolean _tmp5_; SidebarBranchNode* c = NULL; - GeeIterator* _tmp6_ = NULL; - gpointer _tmp7_ = NULL; - SidebarBranchNode* _tmp8_ = NULL; - SidebarBranchNode* _tmp9_ = NULL; + GeeIterator* _tmp6_; + gpointer _tmp7_; + SidebarBranchNode* _tmp8_; + SidebarBranchNode* _tmp9_; #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp4_ = _c_it; #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1928,7 +1938,7 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr if (!_tmp5_) { #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" break; -#line 1932 "Branch.c" +#line 1942 "Branch.c" } #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp6_ = _c_it; @@ -1942,28 +1952,28 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr _tmp9_ = child; #line 83 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (_tmp8_ != _tmp9_) { -#line 1946 "Branch.c" - GeeSortedSet* _tmp10_ = NULL; - SidebarBranchNode* _tmp11_ = NULL; +#line 1956 "Branch.c" + GeeSortedSet* _tmp10_; + SidebarBranchNode* _tmp11_; #line 84 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp10_ = new_children; #line 84 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp11_ = c; #line 84 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_); -#line 1955 "Branch.c" +#line 1965 "Branch.c" } else { #line 86 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" found = TRUE; -#line 1959 "Branch.c" +#line 1969 "Branch.c" } #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (c); -#line 1963 "Branch.c" +#line 1973 "Branch.c" } #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (_c_it); -#line 1967 "Branch.c" +#line 1977 "Branch.c" } #line 89 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp12_ = found; @@ -1977,9 +1987,9 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr _tmp15_ = _tmp14_; #line 91 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (_tmp15_ != 0) { -#line 1981 "Branch.c" - GeeSortedSet* _tmp16_ = NULL; - GeeSortedSet* _tmp17_ = NULL; +#line 1991 "Branch.c" + GeeSortedSet* _tmp16_; + GeeSortedSet* _tmp17_; #line 92 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp16_ = new_children; #line 92 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -1988,13 +1998,13 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr _g_object_unref0 (self->children); #line 92 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self->children = _tmp17_; -#line 1992 "Branch.c" +#line 2002 "Branch.c" } else { #line 94 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (self->children); #line 94 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self->children = NULL; -#line 1998 "Branch.c" +#line 2008 "Branch.c" } #line 96 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp18_ = child; @@ -2002,15 +2012,15 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr _tmp18_->parent = NULL; #line 74 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (new_children); -#line 2006 "Branch.c" +#line 2016 "Branch.c" } static void sidebar_branch_node_prune_children (SidebarBranchNode* self, SidebarBranchNodePruneCallback cb, void* cb_target) { - GeeSortedSet* _tmp0_ = NULL; + GeeSortedSet* _tmp0_; GeeSortedSet* old_children = NULL; - GeeSortedSet* _tmp9_ = NULL; - GeeSortedSet* _tmp10_ = NULL; + GeeSortedSet* _tmp9_; + GeeSortedSet* _tmp10_; #line 99 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self)); #line 100 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2019,12 +2029,12 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar if (_tmp0_ == NULL) { #line 101 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return; -#line 2023 "Branch.c" +#line 2033 "Branch.c" } { GeeIterator* _child_it = NULL; - GeeSortedSet* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeSortedSet* _tmp1_; + GeeIterator* _tmp2_; #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp1_ = self->children; #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2033,15 +2043,15 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar _child_it = _tmp2_; #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" while (TRUE) { -#line 2037 "Branch.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 2047 "Branch.c" + GeeIterator* _tmp3_; + gboolean _tmp4_; SidebarBranchNode* child = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; - SidebarBranchNode* _tmp7_ = NULL; - SidebarBranchNodePruneCallback _tmp8_ = NULL; - void* _tmp8__target = NULL; + GeeIterator* _tmp5_; + gpointer _tmp6_; + SidebarBranchNode* _tmp7_; + SidebarBranchNodePruneCallback _tmp8_; + void* _tmp8__target; #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp3_ = _child_it; #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2050,7 +2060,7 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar if (!_tmp4_) { #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" break; -#line 2054 "Branch.c" +#line 2064 "Branch.c" } #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp5_ = _child_it; @@ -2068,11 +2078,11 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar sidebar_branch_node_prune_children (_tmp7_, _tmp8_, _tmp8__target); #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (child); -#line 2072 "Branch.c" +#line 2082 "Branch.c" } #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (_child_it); -#line 2076 "Branch.c" +#line 2086 "Branch.c" } #line 106 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp9_ = self->children; @@ -2084,11 +2094,11 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar _g_object_unref0 (self->children); #line 107 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self->children = NULL; -#line 2088 "Branch.c" +#line 2098 "Branch.c" { GeeIterator* _child_it = NULL; - GeeSortedSet* _tmp11_ = NULL; - GeeIterator* _tmp12_ = NULL; + GeeSortedSet* _tmp11_; + GeeIterator* _tmp12_; #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp11_ = old_children; #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2097,15 +2107,15 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar _child_it = _tmp12_; #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" while (TRUE) { -#line 2101 "Branch.c" - GeeIterator* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; +#line 2111 "Branch.c" + GeeIterator* _tmp13_; + gboolean _tmp14_; SidebarBranchNode* child = NULL; - GeeIterator* _tmp15_ = NULL; - gpointer _tmp16_ = NULL; - SidebarBranchNodePruneCallback _tmp17_ = NULL; - void* _tmp17__target = NULL; - SidebarBranchNode* _tmp18_ = NULL; + GeeIterator* _tmp15_; + gpointer _tmp16_; + SidebarBranchNodePruneCallback _tmp17_; + void* _tmp17__target; + SidebarBranchNode* _tmp18_; #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp13_ = _child_it; #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2114,7 +2124,7 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar if (!_tmp14_) { #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" break; -#line 2118 "Branch.c" +#line 2128 "Branch.c" } #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp15_ = _child_it; @@ -2132,21 +2142,21 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar _tmp17_ (_tmp18_, _tmp17__target); #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (child); -#line 2136 "Branch.c" +#line 2146 "Branch.c" } #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (_child_it); -#line 2140 "Branch.c" +#line 2150 "Branch.c" } #line 99 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (old_children); -#line 2144 "Branch.c" +#line 2154 "Branch.c" } static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self, SidebarBranchNode* child) { gint result = 0; - GeeSortedSet* _tmp0_ = NULL; + GeeSortedSet* _tmp0_; gint index = 0; #line 118 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_BRANCH_IS_NODE (self), 0); @@ -2160,15 +2170,15 @@ static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self, result = -1; #line 120 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 2164 "Branch.c" +#line 2174 "Branch.c" } #line 122 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" index = 0; -#line 2168 "Branch.c" +#line 2178 "Branch.c" { GeeIterator* _c_it = NULL; - GeeSortedSet* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeSortedSet* _tmp1_; + GeeIterator* _tmp2_; #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp1_ = self->children; #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2177,15 +2187,15 @@ static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self, _c_it = _tmp2_; #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" while (TRUE) { -#line 2181 "Branch.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 2191 "Branch.c" + GeeIterator* _tmp3_; + gboolean _tmp4_; SidebarBranchNode* c = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; - SidebarBranchNode* _tmp7_ = NULL; - SidebarBranchNode* _tmp8_ = NULL; - gint _tmp9_ = 0; + GeeIterator* _tmp5_; + gpointer _tmp6_; + SidebarBranchNode* _tmp7_; + SidebarBranchNode* _tmp8_; + gint _tmp9_; #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp3_ = _c_it; #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2194,7 +2204,7 @@ static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self, if (!_tmp4_) { #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" break; -#line 2198 "Branch.c" +#line 2208 "Branch.c" } #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp5_ = _c_it; @@ -2216,7 +2226,7 @@ static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self, _g_object_unref0 (_c_it); #line 125 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 2220 "Branch.c" +#line 2230 "Branch.c" } #line 127 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp9_ = index; @@ -2224,35 +2234,35 @@ static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self, index = _tmp9_ + 1; #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (c); -#line 2228 "Branch.c" +#line 2238 "Branch.c" } #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (_c_it); -#line 2232 "Branch.c" +#line 2242 "Branch.c" } #line 130 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" result = -1; #line 130 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 2238 "Branch.c" +#line 2248 "Branch.c" } static gboolean sidebar_branch_node_reorder_child (SidebarBranchNode* self, SidebarBranchNode* child) { gboolean result = FALSE; - GeeSortedSet* _tmp0_ = NULL; + GeeSortedSet* _tmp0_; gint old_index = 0; - SidebarBranchNode* _tmp1_ = NULL; - gint _tmp2_ = 0; + SidebarBranchNode* _tmp1_; + gint _tmp2_; GeeSortedSet* new_children = NULL; - GeeTreeSet* _tmp3_ = NULL; + GeeTreeSet* _tmp3_; gboolean added = FALSE; - GeeSortedSet* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - GeeSortedSet* _tmp6_ = NULL; + GeeSortedSet* _tmp4_; + gboolean _tmp5_; + GeeSortedSet* _tmp6_; gint new_index = 0; - SidebarBranchNode* _tmp7_ = NULL; - gint _tmp8_ = 0; + SidebarBranchNode* _tmp7_; + gint _tmp8_; #line 134 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_val_if_fail (SIDEBAR_BRANCH_IS_NODE (self), FALSE); #line 134 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2301,21 +2311,21 @@ static gboolean sidebar_branch_node_reorder_child (SidebarBranchNode* self, Side _g_object_unref0 (new_children); #line 155 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return result; -#line 2305 "Branch.c" +#line 2315 "Branch.c" } static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gboolean recursive, SidebarBranchNodeChildrenReorderedCallback cb, void* cb_target) { - GeeSortedSet* _tmp0_ = NULL; + GeeSortedSet* _tmp0_; GeeSortedSet* reordered = NULL; - GeeTreeSet* _tmp1_ = NULL; - GeeSortedSet* _tmp2_ = NULL; - GeeSortedSet* _tmp3_ = NULL; - GeeSortedSet* _tmp4_ = NULL; - GeeSortedSet* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - SidebarBranchNodeChildrenReorderedCallback _tmp15_ = NULL; - void* _tmp15__target = NULL; + GeeTreeSet* _tmp1_; + GeeSortedSet* _tmp2_; + GeeSortedSet* _tmp3_; + GeeSortedSet* _tmp4_; + GeeSortedSet* _tmp5_; + gboolean _tmp6_; + SidebarBranchNodeChildrenReorderedCallback _tmp15_; + void* _tmp15__target; #line 158 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self)); #line 159 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2324,7 +2334,7 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool if (_tmp0_ == NULL) { #line 160 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return; -#line 2328 "Branch.c" +#line 2338 "Branch.c" } #line 162 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp1_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL); @@ -2348,11 +2358,11 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool _tmp6_ = recursive; #line 166 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (_tmp6_) { -#line 2352 "Branch.c" +#line 2362 "Branch.c" { GeeIterator* _child_it = NULL; - GeeSortedSet* _tmp7_ = NULL; - GeeIterator* _tmp8_ = NULL; + GeeSortedSet* _tmp7_; + GeeIterator* _tmp8_; #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp7_ = self->children; #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2361,15 +2371,15 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool _child_it = _tmp8_; #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" while (TRUE) { -#line 2365 "Branch.c" - GeeIterator* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; +#line 2375 "Branch.c" + GeeIterator* _tmp9_; + gboolean _tmp10_; SidebarBranchNode* child = NULL; - GeeIterator* _tmp11_ = NULL; - gpointer _tmp12_ = NULL; - SidebarBranchNode* _tmp13_ = NULL; - SidebarBranchNodeChildrenReorderedCallback _tmp14_ = NULL; - void* _tmp14__target = NULL; + GeeIterator* _tmp11_; + gpointer _tmp12_; + SidebarBranchNode* _tmp13_; + SidebarBranchNodeChildrenReorderedCallback _tmp14_; + void* _tmp14__target; #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp9_ = _child_it; #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2378,7 +2388,7 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool if (!_tmp10_) { #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" break; -#line 2382 "Branch.c" +#line 2392 "Branch.c" } #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp11_ = _child_it; @@ -2396,11 +2406,11 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool sidebar_branch_node_reorder_children (_tmp13_, TRUE, _tmp14_, _tmp14__target); #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (child); -#line 2400 "Branch.c" +#line 2410 "Branch.c" } #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (_child_it); -#line 2404 "Branch.c" +#line 2414 "Branch.c" } } #line 171 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2411,15 +2421,15 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool _tmp15_ (self, _tmp15__target); #line 158 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (reordered); -#line 2415 "Branch.c" +#line 2425 "Branch.c" } static void sidebar_branch_node_change_comparator (SidebarBranchNode* self, GCompareFunc comparator, gboolean recursive, SidebarBranchNodeChildrenReorderedCallback cb, void* cb_target) { - GCompareFunc _tmp0_ = NULL; - SidebarBranchNodeChildrenReorderedCallback _tmp1_ = NULL; - void* _tmp1__target = NULL; - gboolean _tmp2_ = FALSE; + GCompareFunc _tmp0_; + SidebarBranchNodeChildrenReorderedCallback _tmp1_; + void* _tmp1__target; + gboolean _tmp2_; #line 174 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self)); #line 176 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2436,11 +2446,11 @@ static void sidebar_branch_node_change_comparator (SidebarBranchNode* self, GCom _tmp2_ = recursive; #line 181 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (_tmp2_) { -#line 2440 "Branch.c" +#line 2450 "Branch.c" { GeeIterator* _child_it = NULL; - GeeSortedSet* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; + GeeSortedSet* _tmp3_; + GeeIterator* _tmp4_; #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp3_ = self->children; #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2449,16 +2459,16 @@ static void sidebar_branch_node_change_comparator (SidebarBranchNode* self, GCom _child_it = _tmp4_; #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" while (TRUE) { -#line 2453 "Branch.c" - GeeIterator* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; +#line 2463 "Branch.c" + GeeIterator* _tmp5_; + gboolean _tmp6_; SidebarBranchNode* child = NULL; - GeeIterator* _tmp7_ = NULL; - gpointer _tmp8_ = NULL; - SidebarBranchNode* _tmp9_ = NULL; - GCompareFunc _tmp10_ = NULL; - SidebarBranchNodeChildrenReorderedCallback _tmp11_ = NULL; - void* _tmp11__target = NULL; + GeeIterator* _tmp7_; + gpointer _tmp8_; + SidebarBranchNode* _tmp9_; + GCompareFunc _tmp10_; + SidebarBranchNodeChildrenReorderedCallback _tmp11_; + void* _tmp11__target; #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp5_ = _child_it; #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2467,7 +2477,7 @@ static void sidebar_branch_node_change_comparator (SidebarBranchNode* self, GCom if (!_tmp6_) { #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" break; -#line 2471 "Branch.c" +#line 2481 "Branch.c" } #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _tmp7_ = _child_it; @@ -2487,11 +2497,11 @@ static void sidebar_branch_node_change_comparator (SidebarBranchNode* self, GCom sidebar_branch_node_change_comparator (_tmp9_, _tmp10_, TRUE, _tmp11_, _tmp11__target); #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _sidebar_branch_node_unref0 (child); -#line 2491 "Branch.c" +#line 2501 "Branch.c" } #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (_child_it); -#line 2495 "Branch.c" +#line 2505 "Branch.c" } } } @@ -2500,7 +2510,7 @@ static void sidebar_branch_node_change_comparator (SidebarBranchNode* self, GCom static void sidebar_branch_value_node_init (GValue* value) { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" value->data[0].v_pointer = NULL; -#line 2504 "Branch.c" +#line 2514 "Branch.c" } @@ -2509,7 +2519,7 @@ static void sidebar_branch_value_node_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_node_unref (value->data[0].v_pointer); -#line 2513 "Branch.c" +#line 2523 "Branch.c" } } @@ -2519,11 +2529,11 @@ static void sidebar_branch_value_node_copy_value (const GValue* src_value, GValu if (src_value->data[0].v_pointer) { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" dest_value->data[0].v_pointer = sidebar_branch_node_ref (src_value->data[0].v_pointer); -#line 2523 "Branch.c" +#line 2533 "Branch.c" } else { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" dest_value->data[0].v_pointer = NULL; -#line 2527 "Branch.c" +#line 2537 "Branch.c" } } @@ -2531,66 +2541,66 @@ static void sidebar_branch_value_node_copy_value (const GValue* src_value, GValu static gpointer sidebar_branch_value_node_peek_pointer (const GValue* value) { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return value->data[0].v_pointer; -#line 2535 "Branch.c" +#line 2545 "Branch.c" } static gchar* sidebar_branch_value_node_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (collect_values[0].v_pointer) { -#line 2542 "Branch.c" - SidebarBranchNode* object; +#line 2552 "Branch.c" + SidebarBranchNode * object; object = collect_values[0].v_pointer; #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (object->parent_instance.g_class == NULL) { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2549 "Branch.c" +#line 2559 "Branch.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.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 2553 "Branch.c" +#line 2563 "Branch.c" } #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" value->data[0].v_pointer = sidebar_branch_node_ref (object); -#line 2557 "Branch.c" +#line 2567 "Branch.c" } else { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" value->data[0].v_pointer = NULL; -#line 2561 "Branch.c" +#line 2571 "Branch.c" } #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return NULL; -#line 2565 "Branch.c" +#line 2575 "Branch.c" } static gchar* sidebar_branch_value_node_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - SidebarBranchNode** object_p; + SidebarBranchNode ** object_p; object_p = collect_values[0].v_pointer; #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (!object_p) { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2576 "Branch.c" +#line 2586 "Branch.c" } #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (!value->data[0].v_pointer) { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" *object_p = NULL; -#line 2582 "Branch.c" +#line 2592 "Branch.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" *object_p = value->data[0].v_pointer; -#line 2586 "Branch.c" +#line 2596 "Branch.c" } else { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" *object_p = sidebar_branch_node_ref (value->data[0].v_pointer); -#line 2590 "Branch.c" +#line 2600 "Branch.c" } #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return NULL; -#line 2594 "Branch.c" +#line 2604 "Branch.c" } @@ -2604,7 +2614,7 @@ static GParamSpec* sidebar_branch_param_spec_node (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return G_PARAM_SPEC (spec); -#line 2608 "Branch.c" +#line 2618 "Branch.c" } @@ -2613,12 +2623,12 @@ static gpointer sidebar_branch_value_get_node (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SIDEBAR_BRANCH_TYPE_NODE), NULL); #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return value->data[0].v_pointer; -#line 2617 "Branch.c" +#line 2627 "Branch.c" } static void sidebar_branch_value_set_node (GValue* value, gpointer v_object) { - SidebarBranchNode* old; + SidebarBranchNode * old; #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SIDEBAR_BRANCH_TYPE_NODE)); #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2633,23 +2643,23 @@ static void sidebar_branch_value_set_node (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_node_ref (value->data[0].v_pointer); -#line 2637 "Branch.c" +#line 2647 "Branch.c" } else { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" value->data[0].v_pointer = NULL; -#line 2641 "Branch.c" +#line 2651 "Branch.c" } #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (old) { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_node_unref (old); -#line 2647 "Branch.c" +#line 2657 "Branch.c" } } static void sidebar_branch_value_take_node (GValue* value, gpointer v_object) { - SidebarBranchNode* old; + SidebarBranchNode * old; #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SIDEBAR_BRANCH_TYPE_NODE)); #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2662,17 +2672,17 @@ static void sidebar_branch_value_take_node (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" value->data[0].v_pointer = v_object; -#line 2666 "Branch.c" +#line 2676 "Branch.c" } else { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" value->data[0].v_pointer = NULL; -#line 2670 "Branch.c" +#line 2680 "Branch.c" } #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (old) { #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" sidebar_branch_node_unref (old); -#line 2676 "Branch.c" +#line 2686 "Branch.c" } } @@ -2682,7 +2692,7 @@ static void sidebar_branch_node_class_init (SidebarBranchNodeClass * klass) { sidebar_branch_node_parent_class = g_type_class_peek_parent (klass); #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" ((SidebarBranchNodeClass *) klass)->finalize = sidebar_branch_node_finalize; -#line 2686 "Branch.c" +#line 2696 "Branch.c" } @@ -2691,11 +2701,11 @@ static void sidebar_branch_node_instance_init (SidebarBranchNode * self) { self->children = NULL; #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self->ref_count = 1; -#line 2695 "Branch.c" +#line 2705 "Branch.c" } -static void sidebar_branch_node_finalize (SidebarBranchNode* obj) { +static void sidebar_branch_node_finalize (SidebarBranchNode * obj) { SidebarBranchNode * self; #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_BRANCH_TYPE_NODE, SidebarBranchNode); @@ -2705,7 +2715,7 @@ static void sidebar_branch_node_finalize (SidebarBranchNode* obj) { _g_object_unref0 (self->entry); #line 43 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" _g_object_unref0 (self->children); -#line 2709 "Branch.c" +#line 2719 "Branch.c" } @@ -2724,18 +2734,18 @@ static GType sidebar_branch_node_get_type (void) { static gpointer sidebar_branch_node_ref (gpointer instance) { - SidebarBranchNode* self; + SidebarBranchNode * self; self = instance; #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_atomic_int_inc (&self->ref_count); #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" return instance; -#line 2734 "Branch.c" +#line 2744 "Branch.c" } static void sidebar_branch_node_unref (gpointer instance) { - SidebarBranchNode* self; + SidebarBranchNode * self; self = instance; #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2743,7 +2753,7 @@ static void sidebar_branch_node_unref (gpointer instance) { SIDEBAR_BRANCH_NODE_GET_CLASS (self)->finalize (self); #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2747 "Branch.c" +#line 2757 "Branch.c" } } @@ -2756,23 +2766,23 @@ static void sidebar_branch_class_init (SidebarBranchClass * klass) { #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" G_OBJECT_CLASS (klass)->finalize = sidebar_branch_finalize; #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - g_signal_new ("entry_added", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_ENTRY); + sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_ADDED_SIGNAL] = g_signal_new ("entry-added", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_ENTRY); #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - g_signal_new ("entry_removed", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_ENTRY); + sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REMOVED_SIGNAL] = g_signal_new ("entry-removed", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_ENTRY); #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - g_signal_new ("entry_moved", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_ENTRY); + sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_MOVED_SIGNAL] = g_signal_new ("entry-moved", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_ENTRY); #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - g_signal_new ("entry_reparented", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_ENTRY, SIDEBAR_TYPE_ENTRY); + sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REPARENTED_SIGNAL] = g_signal_new ("entry-reparented", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_ENTRY, SIDEBAR_TYPE_ENTRY); #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - g_signal_new ("children_reordered", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_ENTRY); + sidebar_branch_signals[SIDEBAR_BRANCH_CHILDREN_REORDERED_SIGNAL] = g_signal_new ("children-reordered", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_ENTRY); #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" - g_signal_new ("show_branch", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); -#line 2771 "Branch.c" + sidebar_branch_signals[SIDEBAR_BRANCH_SHOW_BRANCH_SIGNAL] = g_signal_new ("show-branch", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); +#line 2781 "Branch.c" } static void sidebar_branch_instance_init (SidebarBranch * self) { - GeeHashMap* _tmp0_ = NULL; + GeeHashMap* _tmp0_; #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self->priv = SIDEBAR_BRANCH_GET_PRIVATE (self); #line 190 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" @@ -2781,11 +2791,11 @@ static void sidebar_branch_instance_init (SidebarBranch * self) { _tmp0_ = gee_hash_map_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 192 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self->priv->map = _tmp0_; -#line 2785 "Branch.c" +#line 2795 "Branch.c" } -static void sidebar_branch_finalize (GObject* obj) { +static void sidebar_branch_finalize (GObject * obj) { SidebarBranch * self; #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_BRANCH, SidebarBranch); @@ -2795,7 +2805,7 @@ static void sidebar_branch_finalize (GObject* obj) { _g_object_unref0 (self->priv->map); #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala" G_OBJECT_CLASS (sidebar_branch_parent_class)->finalize (obj); -#line 2799 "Branch.c" +#line 2809 "Branch.c" } |