From 2492891f112caac6076ce49721d9d5d78a152c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 15:53:58 +0100 Subject: New upstream version 0.26.4 --- src/tags/Branch.c | 1013 ++++++++++++++++++++++++++++------------------------- 1 file changed, 526 insertions(+), 487 deletions(-) (limited to 'src/tags/Branch.c') diff --git a/src/tags/Branch.c b/src/tags/Branch.c index 9bad2d8..0c02a90 100644 --- a/src/tags/Branch.c +++ b/src/tags/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. @@ -640,15 +640,15 @@ struct _TagsSidebarEntryPrivate { static gpointer tags_branch_parent_class = NULL; extern TagSourceCollection* tag_global; static gpointer tags_header_parent_class = NULL; -static SidebarInternalDropTargetEntryIface* tags_header_sidebar_internal_drop_target_entry_parent_iface = NULL; -static SidebarInternalDragSourceEntryIface* tags_header_sidebar_internal_drag_source_entry_parent_iface = NULL; -static SidebarContextableIface* tags_header_sidebar_contextable_parent_iface = NULL; +static SidebarInternalDropTargetEntryIface * tags_header_sidebar_internal_drop_target_entry_parent_iface = NULL; +static SidebarInternalDragSourceEntryIface * tags_header_sidebar_internal_drag_source_entry_parent_iface = NULL; +static SidebarContextableIface * tags_header_sidebar_contextable_parent_iface = NULL; static gpointer tags_sidebar_entry_parent_class = NULL; -static SidebarRenameableEntryIface* tags_sidebar_entry_sidebar_renameable_entry_parent_iface = NULL; -static SidebarDestroyableEntryIface* tags_sidebar_entry_sidebar_destroyable_entry_parent_iface = NULL; -static SidebarInternalDropTargetEntryIface* tags_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = NULL; -static SidebarExpandableEntryIface* tags_sidebar_entry_sidebar_expandable_entry_parent_iface = NULL; -static SidebarInternalDragSourceEntryIface* tags_sidebar_entry_sidebar_internal_drag_source_entry_parent_iface = NULL; +static SidebarRenameableEntryIface * tags_sidebar_entry_sidebar_renameable_entry_parent_iface = NULL; +static SidebarDestroyableEntryIface * tags_sidebar_entry_sidebar_destroyable_entry_parent_iface = NULL; +static SidebarInternalDropTargetEntryIface * tags_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = NULL; +static SidebarExpandableEntryIface * tags_sidebar_entry_sidebar_expandable_entry_parent_iface = NULL; +static SidebarInternalDragSourceEntryIface * tags_sidebar_entry_sidebar_internal_drag_source_entry_parent_iface = NULL; GType sidebar_branch_get_type (void) G_GNUC_CONST; GType tags_branch_get_type (void) G_GNUC_CONST; @@ -713,7 +713,7 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST; gchar* tag_get_user_visible_name (Tag* self); void sidebar_branch_reorder (SidebarBranch* self, SidebarEntry* entry); -static void tags_branch_finalize (GObject* obj); +static void tags_branch_finalize (GObject * obj); GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST; GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; @@ -776,7 +776,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag, GType reparent_tag_command_get_type (void) G_GNUC_CONST; static void tags_header_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data); static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event); -static void tags_header_finalize (GObject* obj); +static void tags_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; @@ -819,7 +819,7 @@ gchar* tag_get_path (Tag* self); GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path); static gboolean tags_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base); static void tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data); -static void tags_sidebar_entry_finalize (GObject* obj); +static void tags_sidebar_entry_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -849,13 +849,13 @@ static gint _tags_branch_comparator_gcompare_func (gconstpointer a, gconstpointe TagsBranch* tags_branch_construct (GType object_type) { TagsBranch * self = NULL; - TagsHeader* _tmp0_ = NULL; - TagsHeader* _tmp1_ = NULL; - TagSourceCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; - TagSourceCollection* _tmp5_ = NULL; - TagSourceCollection* _tmp6_ = NULL; + TagsHeader* _tmp0_; + TagsHeader* _tmp1_; + TagSourceCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeCollection* _tmp4_; + TagSourceCollection* _tmp5_; + TagSourceCollection* _tmp6_; #line 11 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp0_ = tags_header_new (); #line 11 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -897,9 +897,9 @@ TagsBranch* tags_branch_new (void) { TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self, Tag* tag) { TagsSidebarEntry* result = NULL; - GeeHashMap* _tmp0_ = NULL; - Tag* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; + GeeHashMap* _tmp0_; + Tag* _tmp1_; + gpointer _tmp2_; #line 30 "/home/jens/Source/shotwell/src/tags/Branch.vala" g_return_val_if_fail (TAGS_IS_BRANCH (self), NULL); #line 30 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -932,16 +932,16 @@ gboolean tags_branch_is_user_renameable (TagsBranch* self) { static gint tags_branch_comparator (SidebarEntry* a, SidebarEntry* b) { gint result = 0; - SidebarEntry* _tmp0_ = NULL; - SidebarEntry* _tmp1_ = NULL; - SidebarEntry* _tmp2_ = NULL; - Tag* _tmp3_ = NULL; - Tag* _tmp4_ = NULL; - SidebarEntry* _tmp5_ = NULL; - Tag* _tmp6_ = NULL; - Tag* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; + SidebarEntry* _tmp0_; + SidebarEntry* _tmp1_; + SidebarEntry* _tmp2_; + Tag* _tmp3_; + Tag* _tmp4_; + SidebarEntry* _tmp5_; + Tag* _tmp6_; + Tag* _tmp7_; + gint _tmp8_; + gint _tmp9_; #line 38 "/home/jens/Source/shotwell/src/tags/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 38 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1004,8 +1004,8 @@ static gpointer _g_object_ref0 (gpointer self) { static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* added_raw, GeeIterable* removed) { Tag* restore_point = NULL; - GeeIterable* _tmp0_ = NULL; - GeeIterable* _tmp49_ = NULL; + GeeIterable* _tmp0_; + GeeIterable* _tmp49_; #line 46 "/home/jens/Source/shotwell/src/tags/Branch.vala" g_return_if_fail (TAGS_IS_BRANCH (self)); #line 46 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1020,7 +1020,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad if (_tmp0_ != NULL) { #line 1022 "Branch.c" GeeSortedSet* added = NULL; - GeeTreeSet* _tmp1_ = NULL; + GeeTreeSet* _tmp1_; #line 57 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp1_ = gee_tree_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tag_compare_names_gcompare_data_func, NULL, NULL); #line 57 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1028,8 +1028,8 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad #line 1029 "Branch.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp2_ = NULL; - GeeIterator* _tmp3_ = NULL; + GeeIterable* _tmp2_; + GeeIterator* _tmp3_; #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp2_ = added_raw; #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1039,16 +1039,16 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" while (TRUE) { #line 1042 "Branch.c" - GeeIterator* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + GeeIterator* _tmp4_; + gboolean _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp6_ = NULL; - gpointer _tmp7_ = NULL; + GeeIterator* _tmp6_; + gpointer _tmp7_; Tag* tag = NULL; - DataObject* _tmp8_ = NULL; - Tag* _tmp9_ = NULL; - GeeSortedSet* _tmp10_ = NULL; - Tag* _tmp11_ = NULL; + DataObject* _tmp8_; + Tag* _tmp9_; + GeeSortedSet* _tmp10_; + Tag* _tmp11_; #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp4_ = _object_it; #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1089,8 +1089,8 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad } { GeeIterator* _tag_it = NULL; - GeeSortedSet* _tmp12_ = NULL; - GeeIterator* _tmp13_ = NULL; + GeeSortedSet* _tmp12_; + GeeIterator* _tmp13_; #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp12_ = added; #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1100,25 +1100,25 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" while (TRUE) { #line 1103 "Branch.c" - GeeIterator* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; + GeeIterator* _tmp14_; + gboolean _tmp15_; Tag* tag = NULL; - GeeIterator* _tmp16_ = NULL; - gpointer _tmp17_ = NULL; + GeeIterator* _tmp16_; + gpointer _tmp17_; Tag* parent_tag = NULL; - Tag* _tmp18_ = NULL; - Tag* _tmp19_ = NULL; + Tag* _tmp18_; + Tag* _tmp19_; TagsSidebarEntry* entry = NULL; - Tag* _tmp31_ = NULL; - TagsSidebarEntry* _tmp32_ = NULL; - GeeHashMap* _tmp33_ = NULL; - Tag* _tmp34_ = NULL; - TagsSidebarEntry* _tmp35_ = NULL; - Tag* _tmp36_ = NULL; - Tag* _tmp37_ = NULL; - Tag* _tmp38_ = NULL; - Tag* _tmp47_ = NULL; - Tag* _tmp48_ = NULL; + Tag* _tmp31_; + TagsSidebarEntry* _tmp32_; + GeeHashMap* _tmp33_; + Tag* _tmp34_; + TagsSidebarEntry* _tmp35_; + Tag* _tmp36_; + Tag* _tmp37_; + Tag* _tmp38_; + Tag* _tmp47_; + Tag* _tmp48_; #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp14_ = _tag_it; #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1144,12 +1144,12 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad #line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala" while (TRUE) { #line 1147 "Branch.c" - Tag* _tmp20_ = NULL; - GeeHashMap* _tmp21_ = NULL; - Tag* _tmp22_ = NULL; - gboolean _tmp23_ = FALSE; - Tag* _tmp29_ = NULL; - Tag* _tmp30_ = NULL; + Tag* _tmp20_; + GeeHashMap* _tmp21_; + Tag* _tmp22_; + gboolean _tmp23_; + Tag* _tmp29_; + Tag* _tmp30_; #line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp20_ = parent_tag; #line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1168,11 +1168,11 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad if (!_tmp23_) { #line 1170 "Branch.c" TagsSidebarEntry* parent_entry = NULL; - Tag* _tmp24_ = NULL; - TagsSidebarEntry* _tmp25_ = NULL; - GeeHashMap* _tmp26_ = NULL; - Tag* _tmp27_ = NULL; - TagsSidebarEntry* _tmp28_ = NULL; + Tag* _tmp24_; + TagsSidebarEntry* _tmp25_; + GeeHashMap* _tmp26_; + Tag* _tmp27_; + TagsSidebarEntry* _tmp28_; #line 69 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp24_ = parent_tag; #line 69 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1229,11 +1229,11 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad if (_tmp38_ != NULL) { #line 1231 "Branch.c" TagsSidebarEntry* parent_entry = NULL; - GeeHashMap* _tmp39_ = NULL; - Tag* _tmp40_ = NULL; - gpointer _tmp41_ = NULL; - TagsSidebarEntry* _tmp42_ = NULL; - TagsSidebarEntry* _tmp43_ = NULL; + GeeHashMap* _tmp39_; + Tag* _tmp40_; + gpointer _tmp41_; + TagsSidebarEntry* _tmp42_; + TagsSidebarEntry* _tmp43_; #line 82 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp39_ = self->priv->entry_map; #line 82 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1252,9 +1252,9 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad _g_object_unref0 (parent_entry); #line 1254 "Branch.c" } else { - SidebarEntry* _tmp44_ = NULL; - SidebarEntry* _tmp45_ = NULL; - TagsSidebarEntry* _tmp46_ = NULL; + SidebarEntry* _tmp44_; + SidebarEntry* _tmp45_; + TagsSidebarEntry* _tmp46_; #line 85 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp44_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 85 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1298,8 +1298,8 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad #line 1299 "Branch.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp50_ = NULL; - GeeIterator* _tmp51_ = NULL; + GeeIterable* _tmp50_; + GeeIterator* _tmp51_; #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp50_ = removed; #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1309,25 +1309,25 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" while (TRUE) { #line 1312 "Branch.c" - GeeIterator* _tmp52_ = NULL; - gboolean _tmp53_ = FALSE; + GeeIterator* _tmp52_; + gboolean _tmp53_; DataObject* object = NULL; - GeeIterator* _tmp54_ = NULL; - gpointer _tmp55_ = NULL; + GeeIterator* _tmp54_; + gpointer _tmp55_; Tag* tag = NULL; - DataObject* _tmp56_ = NULL; - Tag* _tmp57_ = NULL; + DataObject* _tmp56_; + Tag* _tmp57_; TagsSidebarEntry* entry = NULL; - GeeHashMap* _tmp58_ = NULL; - Tag* _tmp59_ = NULL; - gpointer _tmp60_ = NULL; - TagsSidebarEntry* _tmp61_ = NULL; + GeeHashMap* _tmp58_; + Tag* _tmp59_; + gpointer _tmp60_; + TagsSidebarEntry* _tmp61_; gboolean is_removed = FALSE; - GeeHashMap* _tmp62_ = NULL; - Tag* _tmp63_ = NULL; - gboolean _tmp64_ = FALSE; - gboolean _tmp65_ = FALSE; - TagsSidebarEntry* _tmp66_ = NULL; + GeeHashMap* _tmp62_; + Tag* _tmp63_; + gboolean _tmp64_; + gboolean _tmp65_; + TagsSidebarEntry* _tmp66_; #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp52_ = _object_it; #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1405,12 +1405,12 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) { #line 1406 "Branch.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_ = NULL; - GeeSet* _tmp1_ = NULL; - GeeSet* _tmp2_ = NULL; - GeeSet* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + GeeMap* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; + GeeSet* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp0_ = altered; #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1430,34 +1430,34 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) { #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" while (TRUE) { #line 1433 "Branch.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeIterator* _tmp6_; + gboolean _tmp7_; DataObject* object = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - GeeMap* _tmp10_ = NULL; - DataObject* _tmp11_ = NULL; - gpointer _tmp12_ = NULL; - Alteration* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; - gboolean _tmp15_ = FALSE; + GeeIterator* _tmp8_; + gpointer _tmp9_; + GeeMap* _tmp10_; + DataObject* _tmp11_; + gpointer _tmp12_; + Alteration* _tmp13_; + gboolean _tmp14_; + gboolean _tmp15_; Tag* tag = NULL; - DataObject* _tmp16_ = NULL; - Tag* _tmp17_ = NULL; + DataObject* _tmp16_; + Tag* _tmp17_; TagsSidebarEntry* entry = NULL; - GeeHashMap* _tmp18_ = NULL; - Tag* _tmp19_ = NULL; - gpointer _tmp20_ = NULL; - TagsSidebarEntry* _tmp21_ = NULL; - TagsSidebarEntry* _tmp22_ = NULL; - Tag* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - TagsSidebarEntry* _tmp26_ = NULL; - Tag* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - TagsSidebarEntry* _tmp30_ = NULL; + GeeHashMap* _tmp18_; + Tag* _tmp19_; + gpointer _tmp20_; + TagsSidebarEntry* _tmp21_; + TagsSidebarEntry* _tmp22_; + Tag* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; + TagsSidebarEntry* _tmp26_; + Tag* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; + TagsSidebarEntry* _tmp30_; #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp6_ = _object_it; #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1569,7 +1569,7 @@ static void tags_branch_class_init (TagsBranchClass * klass) { static void tags_branch_instance_init (TagsBranch * self) { - GeeHashMap* _tmp0_ = NULL; + GeeHashMap* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala" self->priv = TAGS_BRANCH_GET_PRIVATE (self); #line 8 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1580,12 +1580,12 @@ static void tags_branch_instance_init (TagsBranch * self) { } -static void tags_branch_finalize (GObject* obj) { +static void tags_branch_finalize (GObject * obj) { TagsBranch * self; - TagSourceCollection* _tmp0_ = NULL; - guint _tmp1_ = 0U; - TagSourceCollection* _tmp2_ = NULL; - guint _tmp3_ = 0U; + TagSourceCollection* _tmp0_; + guint _tmp1_; + TagSourceCollection* _tmp2_; + guint _tmp3_; #line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_BRANCH, TagsBranch); #line 26 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1622,28 +1622,25 @@ GType tags_branch_get_type (void) { TagsHeader* tags_header_construct (GType object_type) { TagsHeader * self = NULL; - const gchar* _tmp0_ = NULL; #line 131 "/home/jens/Source/shotwell/src/tags/Branch.vala" - _tmp0_ = _ ("Tags"); -#line 131 "/home/jens/Source/shotwell/src/tags/Branch.vala" - self = (TagsHeader*) sidebar_header_construct (object_type, _tmp0_, TRUE); + self = (TagsHeader*) sidebar_header_construct (object_type, _ ("Tags"), TRUE); #line 132 "/home/jens/Source/shotwell/src/tags/Branch.vala" tags_header_setup_context_menu (self); #line 130 "/home/jens/Source/shotwell/src/tags/Branch.vala" return self; -#line 1635 "Branch.c" +#line 1632 "Branch.c" } TagsHeader* tags_header_new (void) { #line 130 "/home/jens/Source/shotwell/src/tags/Branch.vala" return tags_header_construct (TAGS_TYPE_HEADER); -#line 1642 "Branch.c" +#line 1639 "Branch.c" } static void tags_header_setup_context_menu (TagsHeader* self) { - GtkBuilder* _tmp0_ = NULL; + GtkBuilder* _tmp0_; GError * _inner_error_ = NULL; #line 135 "/home/jens/Source/shotwell/src/tags/Branch.vala" g_return_if_fail (TAGS_IS_HEADER (self)); @@ -1653,17 +1650,17 @@ static void tags_header_setup_context_menu (TagsHeader* self) { _g_object_unref0 (self->priv->builder); #line 136 "/home/jens/Source/shotwell/src/tags/Branch.vala" self->priv->builder = _tmp0_; -#line 1657 "Branch.c" +#line 1654 "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 138 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp1_ = self->priv->builder; #line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1676,8 +1673,8 @@ static void tags_header_setup_context_menu (TagsHeader* self) { _g_free0 (_tmp3_); #line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1680 "Branch.c" - goto __catch54_g_error; +#line 1677 "Branch.c" + goto __catch55_g_error; } #line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp4_ = self->priv->builder; @@ -1699,18 +1696,18 @@ static void tags_header_setup_context_menu (TagsHeader* self) { self->priv->context_menu = _tmp8_; #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" _g_object_unref0 (model); -#line 1703 "Branch.c" +#line 1700 "Branch.c" } - goto __finally54; - __catch54_g_error: + goto __finally55; + __catch55_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 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" _error_ = _inner_error_; #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1737,9 +1734,9 @@ static void tags_header_setup_context_menu (TagsHeader* self) { _application_unref0 (_tmp14_); #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" _g_error_free0 (_error_); -#line 1741 "Branch.c" +#line 1738 "Branch.c" } - __finally54: + __finally55: #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1748,7 +1745,7 @@ static void tags_header_setup_context_menu (TagsHeader* self) { g_clear_error (&_inner_error_); #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala" return; -#line 1752 "Branch.c" +#line 1749 "Branch.c" } } @@ -1757,23 +1754,23 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg TagsHeader * self; gboolean result = FALSE; AddTagsDialog* dialog = NULL; - AddTagsDialog* _tmp0_ = NULL; + AddTagsDialog* _tmp0_; gchar** names = NULL; - AddTagsDialog* _tmp1_ = NULL; - gint _tmp2_ = 0; - gchar** _tmp3_ = NULL; - gint names_length1 = 0; - gint _names_size_ = 0; + AddTagsDialog* _tmp1_; + gint _tmp2_; + gchar** _tmp3_; + gint names_length1; + gint _names_size_; gboolean _tmp4_ = FALSE; - gchar** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - CommandManager* _tmp7_ = NULL; - CommandManager* _tmp8_ = NULL; - gchar** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - GeeList* _tmp10_ = NULL; - AddTagsCommand* _tmp11_ = NULL; - AddTagsCommand* _tmp12_ = NULL; + gchar** _tmp5_; + gint _tmp5__length1; + CommandManager* _tmp7_; + CommandManager* _tmp8_; + gchar** _tmp9_; + gint _tmp9__length1; + GeeList* _tmp10_; + AddTagsCommand* _tmp11_; + AddTagsCommand* _tmp12_; #line 148 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader); #line 148 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1800,17 +1797,17 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg if (_tmp5_ == NULL) { #line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp4_ = TRUE; -#line 1804 "Branch.c" +#line 1801 "Branch.c" } else { - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; + gchar** _tmp6_; + gint _tmp6__length1; #line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp6_ = names; #line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp6__length1 = names_length1; #line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp4_ = _tmp6__length1 == 0; -#line 1814 "Branch.c" +#line 1811 "Branch.c" } #line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala" if (_tmp4_) { @@ -1822,7 +1819,7 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg _text_entry_dialog_mediator_unref0 (dialog); #line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 1826 "Branch.c" +#line 1823 "Branch.c" } #line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp7_ = app_window_get_command_manager (); @@ -1852,18 +1849,18 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg _text_entry_dialog_mediator_unref0 (dialog); #line 156 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 1856 "Branch.c" +#line 1853 "Branch.c" } static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data) { TagsHeader * self; gboolean result = FALSE; - GtkSelectionData* _tmp0_ = NULL; - GdkAtom _tmp1_ = 0U; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + GtkSelectionData* _tmp0_; + GdkAtom _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gboolean _tmp4_; #line 159 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader); #line 159 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1882,27 +1879,27 @@ static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarIntern _g_free0 (_tmp3_); #line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala" if (_tmp4_) { -#line 1886 "Branch.c" +#line 1883 "Branch.c" gchar* old_tag_path = NULL; - GtkSelectionData* _tmp5_ = NULL; - guchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - TagSourceCollection* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; - const gchar* _tmp11_ = NULL; - GeeList* _tmp12_ = NULL; - GeeList* _tmp13_ = NULL; - gint _tmp14_ = 0; - gint _tmp15_ = 0; - gboolean _tmp16_ = FALSE; - CommandManager* _tmp17_ = NULL; - CommandManager* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - Tag* _tmp20_ = NULL; - Tag* _tmp21_ = NULL; - ReparentTagCommand* _tmp22_ = NULL; - ReparentTagCommand* _tmp23_ = NULL; + GtkSelectionData* _tmp5_; + guchar* _tmp6_; + gchar* _tmp7_; + TagSourceCollection* _tmp8_; + const gchar* _tmp9_; + gboolean _tmp10_; + const gchar* _tmp11_; + GeeList* _tmp12_; + GeeList* _tmp13_; + gint _tmp14_; + gint _tmp15_; + gboolean _tmp16_; + CommandManager* _tmp17_; + CommandManager* _tmp18_; + const gchar* _tmp19_; + Tag* _tmp20_; + Tag* _tmp21_; + ReparentTagCommand* _tmp22_; + ReparentTagCommand* _tmp23_; #line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp5_ = data; #line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -1941,7 +1938,7 @@ static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarIntern _g_free0 (old_tag_path); #line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 1945 "Branch.c" +#line 1942 "Branch.c" } #line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp17_ = app_window_get_command_manager (); @@ -1971,13 +1968,13 @@ static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarIntern _g_free0 (old_tag_path); #line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 1975 "Branch.c" +#line 1972 "Branch.c" } #line 174 "/home/jens/Source/shotwell/src/tags/Branch.vala" result = FALSE; #line 174 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 1981 "Branch.c" +#line 1978 "Branch.c" } @@ -1987,15 +1984,15 @@ static void tags_header_real_prepare_selection_data (SidebarInternalDragSourceEn self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader); #line 177 "/home/jens/Source/shotwell/src/tags/Branch.vala" g_return_if_fail (data != NULL); -#line 1991 "Branch.c" +#line 1988 "Branch.c" } static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event) { TagsHeader * self; GtkMenu* result = NULL; - GtkMenu* _tmp0_ = NULL; - GtkMenu* _tmp1_ = NULL; + GtkMenu* _tmp0_; + GtkMenu* _tmp1_; #line 181 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader); #line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2006,7 +2003,7 @@ static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* b result = _tmp1_; #line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2010 "Branch.c" +#line 2007 "Branch.c" } @@ -2017,7 +2014,7 @@ static void tags_header_class_init (TagsHeaderClass * klass) { g_type_class_add_private (klass, sizeof (TagsHeaderPrivate)); #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" G_OBJECT_CLASS (klass)->finalize = tags_header_finalize; -#line 2021 "Branch.c" +#line 2018 "Branch.c" } @@ -2025,10 +2022,10 @@ static void tags_header_sidebar_internal_drop_target_entry_interface_init (Sideb #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" tags_header_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface); #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" - iface->internal_drop_received = (gboolean (*)(SidebarInternalDropTargetEntry*, GeeList*)) tags_header_real_internal_drop_received; + iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) tags_header_real_internal_drop_received; #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" - iface->internal_drop_received_arbitrary = (gboolean (*)(SidebarInternalDropTargetEntry*, GtkSelectionData*)) tags_header_real_internal_drop_received_arbitrary; -#line 2032 "Branch.c" + iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) tags_header_real_internal_drop_received_arbitrary; +#line 2029 "Branch.c" } @@ -2036,8 +2033,8 @@ static void tags_header_sidebar_internal_drag_source_entry_interface_init (Sideb #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" tags_header_sidebar_internal_drag_source_entry_parent_iface = g_type_interface_peek_parent (iface); #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" - iface->prepare_selection_data = (void (*)(SidebarInternalDragSourceEntry*, GtkSelectionData*)) tags_header_real_prepare_selection_data; -#line 2041 "Branch.c" + iface->prepare_selection_data = (void (*) (SidebarInternalDragSourceEntry *, GtkSelectionData*)) tags_header_real_prepare_selection_data; +#line 2038 "Branch.c" } @@ -2045,8 +2042,8 @@ static void tags_header_sidebar_contextable_interface_init (SidebarContextableIf #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" tags_header_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface); #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" - iface->get_sidebar_context_menu = (GtkMenu* (*)(SidebarContextable*, GdkEventButton*)) tags_header_real_get_sidebar_context_menu; -#line 2050 "Branch.c" + iface->get_sidebar_context_menu = (GtkMenu* (*) (SidebarContextable *, GdkEventButton*)) tags_header_real_get_sidebar_context_menu; +#line 2047 "Branch.c" } @@ -2055,11 +2052,11 @@ static void tags_header_instance_init (TagsHeader * self) { self->priv = TAGS_HEADER_GET_PRIVATE (self); #line 128 "/home/jens/Source/shotwell/src/tags/Branch.vala" self->priv->context_menu = NULL; -#line 2059 "Branch.c" +#line 2056 "Branch.c" } -static void tags_header_finalize (GObject* obj) { +static void tags_header_finalize (GObject * obj) { TagsHeader * self; #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_HEADER, TagsHeader); @@ -2069,7 +2066,7 @@ static void tags_header_finalize (GObject* obj) { _g_object_unref0 (self->priv->context_menu); #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala" G_OBJECT_CLASS (tags_header_parent_class)->finalize (obj); -#line 2073 "Branch.c" +#line 2070 "Branch.c" } @@ -2093,8 +2090,8 @@ GType tags_header_get_type (void) { TagsSidebarEntry* tags_sidebar_entry_construct (GType object_type, Tag* tag) { TagsSidebarEntry * self = NULL; - Tag* _tmp0_ = NULL; - Tag* _tmp1_ = NULL; + Tag* _tmp0_; + Tag* _tmp1_; #line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala" g_return_val_if_fail (IS_TAG (tag), NULL); #line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2109,14 +2106,14 @@ TagsSidebarEntry* tags_sidebar_entry_construct (GType object_type, Tag* tag) { self->priv->tag = _tmp1_; #line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala" return self; -#line 2113 "Branch.c" +#line 2110 "Branch.c" } TagsSidebarEntry* tags_sidebar_entry_new (Tag* tag) { #line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala" return tags_sidebar_entry_construct (TAGS_TYPE_SIDEBAR_ENTRY, tag); -#line 2120 "Branch.c" +#line 2117 "Branch.c" } @@ -2130,8 +2127,8 @@ void tags_sidebar_entry_terminate (void) { Tag* tags_sidebar_entry_for_tag (TagsSidebarEntry* self) { Tag* result = NULL; - Tag* _tmp0_ = NULL; - Tag* _tmp1_ = NULL; + Tag* _tmp0_; + Tag* _tmp1_; #line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala" g_return_val_if_fail (TAGS_IS_SIDEBAR_ENTRY (self), NULL); #line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2142,15 +2139,15 @@ Tag* tags_sidebar_entry_for_tag (TagsSidebarEntry* self) { result = _tmp1_; #line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2146 "Branch.c" +#line 2143 "Branch.c" } static gchar* tags_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { TagsSidebarEntry * self; gchar* result = NULL; - Tag* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + Tag* _tmp0_; + gchar* _tmp1_; #line 207 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2161,15 +2158,15 @@ static gchar* tags_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* result = _tmp1_; #line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2165 "Branch.c" +#line 2162 "Branch.c" } static gchar* tags_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { TagsSidebarEntry * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 211 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2180,15 +2177,15 @@ static gchar* tags_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* result = _tmp1_; #line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2184 "Branch.c" +#line 2181 "Branch.c" } static Page* tags_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) { TagsSidebarEntry * self; Page* result = NULL; - Tag* _tmp0_ = NULL; - TagPage* _tmp1_ = NULL; + Tag* _tmp0_; + TagPage* _tmp1_; #line 215 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2201,7 +2198,7 @@ static Page* tags_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); #line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2205 "Branch.c" +#line 2202 "Branch.c" } @@ -2214,126 +2211,168 @@ static gboolean tags_sidebar_entry_real_is_user_renameable (SidebarRenameableEnt result = TRUE; #line 220 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2218 "Branch.c" +#line 2215 "Branch.c" } static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 2231 "Branch.c" +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if ((*((gchar*) self)) == '\0') { +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = TRUE; +#line 2234 "Branch.c" + } else { + const gchar* _tmp2_; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp2_ = old; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; +#line 2241 "Branch.c" + } +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp1_) { +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = TRUE; +#line 2247 "Branch.c" + } else { + const gchar* _tmp3_; + const gchar* _tmp4_; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp3_ = old; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp4_ = replacement; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; +#line 2257 "Branch.c" + } +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp0_) { +#line 2261 "Branch.c" + gchar* _tmp5_; +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp5_ = g_strdup (self); +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp5_; +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + return result; +#line 2269 "Branch.c" + } { GRegex* regex = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - GRegex* _tmp3_ = NULL; - GRegex* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GRegex* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp0_ = old; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - regex = _tmp4_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + GRegex* _tmp9_; + GRegex* _tmp10_; + gchar* _tmp11_ = NULL; + GRegex* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp6_ = old; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp7_ = g_regex_escape_string (_tmp6_, -1); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp8_ = _tmp7_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp10_ = _tmp9_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp8_); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + regex = _tmp10_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 2262 "Branch.c" - goto __catch55_g_regex_error; +#line 2301 "Branch.c" + goto __catch56_g_regex_error; } -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" 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); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 2271 "Branch.c" +#line 2310 "Branch.c" } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp7_ = replacement; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp12_ = regex; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp13_ = replacement; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = _tmp14_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 2287 "Branch.c" - goto __catch55_g_regex_error; +#line 2326 "Branch.c" + goto __catch56_g_regex_error; } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" 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); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 2298 "Branch.c" +#line 2337 "Branch.c" } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - result = _tmp9_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp15_ = _tmp11_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = NULL; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp15_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp11_); +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2312 "Branch.c" +#line 2351 "Branch.c" } - goto __finally55; - __catch55_g_regex_error: + goto __finally56; + __catch56_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 2326 "Branch.c" +#line 2365 "Branch.c" } - __finally55: -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + __finally56: +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" 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); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 2337 "Branch.c" +#line 2376 "Branch.c" } } @@ -2341,23 +2380,23 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name) { TagsSidebarEntry * self; gchar* prepped = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - Tag* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; - const gchar* _tmp10_ = NULL; - CommandManager* _tmp11_ = NULL; - CommandManager* _tmp12_ = NULL; - Tag* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - RenameTagCommand* _tmp15_ = NULL; - RenameTagCommand* _tmp16_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; + Tag* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gboolean _tmp9_; + const gchar* _tmp10_; + CommandManager* _tmp11_; + CommandManager* _tmp12_; + Tag* _tmp13_; + const gchar* _tmp14_; + RenameTagCommand* _tmp15_; + RenameTagCommand* _tmp16_; #line 223 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 223 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2376,7 +2415,7 @@ static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const _g_free0 (prepped); #line 226 "/home/jens/Source/shotwell/src/tags/Branch.vala" return; -#line 2380 "Branch.c" +#line 2419 "Branch.c" } #line 228 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp3_ = prepped; @@ -2404,7 +2443,7 @@ static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const _g_free0 (prepped); #line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala" return; -#line 2408 "Branch.c" +#line 2447 "Branch.c" } #line 233 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp10_ = prepped; @@ -2414,7 +2453,7 @@ static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const _g_free0 (prepped); #line 234 "/home/jens/Source/shotwell/src/tags/Branch.vala" return; -#line 2418 "Branch.c" +#line 2457 "Branch.c" } #line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp11_ = app_window_get_command_manager (); @@ -2436,14 +2475,14 @@ static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const _command_manager_unref0 (_tmp12_); #line 223 "/home/jens/Source/shotwell/src/tags/Branch.vala" _g_free0 (prepped); -#line 2440 "Branch.c" +#line 2479 "Branch.c" } static void tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base) { TagsSidebarEntry * self; - Tag* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + Tag* _tmp0_; + gboolean _tmp1_; #line 239 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2452,12 +2491,12 @@ static void tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* bas _tmp1_ = dialogs_confirm_delete_tag (_tmp0_); #line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala" if (_tmp1_) { -#line 2456 "Branch.c" - CommandManager* _tmp2_ = NULL; - CommandManager* _tmp3_ = NULL; - Tag* _tmp4_ = NULL; - DeleteTagCommand* _tmp5_ = NULL; - DeleteTagCommand* _tmp6_ = NULL; +#line 2495 "Branch.c" + CommandManager* _tmp2_; + CommandManager* _tmp3_; + Tag* _tmp4_; + DeleteTagCommand* _tmp5_; + DeleteTagCommand* _tmp6_; #line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp2_ = app_window_get_command_manager (); #line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2474,7 +2513,7 @@ static void tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* bas _g_object_unref0 (_tmp6_); #line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala" _command_manager_unref0 (_tmp3_); -#line 2478 "Branch.c" +#line 2517 "Branch.c" } } @@ -2482,15 +2521,15 @@ static void tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* bas static gboolean tags_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media) { TagsSidebarEntry * self; gboolean result = FALSE; - CommandManager* _tmp0_ = NULL; - CommandManager* _tmp1_ = NULL; - Tag* _tmp2_ = NULL; - GeeList* _tmp3_ = NULL; - GeeList* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - TagUntagPhotosCommand* _tmp7_ = NULL; - TagUntagPhotosCommand* _tmp8_ = NULL; + CommandManager* _tmp0_; + CommandManager* _tmp1_; + Tag* _tmp2_; + GeeList* _tmp3_; + GeeList* _tmp4_; + gint _tmp5_; + gint _tmp6_; + TagUntagPhotosCommand* _tmp7_; + TagUntagPhotosCommand* _tmp8_; #line 244 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 244 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2523,18 +2562,18 @@ static gboolean tags_sidebar_entry_real_internal_drop_received (SidebarInternalD result = TRUE; #line 248 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2527 "Branch.c" +#line 2566 "Branch.c" } static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data) { TagsSidebarEntry * self; gboolean result = FALSE; - GtkSelectionData* _tmp0_ = NULL; - GdkAtom _tmp1_ = 0U; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + GtkSelectionData* _tmp0_; + GdkAtom _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gboolean _tmp4_; #line 251 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 251 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2553,35 +2592,35 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _g_free0 (_tmp3_); #line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala" if (_tmp4_) { -#line 2557 "Branch.c" +#line 2596 "Branch.c" gchar* old_tag_path = NULL; - GtkSelectionData* _tmp5_ = NULL; - guchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - Tag* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - TagSourceCollection* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; - gboolean _tmp31_ = FALSE; + GtkSelectionData* _tmp5_; + guchar* _tmp6_; + gchar* _tmp7_; + const gchar* _tmp8_; + Tag* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + gboolean _tmp12_; + TagSourceCollection* _tmp29_; + const gchar* _tmp30_; + gboolean _tmp31_; Tag* old_tag = NULL; - const gchar* _tmp32_ = NULL; - Tag* _tmp33_ = NULL; + const gchar* _tmp32_; + Tag* _tmp33_; Tag* old_tag_parent = NULL; - Tag* _tmp34_ = NULL; - Tag* _tmp35_ = NULL; + Tag* _tmp34_; + Tag* _tmp35_; gboolean _tmp36_ = FALSE; - Tag* _tmp37_ = NULL; - CommandManager* _tmp44_ = NULL; - CommandManager* _tmp45_ = NULL; - Tag* _tmp46_ = NULL; - Tag* _tmp47_ = NULL; - gchar* _tmp48_ = NULL; - gchar* _tmp49_ = NULL; - ReparentTagCommand* _tmp50_ = NULL; - ReparentTagCommand* _tmp51_ = NULL; + Tag* _tmp37_; + CommandManager* _tmp44_; + CommandManager* _tmp45_; + Tag* _tmp46_; + Tag* _tmp47_; + gchar* _tmp48_; + gchar* _tmp49_; + ReparentTagCommand* _tmp50_; + ReparentTagCommand* _tmp51_; #line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp5_ = data; #line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2610,19 +2649,19 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _g_free0 (old_tag_path); #line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2614 "Branch.c" +#line 2653 "Branch.c" } { GeeList* _parent_path_list = NULL; - Tag* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - GeeList* _tmp16_ = NULL; - GeeList* _tmp17_ = NULL; + Tag* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + GeeList* _tmp16_; + GeeList* _tmp17_; gint _parent_path_size = 0; - GeeList* _tmp18_ = NULL; - gint _tmp19_ = 0; - gint _tmp20_ = 0; + GeeList* _tmp18_; + gint _tmp19_; + gint _tmp20_; gint _parent_path_index = 0; #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp13_ = self->priv->tag; @@ -2650,16 +2689,16 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _parent_path_index = -1; #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" while (TRUE) { -#line 2654 "Branch.c" - gint _tmp21_ = 0; - gint _tmp22_ = 0; - gint _tmp23_ = 0; +#line 2693 "Branch.c" + gint _tmp21_; + gint _tmp22_; + gint _tmp23_; gchar* parent_path = NULL; - GeeList* _tmp24_ = NULL; - gint _tmp25_ = 0; - gpointer _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; - const gchar* _tmp28_ = NULL; + GeeList* _tmp24_; + gint _tmp25_; + gpointer _tmp26_; + const gchar* _tmp27_; + const gchar* _tmp28_; #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp21_ = _parent_path_index; #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2672,7 +2711,7 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba if (!(_tmp22_ < _tmp23_)) { #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" break; -#line 2676 "Branch.c" +#line 2715 "Branch.c" } #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp24_ = _parent_path_list; @@ -2698,15 +2737,15 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _g_free0 (old_tag_path); #line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2702 "Branch.c" +#line 2741 "Branch.c" } #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" _g_free0 (parent_path); -#line 2706 "Branch.c" +#line 2745 "Branch.c" } #line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala" _g_object_unref0 (_parent_path_list); -#line 2710 "Branch.c" +#line 2749 "Branch.c" } #line 265 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp29_ = tag_global; @@ -2732,13 +2771,13 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _tmp37_ = old_tag_parent; #line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" if (_tmp37_ != NULL) { -#line 2736 "Branch.c" - Tag* _tmp38_ = NULL; - gchar* _tmp39_ = NULL; - gchar* _tmp40_ = NULL; - Tag* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; - gchar* _tmp43_ = NULL; +#line 2775 "Branch.c" + Tag* _tmp38_; + gchar* _tmp39_; + gchar* _tmp40_; + Tag* _tmp41_; + gchar* _tmp42_; + gchar* _tmp43_; #line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp38_ = old_tag_parent; #line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2757,11 +2796,11 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _g_free0 (_tmp43_); #line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" _g_free0 (_tmp40_); -#line 2761 "Branch.c" +#line 2800 "Branch.c" } else { #line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp36_ = FALSE; -#line 2765 "Branch.c" +#line 2804 "Branch.c" } #line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala" if (_tmp36_) { @@ -2775,7 +2814,7 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _g_free0 (old_tag_path); #line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2779 "Branch.c" +#line 2818 "Branch.c" } #line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp44_ = app_window_get_command_manager (); @@ -2811,13 +2850,13 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba _g_free0 (old_tag_path); #line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2815 "Branch.c" +#line 2854 "Branch.c" } #line 279 "/home/jens/Source/shotwell/src/tags/Branch.vala" result = FALSE; #line 279 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2821 "Branch.c" +#line 2860 "Branch.c" } @@ -2830,71 +2869,71 @@ static gboolean tags_sidebar_entry_real_expand_on_select (SidebarExpandableEntry result = FALSE; #line 283 "/home/jens/Source/shotwell/src/tags/Branch.vala" return result; -#line 2834 "Branch.c" +#line 2873 "Branch.c" } static guint8* string_get_data (const gchar* self, int* result_length1) { guint8* result; guint8* res = NULL; - gint res_length1 = 0; - gint _res_size_ = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - guint8* _tmp3_ = NULL; - gint _tmp3__length1 = 0; - guint8* _tmp4_ = NULL; - gint _tmp4__length1 = 0; -#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint res_length1; + gint _res_size_; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; + guint8* _tmp3_; + gint _tmp3__length1; + guint8* _tmp4_; + gint _tmp4__length1; +#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = (guint8*) self; -#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res_length1 = -1; -#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _res_size_ = res_length1; -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res_length1 = (gint) _tmp1_; -#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = res_length1; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = res; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = res_length1; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = _tmp3__length1; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (result_length1) { -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" *result_length1 = _tmp4__length1; -#line 2878 "Branch.c" +#line 2917 "Branch.c" } -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2884 "Branch.c" +#line 2923 "Branch.c" } static void tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data) { TagsSidebarEntry * self; - GtkSelectionData* _tmp0_ = NULL; - GdkAtom _tmp1_ = 0U; - Tag* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - guint8* _tmp5_ = NULL; - gint _tmp5__length1 = 0; - guint8* _tmp6_ = NULL; - gint _tmp6__length1 = 0; + GtkSelectionData* _tmp0_; + GdkAtom _tmp1_; + Tag* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + guint8* _tmp5_; + gint _tmp5__length1; + guint8* _tmp6_; + gint _tmp6__length1; #line 286 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); #line 286 "/home/jens/Source/shotwell/src/tags/Branch.vala" @@ -2919,7 +2958,7 @@ static void tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragS gtk_selection_data_set (_tmp0_, _tmp1_, 0, _tmp6_, _tmp6__length1); #line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala" _g_free0 (_tmp4_); -#line 2923 "Branch.c" +#line 2962 "Branch.c" } @@ -2929,14 +2968,14 @@ static void tags_sidebar_entry_class_init (TagsSidebarEntryClass * klass) { #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" g_type_class_add_private (klass, sizeof (TagsSidebarEntryPrivate)); #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) tags_sidebar_entry_real_get_sidebar_name; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) tags_sidebar_entry_real_get_sidebar_name; #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) tags_sidebar_entry_real_get_sidebar_icon; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) tags_sidebar_entry_real_get_sidebar_icon; #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) tags_sidebar_entry_real_create_page; + ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) tags_sidebar_entry_real_create_page; #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" G_OBJECT_CLASS (klass)->finalize = tags_sidebar_entry_finalize; -#line 2940 "Branch.c" +#line 2979 "Branch.c" } @@ -2944,10 +2983,10 @@ static void tags_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarR #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" tags_sidebar_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" - iface->is_user_renameable = (gboolean (*)(SidebarRenameableEntry*)) tags_sidebar_entry_real_is_user_renameable; + iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) tags_sidebar_entry_real_is_user_renameable; #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" - iface->rename = (void (*)(SidebarRenameableEntry*, const gchar*)) tags_sidebar_entry_real_rename; -#line 2951 "Branch.c" + iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) tags_sidebar_entry_real_rename; +#line 2990 "Branch.c" } @@ -2955,8 +2994,8 @@ static void tags_sidebar_entry_sidebar_destroyable_entry_interface_init (Sidebar #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" tags_sidebar_entry_sidebar_destroyable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" - iface->destroy_source = (void (*)(SidebarDestroyableEntry*)) tags_sidebar_entry_real_destroy_source; -#line 2960 "Branch.c" + iface->destroy_source = (void (*) (SidebarDestroyableEntry *)) tags_sidebar_entry_real_destroy_source; +#line 2999 "Branch.c" } @@ -2964,10 +3003,10 @@ static void tags_sidebar_entry_sidebar_internal_drop_target_entry_interface_init #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" tags_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface); #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" - iface->internal_drop_received = (gboolean (*)(SidebarInternalDropTargetEntry*, GeeList*)) tags_sidebar_entry_real_internal_drop_received; + iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) tags_sidebar_entry_real_internal_drop_received; #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" - iface->internal_drop_received_arbitrary = (gboolean (*)(SidebarInternalDropTargetEntry*, GtkSelectionData*)) tags_sidebar_entry_real_internal_drop_received_arbitrary; -#line 2971 "Branch.c" + iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) tags_sidebar_entry_real_internal_drop_received_arbitrary; +#line 3010 "Branch.c" } @@ -2975,8 +3014,8 @@ static void tags_sidebar_entry_sidebar_expandable_entry_interface_init (SidebarE #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" tags_sidebar_entry_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" - iface->expand_on_select = (gboolean (*)(SidebarExpandableEntry*)) tags_sidebar_entry_real_expand_on_select; -#line 2980 "Branch.c" + iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) tags_sidebar_entry_real_expand_on_select; +#line 3019 "Branch.c" } @@ -2984,24 +3023,24 @@ static void tags_sidebar_entry_sidebar_internal_drag_source_entry_interface_init #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" tags_sidebar_entry_sidebar_internal_drag_source_entry_parent_iface = g_type_interface_peek_parent (iface); #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" - iface->prepare_selection_data = (void (*)(SidebarInternalDragSourceEntry*, GtkSelectionData*)) tags_sidebar_entry_real_prepare_selection_data; -#line 2989 "Branch.c" + iface->prepare_selection_data = (void (*) (SidebarInternalDragSourceEntry *, GtkSelectionData*)) tags_sidebar_entry_real_prepare_selection_data; +#line 3028 "Branch.c" } static void tags_sidebar_entry_instance_init (TagsSidebarEntry * self) { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" self->priv = TAGS_SIDEBAR_ENTRY_GET_PRIVATE (self); #line 189 "/home/jens/Source/shotwell/src/tags/Branch.vala" _tmp0_ = g_strdup (RESOURCES_ICON_ONE_TAG); #line 189 "/home/jens/Source/shotwell/src/tags/Branch.vala" self->priv->single_tag_icon = _tmp0_; -#line 3001 "Branch.c" +#line 3040 "Branch.c" } -static void tags_sidebar_entry_finalize (GObject* obj) { +static void tags_sidebar_entry_finalize (GObject * obj) { TagsSidebarEntry * self; #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry); @@ -3011,7 +3050,7 @@ static void tags_sidebar_entry_finalize (GObject* obj) { _g_object_unref0 (self->priv->tag); #line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala" G_OBJECT_CLASS (tags_sidebar_entry_parent_class)->finalize (obj); -#line 3015 "Branch.c" +#line 3054 "Branch.c" } -- cgit v1.2.3