summaryrefslogtreecommitdiff
path: root/src/sidebar
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-15 20:38:57 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-15 20:38:57 +0100
commitf1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (patch)
treea1f2ab30332a6383b0677bfcc2aec687b98851d6 /src/sidebar
parentf8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff)
parentede50c561ec9811704821a9ea0f04c3d6c20b5af (diff)
Merge branch 'release/0.26.4-1'0.26.4-1
Diffstat (limited to 'src/sidebar')
-rw-r--r--src/sidebar/Branch.c1094
-rw-r--r--src/sidebar/Entry.c90
-rw-r--r--src/sidebar/Sidebar.c2
-rw-r--r--src/sidebar/Tree.c2859
-rw-r--r--src/sidebar/common.c148
5 files changed, 2118 insertions, 2075 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"
}
diff --git a/src/sidebar/Entry.c b/src/sidebar/Entry.c
index 1456a05..254fe54 100644
--- a/src/sidebar/Entry.c
+++ b/src/sidebar/Entry.c
@@ -1,4 +1,4 @@
-/* Entry.c generated by valac 0.34.7, the Vala compiler
+/* Entry.c generated by valac 0.36.6, the Vala compiler
* generated from Entry.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -32,6 +32,12 @@ typedef struct _SidebarEntryIface SidebarEntryIface;
typedef struct _SidebarTree SidebarTree;
typedef struct _SidebarTreeClass SidebarTreeClass;
+enum {
+ SIDEBAR_ENTRY_SIDEBAR_TOOLTIP_CHANGED_SIGNAL,
+ SIDEBAR_ENTRY_SIDEBAR_ICON_CHANGED_SIGNAL,
+ SIDEBAR_ENTRY_LAST_SIGNAL
+};
+static guint sidebar_entry_signals[SIDEBAR_ENTRY_LAST_SIGNAL] = {0};
#define SIDEBAR_TYPE_EXPANDABLE_ENTRY (sidebar_expandable_entry_get_type ())
#define SIDEBAR_EXPANDABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_EXPANDABLE_ENTRY, SidebarExpandableEntry))
@@ -66,6 +72,12 @@ typedef struct _SidebarPageRepresentativeIface SidebarPageRepresentativeIface;
typedef struct _Page Page;
typedef struct _PageClass PageClass;
+enum {
+ SIDEBAR_PAGE_REPRESENTATIVE_PAGE_CREATED_SIGNAL,
+ SIDEBAR_PAGE_REPRESENTATIVE_DESTROYING_PAGE_SIGNAL,
+ SIDEBAR_PAGE_REPRESENTATIVE_LAST_SIGNAL
+};
+static guint sidebar_page_representative_signals[SIDEBAR_PAGE_REPRESENTATIVE_LAST_SIGNAL] = {0};
#define SIDEBAR_TYPE_RENAMEABLE_ENTRY (sidebar_renameable_entry_get_type ())
#define SIDEBAR_RENAMEABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry))
@@ -74,6 +86,11 @@ typedef struct _PageClass PageClass;
typedef struct _SidebarRenameableEntry SidebarRenameableEntry;
typedef struct _SidebarRenameableEntryIface SidebarRenameableEntryIface;
+enum {
+ SIDEBAR_RENAMEABLE_ENTRY_SIDEBAR_NAME_CHANGED_SIGNAL,
+ SIDEBAR_RENAMEABLE_ENTRY_LAST_SIGNAL
+};
+static guint sidebar_renameable_entry_signals[SIDEBAR_RENAMEABLE_ENTRY_LAST_SIGNAL] = {0};
#define SIDEBAR_TYPE_EMPHASIZABLE_ENTRY (sidebar_emphasizable_entry_get_type ())
#define SIDEBAR_EMPHASIZABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, SidebarEmphasizableEntry))
@@ -82,6 +99,11 @@ typedef struct _SidebarRenameableEntryIface SidebarRenameableEntryIface;
typedef struct _SidebarEmphasizableEntry SidebarEmphasizableEntry;
typedef struct _SidebarEmphasizableEntryIface SidebarEmphasizableEntryIface;
+enum {
+ SIDEBAR_EMPHASIZABLE_ENTRY_IS_EMPHASIZED_CHANGED_SIGNAL,
+ SIDEBAR_EMPHASIZABLE_ENTRY_LAST_SIGNAL
+};
+static guint sidebar_emphasizable_entry_signals[SIDEBAR_EMPHASIZABLE_ENTRY_LAST_SIGNAL] = {0};
#define SIDEBAR_TYPE_DESTROYABLE_ENTRY (sidebar_destroyable_entry_get_type ())
#define SIDEBAR_DESTROYABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_DESTROYABLE_ENTRY, SidebarDestroyableEntry))
@@ -241,7 +263,7 @@ gchar* sidebar_entry_get_sidebar_name (SidebarEntry* self) {
g_return_val_if_fail (SIDEBAR_IS_ENTRY (self), NULL);
#line 12 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
return SIDEBAR_ENTRY_GET_INTERFACE (self)->get_sidebar_name (self);
-#line 245 "Entry.c"
+#line 267 "Entry.c"
}
@@ -250,7 +272,7 @@ gchar* sidebar_entry_get_sidebar_tooltip (SidebarEntry* self) {
g_return_val_if_fail (SIDEBAR_IS_ENTRY (self), NULL);
#line 14 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
return SIDEBAR_ENTRY_GET_INTERFACE (self)->get_sidebar_tooltip (self);
-#line 254 "Entry.c"
+#line 276 "Entry.c"
}
@@ -259,7 +281,7 @@ gchar* sidebar_entry_get_sidebar_icon (SidebarEntry* self) {
g_return_val_if_fail (SIDEBAR_IS_ENTRY (self), NULL);
#line 16 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
return SIDEBAR_ENTRY_GET_INTERFACE (self)->get_sidebar_icon (self);
-#line 263 "Entry.c"
+#line 285 "Entry.c"
}
@@ -268,14 +290,14 @@ gchar* sidebar_entry_to_string (SidebarEntry* self) {
g_return_val_if_fail (SIDEBAR_IS_ENTRY (self), NULL);
#line 18 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
return SIDEBAR_ENTRY_GET_INTERFACE (self)->to_string (self);
-#line 272 "Entry.c"
+#line 294 "Entry.c"
}
static void sidebar_entry_real_grafted (SidebarEntry* self, SidebarTree* tree) {
#line 20 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
g_return_if_fail (SIDEBAR_IS_TREE (tree));
-#line 279 "Entry.c"
+#line 301 "Entry.c"
}
@@ -284,14 +306,14 @@ void sidebar_entry_grafted (SidebarEntry* self, SidebarTree* tree) {
g_return_if_fail (SIDEBAR_IS_ENTRY (self));
#line 20 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
SIDEBAR_ENTRY_GET_INTERFACE (self)->grafted (self, tree);
-#line 288 "Entry.c"
+#line 310 "Entry.c"
}
static void sidebar_entry_real_pruned (SidebarEntry* self, SidebarTree* tree) {
#line 23 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
g_return_if_fail (SIDEBAR_IS_TREE (tree));
-#line 295 "Entry.c"
+#line 317 "Entry.c"
}
@@ -300,7 +322,7 @@ void sidebar_entry_pruned (SidebarEntry* self, SidebarTree* tree) {
g_return_if_fail (SIDEBAR_IS_ENTRY (self));
#line 23 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
SIDEBAR_ENTRY_GET_INTERFACE (self)->pruned (self, tree);
-#line 304 "Entry.c"
+#line 326 "Entry.c"
}
@@ -312,14 +334,14 @@ static void sidebar_entry_base_init (SidebarEntryIface * iface) {
#line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
initialized = TRUE;
#line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
- g_signal_new ("sidebar_tooltip_changed", SIDEBAR_TYPE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+ sidebar_entry_signals[SIDEBAR_ENTRY_SIDEBAR_TOOLTIP_CHANGED_SIGNAL] = g_signal_new ("sidebar-tooltip-changed", SIDEBAR_TYPE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
#line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
- g_signal_new ("sidebar_icon_changed", SIDEBAR_TYPE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+ sidebar_entry_signals[SIDEBAR_ENTRY_SIDEBAR_ICON_CHANGED_SIGNAL] = g_signal_new ("sidebar-icon-changed", SIDEBAR_TYPE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
#line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
iface->grafted = sidebar_entry_real_grafted;
#line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
iface->pruned = sidebar_entry_real_pruned;
-#line 323 "Entry.c"
+#line 345 "Entry.c"
}
}
@@ -342,7 +364,7 @@ gboolean sidebar_expandable_entry_expand_on_select (SidebarExpandableEntry* self
g_return_val_if_fail (SIDEBAR_IS_EXPANDABLE_ENTRY (self), FALSE);
#line 28 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
return SIDEBAR_EXPANDABLE_ENTRY_GET_INTERFACE (self)->expand_on_select (self);
-#line 346 "Entry.c"
+#line 368 "Entry.c"
}
@@ -353,7 +375,7 @@ static void sidebar_expandable_entry_base_init (SidebarExpandableEntryIface * if
if (!initialized) {
#line 27 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
initialized = TRUE;
-#line 357 "Entry.c"
+#line 379 "Entry.c"
}
}
@@ -378,7 +400,7 @@ static void sidebar_selectable_entry_base_init (SidebarSelectableEntryIface * if
if (!initialized) {
#line 31 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
initialized = TRUE;
-#line 382 "Entry.c"
+#line 404 "Entry.c"
}
}
@@ -401,7 +423,7 @@ gboolean sidebar_page_representative_has_page (SidebarPageRepresentative* self)
g_return_val_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (self), FALSE);
#line 41 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
return SIDEBAR_PAGE_REPRESENTATIVE_GET_INTERFACE (self)->has_page (self);
-#line 405 "Entry.c"
+#line 427 "Entry.c"
}
@@ -410,7 +432,7 @@ Page* sidebar_page_representative_get_page (SidebarPageRepresentative* self) {
g_return_val_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (self), NULL);
#line 43 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
return SIDEBAR_PAGE_REPRESENTATIVE_GET_INTERFACE (self)->get_page (self);
-#line 414 "Entry.c"
+#line 436 "Entry.c"
}
@@ -422,10 +444,10 @@ static void sidebar_page_representative_base_init (SidebarPageRepresentativeIfac
#line 34 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
initialized = TRUE;
#line 34 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
- g_signal_new ("page_created", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_PAGE);
+ sidebar_page_representative_signals[SIDEBAR_PAGE_REPRESENTATIVE_PAGE_CREATED_SIGNAL] = g_signal_new ("page-created", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_PAGE);
#line 34 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
- g_signal_new ("destroying_page", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_PAGE);
-#line 429 "Entry.c"
+ sidebar_page_representative_signals[SIDEBAR_PAGE_REPRESENTATIVE_DESTROYING_PAGE_SIGNAL] = g_signal_new ("destroying-page", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_PAGE);
+#line 451 "Entry.c"
}
}
@@ -449,7 +471,7 @@ void sidebar_renameable_entry_rename (SidebarRenameableEntry* self, const gchar*
g_return_if_fail (SIDEBAR_IS_RENAMEABLE_ENTRY (self));
#line 49 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
SIDEBAR_RENAMEABLE_ENTRY_GET_INTERFACE (self)->rename (self, new_name);
-#line 453 "Entry.c"
+#line 475 "Entry.c"
}
@@ -458,7 +480,7 @@ gboolean sidebar_renameable_entry_is_user_renameable (SidebarRenameableEntry* se
g_return_val_if_fail (SIDEBAR_IS_RENAMEABLE_ENTRY (self), FALSE);
#line 52 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
return SIDEBAR_RENAMEABLE_ENTRY_GET_INTERFACE (self)->is_user_renameable (self);
-#line 462 "Entry.c"
+#line 484 "Entry.c"
}
@@ -470,8 +492,8 @@ static void sidebar_renameable_entry_base_init (SidebarRenameableEntryIface * if
#line 46 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
initialized = TRUE;
#line 46 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
- g_signal_new ("sidebar_name_changed", SIDEBAR_TYPE_RENAMEABLE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 475 "Entry.c"
+ sidebar_renameable_entry_signals[SIDEBAR_RENAMEABLE_ENTRY_SIDEBAR_NAME_CHANGED_SIGNAL] = g_signal_new ("sidebar-name-changed", SIDEBAR_TYPE_RENAMEABLE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+#line 497 "Entry.c"
}
}
@@ -494,7 +516,7 @@ gboolean sidebar_emphasizable_entry_is_emphasized (SidebarEmphasizableEntry* sel
g_return_val_if_fail (SIDEBAR_IS_EMPHASIZABLE_ENTRY (self), FALSE);
#line 58 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
return SIDEBAR_EMPHASIZABLE_ENTRY_GET_INTERFACE (self)->is_emphasized (self);
-#line 498 "Entry.c"
+#line 520 "Entry.c"
}
@@ -506,8 +528,8 @@ static void sidebar_emphasizable_entry_base_init (SidebarEmphasizableEntryIface
#line 55 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
initialized = TRUE;
#line 55 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
- g_signal_new ("is_emphasized_changed", SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 511 "Entry.c"
+ sidebar_emphasizable_entry_signals[SIDEBAR_EMPHASIZABLE_ENTRY_IS_EMPHASIZED_CHANGED_SIGNAL] = g_signal_new ("is-emphasized-changed", SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+#line 533 "Entry.c"
}
}
@@ -530,7 +552,7 @@ void sidebar_destroyable_entry_destroy_source (SidebarDestroyableEntry* self) {
g_return_if_fail (SIDEBAR_IS_DESTROYABLE_ENTRY (self));
#line 62 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
SIDEBAR_DESTROYABLE_ENTRY_GET_INTERFACE (self)->destroy_source (self);
-#line 534 "Entry.c"
+#line 556 "Entry.c"
}
@@ -541,7 +563,7 @@ static void sidebar_destroyable_entry_base_init (SidebarDestroyableEntryIface *
if (!initialized) {
#line 61 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
initialized = TRUE;
-#line 545 "Entry.c"
+#line 567 "Entry.c"
}
}
@@ -564,7 +586,7 @@ gboolean sidebar_internal_drop_target_entry_internal_drop_received (SidebarInter
g_return_val_if_fail (SIDEBAR_IS_INTERNAL_DROP_TARGET_ENTRY (self), FALSE);
#line 67 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
return SIDEBAR_INTERNAL_DROP_TARGET_ENTRY_GET_INTERFACE (self)->internal_drop_received (self, sources);
-#line 568 "Entry.c"
+#line 590 "Entry.c"
}
@@ -573,7 +595,7 @@ gboolean sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (Si
g_return_val_if_fail (SIDEBAR_IS_INTERNAL_DROP_TARGET_ENTRY (self), FALSE);
#line 68 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
return SIDEBAR_INTERNAL_DROP_TARGET_ENTRY_GET_INTERFACE (self)->internal_drop_received_arbitrary (self, data);
-#line 577 "Entry.c"
+#line 599 "Entry.c"
}
@@ -584,7 +606,7 @@ static void sidebar_internal_drop_target_entry_base_init (SidebarInternalDropTar
if (!initialized) {
#line 65 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
initialized = TRUE;
-#line 588 "Entry.c"
+#line 610 "Entry.c"
}
}
@@ -607,7 +629,7 @@ void sidebar_internal_drag_source_entry_prepare_selection_data (SidebarInternalD
g_return_if_fail (SIDEBAR_IS_INTERNAL_DRAG_SOURCE_ENTRY (self));
#line 72 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
SIDEBAR_INTERNAL_DRAG_SOURCE_ENTRY_GET_INTERFACE (self)->prepare_selection_data (self, data);
-#line 611 "Entry.c"
+#line 633 "Entry.c"
}
@@ -618,7 +640,7 @@ static void sidebar_internal_drag_source_entry_base_init (SidebarInternalDragSou
if (!initialized) {
#line 71 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
initialized = TRUE;
-#line 622 "Entry.c"
+#line 644 "Entry.c"
}
}
diff --git a/src/sidebar/Sidebar.c b/src/sidebar/Sidebar.c
index 9bffe74..7a44e33 100644
--- a/src/sidebar/Sidebar.c
+++ b/src/sidebar/Sidebar.c
@@ -1,4 +1,4 @@
-/* Sidebar.c generated by valac 0.34.7, the Vala compiler
+/* Sidebar.c generated by valac 0.36.6, the Vala compiler
* generated from Sidebar.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/sidebar/Tree.c b/src/sidebar/Tree.c
index 31d8b38..c6bb85d 100644
--- a/src/sidebar/Tree.c
+++ b/src/sidebar/Tree.c
@@ -1,4 +1,4 @@
-/* Tree.c generated by valac 0.34.7, the Vala compiler
+/* Tree.c generated by valac 0.36.6, the Vala compiler
* generated from Tree.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -325,6 +325,17 @@ typedef struct _LibraryWindowClass LibraryWindowClass;
typedef struct _Tag Tag;
typedef struct _TagClass TagClass;
+enum {
+ SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL,
+ SIDEBAR_TREE_SELECTED_ENTRY_REMOVED_SIGNAL,
+ SIDEBAR_TREE_BRANCH_ADDED_SIGNAL,
+ SIDEBAR_TREE_BRANCH_REMOVED_SIGNAL,
+ SIDEBAR_TREE_BRANCH_SHOWN_SIGNAL,
+ SIDEBAR_TREE_PAGE_CREATED_SIGNAL,
+ SIDEBAR_TREE_DESTROYING_PAGE_SIGNAL,
+ SIDEBAR_TREE_LAST_SIGNAL
+};
+static guint sidebar_tree_signals[SIDEBAR_TREE_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; }
@@ -486,7 +497,7 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self);
static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self);
GType library_window_target_type_get_type (void) G_GNUC_CONST;
-static void _vala_array_add64 (GtkTargetEntry** array, int* length, int* size, const GtkTargetEntry* value);
+static void _vala_array_add64 (GtkTargetEntry* * array, int* length, int* size, const GtkTargetEntry* value);
static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self);
static gboolean _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu (GtkWidget* _sender, gpointer self);
static void sidebar_tree_setup_default_context_menu (SidebarTree* self);
@@ -668,26 +679,26 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
enum {
SIDEBAR_TREE_ENTRY_WRAPPER_DUMMY_PROPERTY
};
-static void sidebar_tree_entry_wrapper_finalize (GObject* obj);
+static void sidebar_tree_entry_wrapper_finalize (GObject * obj);
enum {
SIDEBAR_TREE_ROOT_WRAPPER_DUMMY_PROPERTY
};
-static void sidebar_tree_root_wrapper_finalize (GObject* obj);
-static void sidebar_tree_finalize (GObject* obj);
+static void sidebar_tree_root_wrapper_finalize (GObject * obj);
+static void sidebar_tree_finalize (GObject * obj);
static const GActionEntry SIDEBAR_TREE_entries[2] = {{"tag.new", _sidebar_tree_on_new_tag_gsimple_action_activate_callback}, {"search.new", _sidebar_tree_on_new_search_gsimple_action_activate_callback}};
static void _sidebar_tree_on_editing_canceled_gtk_cell_renderer_editing_canceled (GtkCellRenderer* _sender, gpointer self) {
#line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_on_editing_canceled ((SidebarTree*) self);
-#line 684 "Tree.c"
+#line 695 "Tree.c"
}
static void _sidebar_tree_on_editing_started_gtk_cell_renderer_editing_started (GtkCellRenderer* _sender, GtkCellEditable* editable, const gchar* path, gpointer self) {
#line 157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_on_editing_started ((SidebarTree*) self, editable, path);
-#line 691 "Tree.c"
+#line 702 "Tree.c"
}
@@ -706,28 +717,28 @@ static GType sidebar_tree_columns_get_type (void) {
static void _sidebar_tree_on_new_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_on_new_tag ((SidebarTree*) self);
-#line 710 "Tree.c"
+#line 721 "Tree.c"
}
static void _sidebar_tree_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_on_new_search ((SidebarTree*) self);
-#line 717 "Tree.c"
+#line 728 "Tree.c"
}
static void _sidebar_tree_icon_renderer_function_gtk_cell_layout_data_func (GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer self) {
#line 104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_icon_renderer_function ((SidebarTree*) self, cell_layout, cell, tree_model, iter);
-#line 724 "Tree.c"
+#line 735 "Tree.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 127 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return self ? g_object_ref (self) : NULL;
-#line 731 "Tree.c"
+#line 742 "Tree.c"
}
@@ -736,7 +747,7 @@ static gboolean _sidebar_tree_on_selection_gtk_tree_selection_func (GtkTreeSelec
result = sidebar_tree_on_selection ((SidebarTree*) self, selection, model, path, path_currently_selected);
#line 129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 740 "Tree.c"
+#line 751 "Tree.c"
}
@@ -745,7 +756,7 @@ static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row (GtkTr
result = sidebar_tree_on_toggle_row ((SidebarTree*) self, iter, path);
#line 131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 749 "Tree.c"
+#line 760 "Tree.c"
}
@@ -754,22 +765,22 @@ static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row (Gtk
result = sidebar_tree_on_toggle_row ((SidebarTree*) self, iter, path);
#line 132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 758 "Tree.c"
+#line 769 "Tree.c"
}
-static void _vala_array_add64 (GtkTargetEntry** array, int* length, int* size, const GtkTargetEntry* value) {
+static void _vala_array_add64 (GtkTargetEntry* * array, int* length, int* size, const GtkTargetEntry* value) {
#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if ((*length) == (*size)) {
#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
*array = g_renew (GtkTargetEntry, *array, *size);
-#line 769 "Tree.c"
+#line 780 "Tree.c"
}
#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
(*array)[(*length)++] = *value;
-#line 773 "Tree.c"
+#line 784 "Tree.c"
}
@@ -778,21 +789,21 @@ static gboolean _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu (Gt
result = sidebar_tree_on_context_menu_keypress ((SidebarTree*) self);
#line 146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 782 "Tree.c"
+#line 793 "Tree.c"
}
static void _sidebar_tree_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
#line 150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_on_drag_begin ((SidebarTree*) self, context);
-#line 789 "Tree.c"
+#line 800 "Tree.c"
}
static void _sidebar_tree_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
#line 151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_on_drag_end ((SidebarTree*) self, context);
-#line 796 "Tree.c"
+#line 807 "Tree.c"
}
@@ -801,47 +812,47 @@ static gboolean _sidebar_tree_on_drag_motion_gtk_widget_drag_motion (GtkWidget*
result = sidebar_tree_on_drag_motion ((SidebarTree*) self, context, x, y, time_);
#line 152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 805 "Tree.c"
+#line 816 "Tree.c"
}
SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target) {
SidebarTree * self = NULL;
- GtkTreeStore* _tmp0_ = NULL;
- GtkStyleContext* _tmp1_ = NULL;
+ GtkTreeStore* _tmp0_;
+ GtkStyleContext* _tmp1_;
GtkTreeViewColumn* text_column = NULL;
- GtkTreeViewColumn* _tmp2_ = NULL;
+ GtkTreeViewColumn* _tmp2_;
GtkCellRendererPixbuf* icon_renderer = NULL;
- GtkCellRendererPixbuf* _tmp3_ = NULL;
- GtkCellRendererText* _tmp4_ = NULL;
- GtkCellRendererText* _tmp5_ = NULL;
- GtkCellRendererText* _tmp6_ = NULL;
- GtkCellRendererText* _tmp7_ = NULL;
- GtkCellRendererText* _tmp8_ = NULL;
- GtkCellRendererText* _tmp9_ = NULL;
+ GtkCellRendererPixbuf* _tmp3_;
+ GtkCellRendererText* _tmp4_;
+ GtkCellRendererText* _tmp5_;
+ GtkCellRendererText* _tmp6_;
+ GtkCellRendererText* _tmp7_;
+ GtkCellRendererText* _tmp8_;
+ GtkCellRendererText* _tmp9_;
GtkCellRendererText* invisitext = NULL;
- GtkCellRendererText* _tmp10_ = NULL;
+ GtkCellRendererText* _tmp10_;
GtkTreeViewColumn* page_holder = NULL;
- GtkTreeViewColumn* _tmp11_ = NULL;
+ GtkTreeViewColumn* _tmp11_;
GtkTreeSelection* selection = NULL;
- GtkTreeSelection* _tmp12_ = NULL;
- GtkTreeSelection* _tmp13_ = NULL;
- GtkTargetEntry* _tmp14_ = NULL;
- gint _tmp14__length1 = 0;
- GdkDragAction _tmp15_ = 0;
+ GtkTreeSelection* _tmp12_;
+ GtkTreeSelection* _tmp13_;
+ GtkTargetEntry* _tmp14_;
+ gint _tmp14__length1;
+ GdkDragAction _tmp15_;
GtkTargetEntry* source_entries = NULL;
- GtkTargetEntry* _tmp16_ = NULL;
- gint source_entries_length1 = 0;
- gint _source_entries_size_ = 0;
- GtkTargetEntry* _tmp17_ = NULL;
- gint _tmp17__length1 = 0;
- GtkTargetEntry* _tmp18_ = NULL;
- gint _tmp18__length1 = 0;
- GtkTargetEntry _tmp19_ = {0};
- GtkTargetEntry* _tmp20_ = NULL;
- gint _tmp20__length1 = 0;
- SidebarTreeExternalDropHandler _tmp21_ = NULL;
- void* _tmp21__target = NULL;
+ GtkTargetEntry* _tmp16_;
+ gint source_entries_length1;
+ gint _source_entries_size_;
+ GtkTargetEntry* _tmp17_;
+ gint _tmp17__length1;
+ GtkTargetEntry* _tmp18_;
+ gint _tmp18__length1;
+ GtkTargetEntry _tmp19_;
+ GtkTargetEntry* _tmp20_;
+ gint _tmp20__length1;
+ SidebarTreeExternalDropHandler _tmp21_;
+ void* _tmp21__target;
#line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
self = (SidebarTree*) g_object_new (object_type, NULL);
#line 95 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1016,25 +1027,25 @@ SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_e
_g_object_unref0 (text_column);
#line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return self;
-#line 1020 "Tree.c"
+#line 1031 "Tree.c"
}
SidebarTree* sidebar_tree_new (GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target) {
#line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return sidebar_tree_construct (SIDEBAR_TYPE_TREE, target_entries, target_entries_length1, actions, drop_handler, drop_handler_target);
-#line 1027 "Tree.c"
+#line 1038 "Tree.c"
}
void sidebar_tree_icon_renderer_function (SidebarTree* self, GtkCellLayout* layout, GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter) {
SidebarTreeEntryWrapper* wrapper = NULL;
- GtkTreeIter _tmp0_ = {0};
- SidebarTreeEntryWrapper* _tmp1_ = NULL;
- SidebarTreeEntryWrapper* _tmp2_ = NULL;
- GtkCellRenderer* _tmp3_ = NULL;
- SidebarTreeEntryWrapper* _tmp4_ = NULL;
- SidebarEntry* _tmp5_ = NULL;
+ GtkTreeIter _tmp0_;
+ SidebarTreeEntryWrapper* _tmp1_;
+ SidebarTreeEntryWrapper* _tmp2_;
+ GtkCellRenderer* _tmp3_;
+ SidebarTreeEntryWrapper* _tmp4_;
+ SidebarEntry* _tmp5_;
#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1059,7 +1070,7 @@ void sidebar_tree_icon_renderer_function (SidebarTree* self, GtkCellLayout* layo
_g_object_unref0 (wrapper);
#line 163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return;
-#line 1063 "Tree.c"
+#line 1074 "Tree.c"
}
#line 165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp3_ = renderer;
@@ -1071,7 +1082,7 @@ void sidebar_tree_icon_renderer_function (SidebarTree* self, GtkCellLayout* layo
gtk_cell_renderer_set_visible (_tmp3_, !G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_HEADER));
#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (wrapper);
-#line 1075 "Tree.c"
+#line 1086 "Tree.c"
}
@@ -1082,7 +1093,7 @@ static void sidebar_tree_on_drag_begin (SidebarTree* self, GdkDragContext* ctx)
g_return_if_fail (GDK_IS_DRAG_CONTEXT (ctx));
#line 169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
self->priv->is_internal_drag_in_progress = TRUE;
-#line 1086 "Tree.c"
+#line 1097 "Tree.c"
}
@@ -1097,14 +1108,14 @@ static void sidebar_tree_on_drag_end (SidebarTree* self, GdkDragContext* ctx) {
_g_object_unref0 (self->priv->internal_drag_source_entry);
#line 174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
self->priv->internal_drag_source_entry = NULL;
-#line 1101 "Tree.c"
+#line 1112 "Tree.c"
}
static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext* context, gint x, gint y, guint time_) {
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
#line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
#line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1113,28 +1124,28 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext*
_tmp1_ = self->priv->is_internal_drag_in_progress;
#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp1_) {
-#line 1117 "Tree.c"
- SidebarEntry* _tmp2_ = NULL;
+#line 1128 "Tree.c"
+ SidebarEntry* _tmp2_;
#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp2_ = self->priv->internal_drag_source_entry;
#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp0_ = _tmp2_ == NULL;
-#line 1123 "Tree.c"
+#line 1134 "Tree.c"
} else {
#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp0_ = FALSE;
-#line 1127 "Tree.c"
+#line 1138 "Tree.c"
}
#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp0_) {
-#line 1131 "Tree.c"
+#line 1142 "Tree.c"
GtkTreePath* path = NULL;
GtkTreeViewDropPosition position = 0;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
+ gint _tmp3_;
+ gint _tmp4_;
GtkTreePath* _tmp5_ = NULL;
GtkTreeViewDropPosition _tmp6_ = 0;
- GtkTreePath* _tmp7_ = NULL;
+ GtkTreePath* _tmp7_;
#line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp3_ = x;
#line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1151,11 +1162,11 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext*
_tmp7_ = path;
#line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp7_ != NULL) {
-#line 1155 "Tree.c"
+#line 1166 "Tree.c"
SidebarTreeEntryWrapper* wrapper = NULL;
- GtkTreePath* _tmp8_ = NULL;
- SidebarTreeEntryWrapper* _tmp9_ = NULL;
- SidebarTreeEntryWrapper* _tmp10_ = NULL;
+ GtkTreePath* _tmp8_;
+ SidebarTreeEntryWrapper* _tmp9_;
+ SidebarTreeEntryWrapper* _tmp10_;
#line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp8_ = path;
#line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1166,10 +1177,10 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext*
_tmp10_ = wrapper;
#line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp10_ != NULL) {
-#line 1170 "Tree.c"
- SidebarTreeEntryWrapper* _tmp11_ = NULL;
- SidebarEntry* _tmp12_ = NULL;
- SidebarEntry* _tmp13_ = NULL;
+#line 1181 "Tree.c"
+ SidebarTreeEntryWrapper* _tmp11_;
+ SidebarEntry* _tmp12_;
+ SidebarEntry* _tmp13_;
#line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp11_ = wrapper;
#line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1180,21 +1191,21 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext*
_g_object_unref0 (self->priv->internal_drag_source_entry);
#line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
self->priv->internal_drag_source_entry = _tmp13_;
-#line 1184 "Tree.c"
+#line 1195 "Tree.c"
}
#line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (wrapper);
-#line 1188 "Tree.c"
+#line 1199 "Tree.c"
}
#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_gtk_tree_path_free0 (path);
-#line 1192 "Tree.c"
+#line 1203 "Tree.c"
}
#line 190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
result = FALSE;
#line 190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 1198 "Tree.c"
+#line 1209 "Tree.c"
}
@@ -1202,22 +1213,22 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
GError * _inner_error_ = NULL;
#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1206 "Tree.c"
+#line 1217 "Tree.c"
{
- GtkBuilder* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
+ GtkBuilder* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
GMenuModel* model = NULL;
- GtkBuilder* _tmp3_ = NULL;
- GObject* _tmp4_ = NULL;
- GMenuModel* _tmp5_ = NULL;
- GMenuModel* _tmp6_ = NULL;
- GtkMenu* _tmp7_ = NULL;
+ GtkBuilder* _tmp3_;
+ GObject* _tmp4_;
+ GMenuModel* _tmp5_;
+ GMenuModel* _tmp6_;
+ GtkMenu* _tmp7_;
GSimpleActionGroup* group = NULL;
- GSimpleActionGroup* _tmp8_ = NULL;
- GSimpleActionGroup* _tmp9_ = NULL;
- GSimpleActionGroup* _tmp10_ = NULL;
- GtkMenu* _tmp11_ = NULL;
+ GSimpleActionGroup* _tmp8_;
+ GSimpleActionGroup* _tmp9_;
+ GSimpleActionGroup* _tmp10_;
+ GtkMenu* _tmp11_;
#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp0_ = self->priv->builder;
#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1230,7 +1241,7 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
_g_free0 (_tmp2_);
#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1234 "Tree.c"
+#line 1245 "Tree.c"
goto __catch51_g_error;
}
#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1271,18 +1282,18 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
_g_object_unref0 (group);
#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (model);
-#line 1275 "Tree.c"
+#line 1286 "Tree.c"
}
goto __finally51;
__catch51_g_error:
{
GError* _error_ = NULL;
- GError* _tmp12_ = NULL;
- const gchar* _tmp13_ = NULL;
- gchar* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- Application* _tmp16_ = NULL;
- Application* _tmp17_ = NULL;
+ GError* _tmp12_;
+ const gchar* _tmp13_;
+ gchar* _tmp14_;
+ gchar* _tmp15_;
+ Application* _tmp16_;
+ Application* _tmp17_;
#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_error_ = _inner_error_;
#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1309,7 +1320,7 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
_application_unref0 (_tmp17_);
#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_error_free0 (_error_);
-#line 1313 "Tree.c"
+#line 1324 "Tree.c"
}
__finally51:
#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1320,16 +1331,16 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
g_clear_error (&_inner_error_);
#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return;
-#line 1324 "Tree.c"
+#line 1335 "Tree.c"
}
}
static gboolean sidebar_tree_has_wrapper (SidebarTree* self, SidebarEntry* entry) {
gboolean result = FALSE;
- GeeHashMap* _tmp0_ = NULL;
- SidebarEntry* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ GeeHashMap* _tmp0_;
+ SidebarEntry* _tmp1_;
+ gboolean _tmp2_;
#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1344,17 +1355,17 @@ static gboolean sidebar_tree_has_wrapper (SidebarTree* self, SidebarEntry* entry
result = _tmp2_;
#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 1348 "Tree.c"
+#line 1359 "Tree.c"
}
static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper (SidebarTree* self, SidebarEntry* entry) {
SidebarTreeEntryWrapper* result = NULL;
SidebarTreeEntryWrapper* wrapper = NULL;
- GeeHashMap* _tmp0_ = NULL;
- SidebarEntry* _tmp1_ = NULL;
- gpointer _tmp2_ = NULL;
- SidebarTreeEntryWrapper* _tmp3_ = NULL;
+ GeeHashMap* _tmp0_;
+ SidebarEntry* _tmp1_;
+ gpointer _tmp2_;
+ SidebarTreeEntryWrapper* _tmp3_;
#line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
#line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1371,10 +1382,10 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper (SidebarTree* self, Sid
_tmp3_ = wrapper;
#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp3_ == NULL) {
-#line 1375 "Tree.c"
- SidebarEntry* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
+#line 1386 "Tree.c"
+ SidebarEntry* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp4_ = entry;
#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1385,26 +1396,26 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper (SidebarTree* self, Sid
g_warning ("Tree.vala:221: Entry %s not found in sidebar", _tmp6_);
#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_free0 (_tmp6_);
-#line 1389 "Tree.c"
+#line 1400 "Tree.c"
}
#line 223 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
result = wrapper;
#line 223 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 1395 "Tree.c"
+#line 1406 "Tree.c"
}
static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* self, GtkTreeIter* iter) {
SidebarTreeEntryWrapper* result = NULL;
GValue val = {0};
- GtkTreeStore* _tmp0_ = NULL;
- GtkTreeIter _tmp1_ = {0};
+ GtkTreeStore* _tmp0_;
+ GtkTreeIter _tmp1_;
GValue _tmp2_ = {0};
SidebarTreeEntryWrapper* wrapper = NULL;
- GValue _tmp3_ = {0};
- SidebarTreeEntryWrapper* _tmp4_ = NULL;
- SidebarTreeEntryWrapper* _tmp5_ = NULL;
+ GValue _tmp3_;
+ SidebarTreeEntryWrapper* _tmp4_;
+ SidebarTreeEntryWrapper* _tmp5_;
#line 226 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
#line 226 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1429,13 +1440,13 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s
_tmp5_ = wrapper;
#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp5_ == NULL) {
-#line 1433 "Tree.c"
- GtkTreeStore* _tmp6_ = NULL;
- GtkTreeIter _tmp7_ = {0};
- GtkTreePath* _tmp8_ = NULL;
- GtkTreePath* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
+#line 1444 "Tree.c"
+ GtkTreeStore* _tmp6_;
+ GtkTreeIter _tmp7_;
+ GtkTreePath* _tmp8_;
+ GtkTreePath* _tmp9_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp6_ = self->priv->store;
#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1454,7 +1465,7 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s
_g_free0 (_tmp11_);
#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_gtk_tree_path_free0 (_tmp9_);
-#line 1458 "Tree.c"
+#line 1469 "Tree.c"
}
#line 234 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
result = wrapper;
@@ -1462,19 +1473,19 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s
G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
#line 234 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 1466 "Tree.c"
+#line 1477 "Tree.c"
}
static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* self, GtkTreePath* path) {
SidebarTreeEntryWrapper* result = NULL;
GtkTreeIter iter = {0};
- GtkTreeStore* _tmp0_ = NULL;
- GtkTreePath* _tmp1_ = NULL;
+ GtkTreeStore* _tmp0_;
+ GtkTreePath* _tmp1_;
GtkTreeIter _tmp2_ = {0};
- gboolean _tmp3_ = FALSE;
- GtkTreeIter _tmp7_ = {0};
- SidebarTreeEntryWrapper* _tmp8_ = NULL;
+ gboolean _tmp3_;
+ GtkTreeIter _tmp7_;
+ SidebarTreeEntryWrapper* _tmp8_;
#line 237 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
#line 237 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1489,10 +1500,10 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* s
iter = _tmp2_;
#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (!_tmp3_) {
-#line 1493 "Tree.c"
- GtkTreePath* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
+#line 1504 "Tree.c"
+ GtkTreePath* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp4_ = path;
#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1507,7 +1518,7 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* s
result = NULL;
#line 242 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 1511 "Tree.c"
+#line 1522 "Tree.c"
}
#line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp7_ = iter;
@@ -1517,28 +1528,28 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* s
result = _tmp8_;
#line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 1521 "Tree.c"
+#line 1532 "Tree.c"
}
gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboolean mask_signal) {
gboolean result = FALSE;
- SidebarEntry* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ SidebarEntry* _tmp0_;
+ gboolean _tmp1_;
SidebarTreeEntryWrapper* wrapper = NULL;
- SidebarEntry* _tmp2_ = NULL;
- SidebarTreeEntryWrapper* _tmp3_ = NULL;
- SidebarTreeEntryWrapper* _tmp4_ = NULL;
- GtkTreeSelection* _tmp5_ = NULL;
- SidebarTreeEntryWrapper* _tmp6_ = NULL;
- GtkTreePath* _tmp7_ = NULL;
- GtkTreePath* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
- SidebarTreeEntryWrapper* _tmp10_ = NULL;
- GtkTreePath* _tmp11_ = NULL;
- GtkTreePath* _tmp12_ = NULL;
- SidebarEntry* _tmp13_ = NULL;
- gboolean _tmp14_ = FALSE;
+ SidebarEntry* _tmp2_;
+ SidebarTreeEntryWrapper* _tmp3_;
+ SidebarTreeEntryWrapper* _tmp4_;
+ GtkTreeSelection* _tmp5_;
+ SidebarTreeEntryWrapper* _tmp6_;
+ GtkTreePath* _tmp7_;
+ GtkTreePath* _tmp8_;
+ gboolean _tmp9_;
+ SidebarTreeEntryWrapper* _tmp10_;
+ GtkTreePath* _tmp11_;
+ GtkTreePath* _tmp12_;
+ SidebarEntry* _tmp13_;
+ gboolean _tmp14_;
#line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
#line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1553,7 +1564,7 @@ gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboo
result = FALSE;
#line 252 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 1557 "Tree.c"
+#line 1568 "Tree.c"
}
#line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp2_ = entry;
@@ -1571,7 +1582,7 @@ gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboo
_g_object_unref0 (wrapper);
#line 256 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 1575 "Tree.c"
+#line 1586 "Tree.c"
}
#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp5_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
@@ -1611,21 +1622,21 @@ gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboo
_g_object_unref0 (wrapper);
#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 1615 "Tree.c"
+#line 1626 "Tree.c"
}
gboolean sidebar_tree_is_selected (SidebarTree* self, SidebarEntry* entry) {
gboolean result = FALSE;
SidebarTreeEntryWrapper* wrapper = NULL;
- SidebarEntry* _tmp0_ = NULL;
- SidebarTreeEntryWrapper* _tmp1_ = NULL;
+ SidebarEntry* _tmp0_;
+ SidebarTreeEntryWrapper* _tmp1_;
GtkTreeSelection* selection = NULL;
- GtkTreeSelection* _tmp2_ = NULL;
- GtkTreeSelection* _tmp3_ = NULL;
- GtkTreeSelection* _tmp4_ = NULL;
+ GtkTreeSelection* _tmp2_;
+ GtkTreeSelection* _tmp3_;
+ GtkTreeSelection* _tmp4_;
gboolean _tmp5_ = FALSE;
- SidebarTreeEntryWrapper* _tmp6_ = NULL;
+ SidebarTreeEntryWrapper* _tmp6_;
#line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
#line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1654,18 +1665,18 @@ gboolean sidebar_tree_is_selected (SidebarTree* self, SidebarEntry* entry) {
_g_object_unref0 (wrapper);
#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 1658 "Tree.c"
+#line 1669 "Tree.c"
}
#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp6_ = wrapper;
#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp6_ != NULL) {
-#line 1664 "Tree.c"
- GtkTreeSelection* _tmp7_ = NULL;
- SidebarTreeEntryWrapper* _tmp8_ = NULL;
- GtkTreePath* _tmp9_ = NULL;
- GtkTreePath* _tmp10_ = NULL;
- gboolean _tmp11_ = FALSE;
+#line 1675 "Tree.c"
+ GtkTreeSelection* _tmp7_;
+ SidebarTreeEntryWrapper* _tmp8_;
+ GtkTreePath* _tmp9_;
+ GtkTreePath* _tmp10_;
+ gboolean _tmp11_;
#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp7_ = selection;
#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1680,11 +1691,11 @@ gboolean sidebar_tree_is_selected (SidebarTree* self, SidebarEntry* entry) {
_tmp5_ = _tmp11_;
#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_gtk_tree_path_free0 (_tmp10_);
-#line 1684 "Tree.c"
+#line 1695 "Tree.c"
} else {
#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp5_ = FALSE;
-#line 1688 "Tree.c"
+#line 1699 "Tree.c"
}
#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
result = _tmp5_;
@@ -1694,14 +1705,14 @@ gboolean sidebar_tree_is_selected (SidebarTree* self, SidebarEntry* entry) {
_g_object_unref0 (wrapper);
#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 1698 "Tree.c"
+#line 1709 "Tree.c"
}
gboolean sidebar_tree_is_any_selected (SidebarTree* self) {
gboolean result = FALSE;
- GtkTreeSelection* _tmp0_ = NULL;
- gint _tmp1_ = 0;
+ GtkTreeSelection* _tmp0_;
+ gint _tmp1_;
#line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1712,21 +1723,21 @@ gboolean sidebar_tree_is_any_selected (SidebarTree* self) {
result = _tmp1_ != 0;
#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 1716 "Tree.c"
+#line 1727 "Tree.c"
}
static gpointer _gtk_tree_path_copy0 (gpointer self) {
#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return self ? gtk_tree_path_copy (self) : NULL;
-#line 1723 "Tree.c"
+#line 1734 "Tree.c"
}
static void _gtk_tree_path_free0_ (gpointer var) {
#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
(var == NULL) ? NULL : (var = (gtk_tree_path_free (var), NULL));
-#line 1730 "Tree.c"
+#line 1741 "Tree.c"
}
@@ -1735,7 +1746,7 @@ static void _g_list_free__gtk_tree_path_free0_ (GList* self) {
g_list_foreach (self, (GFunc) _gtk_tree_path_free0_, NULL);
#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_list_free (self);
-#line 1739 "Tree.c"
+#line 1750 "Tree.c"
}
@@ -1743,21 +1754,21 @@ static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) {
GtkTreePath* result = NULL;
GtkTreeModel* model = NULL;
GtkTreeSelection* selection = NULL;
- GtkTreeSelection* _tmp0_ = NULL;
- GtkTreeSelection* _tmp1_ = NULL;
- GtkTreeSelection* _tmp2_ = NULL;
+ GtkTreeSelection* _tmp0_;
+ GtkTreeSelection* _tmp1_;
+ GtkTreeSelection* _tmp2_;
GList* rows = NULL;
- GtkTreeSelection* _tmp3_ = NULL;
+ GtkTreeSelection* _tmp3_;
GtkTreeModel* _tmp4_ = NULL;
- GList* _tmp5_ = NULL;
- GtkTreeModel* _tmp6_ = NULL;
+ GList* _tmp5_;
+ GtkTreeModel* _tmp6_;
gboolean _tmp7_ = FALSE;
- GList* _tmp8_ = NULL;
- guint _tmp9_ = 0U;
+ GList* _tmp8_;
+ guint _tmp9_;
GtkTreePath* _tmp12_ = NULL;
- GList* _tmp13_ = NULL;
- guint _tmp14_ = 0U;
- GtkTreePath* _tmp17_ = NULL;
+ GList* _tmp13_;
+ guint _tmp14_;
+ GtkTreePath* _tmp17_;
#line 283 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
#line 285 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1778,7 +1789,7 @@ static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) {
_g_object_unref0 (model);
#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 1782 "Tree.c"
+#line 1793 "Tree.c"
}
#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp3_ = selection;
@@ -1800,17 +1811,17 @@ static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) {
if (_tmp9_ == ((guint) 0)) {
#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp7_ = TRUE;
-#line 1804 "Tree.c"
+#line 1815 "Tree.c"
} else {
- GList* _tmp10_ = NULL;
- guint _tmp11_ = 0U;
+ GList* _tmp10_;
+ guint _tmp11_;
#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp10_ = rows;
#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp11_ = g_list_length (_tmp10_);
#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp7_ = _tmp11_ == ((guint) 1);
-#line 1814 "Tree.c"
+#line 1825 "Tree.c"
}
#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_vala_assert (_tmp7_, "rows.length() == 0 || rows.length() == 1");
@@ -1820,20 +1831,20 @@ static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) {
_tmp14_ = g_list_length (_tmp13_);
#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp14_ != ((guint) 0)) {
-#line 1824 "Tree.c"
- GList* _tmp15_ = NULL;
- gconstpointer _tmp16_ = NULL;
+#line 1835 "Tree.c"
+ GList* _tmp15_;
+ gconstpointer _tmp16_;
#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp15_ = rows;
#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp16_ = g_list_nth_data (_tmp15_, (guint) 0);
#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp12_ = (GtkTreePath*) _tmp16_;
-#line 1833 "Tree.c"
+#line 1844 "Tree.c"
} else {
#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp12_ = NULL;
-#line 1837 "Tree.c"
+#line 1848 "Tree.c"
}
#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp17_ = _gtk_tree_path_copy0 (_tmp12_);
@@ -1847,23 +1858,23 @@ static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) {
_g_object_unref0 (model);
#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 1851 "Tree.c"
+#line 1862 "Tree.c"
}
static gchar* sidebar_tree_get_name_for_entry (SidebarTree* self, SidebarEntry* entry) {
gchar* result = NULL;
gchar* name = NULL;
- SidebarEntry* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ SidebarEntry* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
SidebarEmphasizableEntry* emphasizable_entry = NULL;
- SidebarEntry* _tmp5_ = NULL;
- SidebarEmphasizableEntry* _tmp6_ = NULL;
+ SidebarEntry* _tmp5_;
+ SidebarEmphasizableEntry* _tmp6_;
gboolean _tmp7_ = FALSE;
- SidebarEmphasizableEntry* _tmp8_ = NULL;
+ SidebarEmphasizableEntry* _tmp8_;
#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1892,26 +1903,26 @@ static gchar* sidebar_tree_get_name_for_entry (SidebarTree* self, SidebarEntry*
_tmp8_ = emphasizable_entry;
#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp8_ != NULL) {
-#line 1896 "Tree.c"
- SidebarEmphasizableEntry* _tmp9_ = NULL;
- gboolean _tmp10_ = FALSE;
+#line 1907 "Tree.c"
+ SidebarEmphasizableEntry* _tmp9_;
+ gboolean _tmp10_;
#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp9_ = emphasizable_entry;
#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp10_ = sidebar_emphasizable_entry_is_emphasized (_tmp9_);
#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp7_ = _tmp10_;
-#line 1905 "Tree.c"
+#line 1916 "Tree.c"
} else {
#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp7_ = FALSE;
-#line 1909 "Tree.c"
+#line 1920 "Tree.c"
}
#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp7_) {
-#line 1913 "Tree.c"
- const gchar* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
+#line 1924 "Tree.c"
+ const gchar* _tmp11_;
+ gchar* _tmp12_;
#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp11_ = name;
#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1920,7 +1931,7 @@ static gchar* sidebar_tree_get_name_for_entry (SidebarTree* self, SidebarEntry*
_g_free0 (name);
#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
name = _tmp12_;
-#line 1924 "Tree.c"
+#line 1935 "Tree.c"
}
#line 302 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
result = name;
@@ -1928,7 +1939,7 @@ static gchar* sidebar_tree_get_name_for_entry (SidebarTree* self, SidebarEntry*
_g_object_unref0 (emphasizable_entry);
#line 302 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 1932 "Tree.c"
+#line 1943 "Tree.c"
}
@@ -1938,7 +1949,7 @@ static gboolean sidebar_tree_real_accept_cursor_changed (SidebarTree* self) {
result = TRUE;
#line 306 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 1942 "Tree.c"
+#line 1953 "Tree.c"
}
@@ -1947,20 +1958,20 @@ gboolean sidebar_tree_accept_cursor_changed (SidebarTree* self) {
g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
#line 305 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return SIDEBAR_TREE_GET_CLASS (self)->accept_cursor_changed (self);
-#line 1951 "Tree.c"
+#line 1962 "Tree.c"
}
static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
SidebarTree * self;
GtkTreePath* path = NULL;
- GtkTreePath* _tmp0_ = NULL;
- GtkTreePath* _tmp1_ = NULL;
+ GtkTreePath* _tmp0_;
+ GtkTreePath* _tmp1_;
SidebarTreeEntryWrapper* wrapper = NULL;
- GtkTreePath* _tmp2_ = NULL;
- SidebarTreeEntryWrapper* _tmp3_ = NULL;
- SidebarTreeEntryWrapper* _tmp4_ = NULL;
- SidebarTreeEntryWrapper* _tmp5_ = NULL;
+ GtkTreePath* _tmp2_;
+ SidebarTreeEntryWrapper* _tmp3_;
+ SidebarTreeEntryWrapper* _tmp4_;
+ SidebarTreeEntryWrapper* _tmp5_;
#line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1975,13 +1986,13 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
if (GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed != NULL) {
#line 313 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 1979 "Tree.c"
+#line 1990 "Tree.c"
}
#line 314 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_gtk_tree_path_free0 (path);
#line 314 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return;
-#line 1985 "Tree.c"
+#line 1996 "Tree.c"
}
#line 317 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp2_ = path;
@@ -1995,16 +2006,16 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
_tmp5_ = wrapper;
#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp4_ != _tmp5_) {
-#line 1999 "Tree.c"
+#line 2010 "Tree.c"
SidebarTreeEntryWrapper* old_wrapper = NULL;
- SidebarTreeEntryWrapper* _tmp6_ = NULL;
- SidebarTreeEntryWrapper* _tmp7_ = NULL;
- SidebarTreeEntryWrapper* _tmp8_ = NULL;
+ SidebarTreeEntryWrapper* _tmp6_;
+ SidebarTreeEntryWrapper* _tmp7_;
+ SidebarTreeEntryWrapper* _tmp8_;
gboolean _tmp9_ = FALSE;
gboolean _tmp10_ = FALSE;
- gint _tmp11_ = 0;
+ gint _tmp11_;
gboolean _tmp19_ = FALSE;
- SidebarTreeEntryWrapper* _tmp20_ = NULL;
+ SidebarTreeEntryWrapper* _tmp20_;
#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp6_ = self->priv->selected_wrapper;
#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2019,42 +2030,42 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
_tmp11_ = self->priv->editing_disabled;
#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp11_ == 0) {
-#line 2023 "Tree.c"
- SidebarTreeEntryWrapper* _tmp12_ = NULL;
+#line 2034 "Tree.c"
+ SidebarTreeEntryWrapper* _tmp12_;
#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp12_ = wrapper;
#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp10_ = _tmp12_ != NULL;
-#line 2029 "Tree.c"
+#line 2040 "Tree.c"
} else {
#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp10_ = FALSE;
-#line 2033 "Tree.c"
+#line 2044 "Tree.c"
}
#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp10_) {
-#line 2037 "Tree.c"
- SidebarTreeEntryWrapper* _tmp13_ = NULL;
- SidebarEntry* _tmp14_ = NULL;
+#line 2048 "Tree.c"
+ SidebarTreeEntryWrapper* _tmp13_;
+ SidebarEntry* _tmp14_;
#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp13_ = wrapper;
#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp14_ = _tmp13_->entry;
#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, SIDEBAR_TYPE_RENAMEABLE_ENTRY);
-#line 2046 "Tree.c"
+#line 2057 "Tree.c"
} else {
#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp9_ = FALSE;
-#line 2050 "Tree.c"
+#line 2061 "Tree.c"
}
#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp9_) {
-#line 2054 "Tree.c"
- GtkCellRendererText* _tmp15_ = NULL;
- SidebarTreeEntryWrapper* _tmp16_ = NULL;
- SidebarEntry* _tmp17_ = NULL;
- gboolean _tmp18_ = FALSE;
+#line 2065 "Tree.c"
+ GtkCellRendererText* _tmp15_;
+ SidebarTreeEntryWrapper* _tmp16_;
+ SidebarEntry* _tmp17_;
+ gboolean _tmp18_;
#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp15_ = self->priv->text_renderer;
#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2065,32 +2076,32 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
_tmp18_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry));
#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_object_set (_tmp15_, "editable", _tmp18_, NULL);
-#line 2069 "Tree.c"
+#line 2080 "Tree.c"
}
#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp20_ = wrapper;
#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp20_ != NULL) {
-#line 2075 "Tree.c"
- gboolean _tmp21_ = FALSE;
+#line 2086 "Tree.c"
+ gboolean _tmp21_;
#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp21_ = self->priv->mask_entry_selected_signal;
#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp19_ = !_tmp21_;
-#line 2081 "Tree.c"
+#line 2092 "Tree.c"
} else {
#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp19_ = FALSE;
-#line 2085 "Tree.c"
+#line 2096 "Tree.c"
}
#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp19_) {
-#line 2089 "Tree.c"
+#line 2100 "Tree.c"
SidebarSelectableEntry* selectable = NULL;
- SidebarTreeEntryWrapper* _tmp22_ = NULL;
- SidebarEntry* _tmp23_ = NULL;
- SidebarSelectableEntry* _tmp24_ = NULL;
- SidebarSelectableEntry* _tmp25_ = NULL;
+ SidebarTreeEntryWrapper* _tmp22_;
+ SidebarEntry* _tmp23_;
+ SidebarSelectableEntry* _tmp24_;
+ SidebarSelectableEntry* _tmp25_;
#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp22_ = wrapper;
#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2103,55 +2114,55 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
_tmp25_ = selectable;
#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp25_ != NULL) {
-#line 2107 "Tree.c"
- gboolean _tmp26_ = FALSE;
+#line 2118 "Tree.c"
+ gboolean _tmp26_;
#line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp26_ = sidebar_tree_accept_cursor_changed (self);
#line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp26_) {
-#line 2113 "Tree.c"
- SidebarSelectableEntry* _tmp27_ = NULL;
+#line 2124 "Tree.c"
+ SidebarSelectableEntry* _tmp27_;
#line 330 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp27_ = selectable;
#line 330 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- g_signal_emit_by_name (self, "entry-selected", _tmp27_);
-#line 2119 "Tree.c"
+ g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL], 0, _tmp27_);
+#line 2130 "Tree.c"
} else {
- SidebarTreeEntryWrapper* _tmp28_ = NULL;
- SidebarEntry* _tmp29_ = NULL;
+ SidebarTreeEntryWrapper* _tmp28_;
+ SidebarEntry* _tmp29_;
#line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp28_ = old_wrapper;
#line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp29_ = _tmp28_->entry;
#line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_place_cursor (self, _tmp29_, TRUE);
-#line 2129 "Tree.c"
+#line 2140 "Tree.c"
}
}
#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (selectable);
-#line 2134 "Tree.c"
+#line 2145 "Tree.c"
}
#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (old_wrapper);
-#line 2138 "Tree.c"
+#line 2149 "Tree.c"
}
#line 338 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed != NULL) {
#line 339 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 2144 "Tree.c"
+#line 2155 "Tree.c"
}
#line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (wrapper);
#line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_gtk_tree_path_free0 (path);
-#line 2150 "Tree.c"
+#line 2161 "Tree.c"
}
void sidebar_tree_disable_editing (SidebarTree* self) {
- gint _tmp0_ = 0;
+ gint _tmp0_;
#line 342 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2160,23 +2171,23 @@ void sidebar_tree_disable_editing (SidebarTree* self) {
self->priv->editing_disabled = _tmp0_ + 1;
#line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp0_ == 0) {
-#line 2164 "Tree.c"
- GtkCellRendererText* _tmp1_ = NULL;
+#line 2175 "Tree.c"
+ GtkCellRendererText* _tmp1_;
#line 344 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp1_ = self->priv->text_renderer;
#line 344 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_object_set (_tmp1_, "editable", FALSE, NULL);
-#line 2170 "Tree.c"
+#line 2181 "Tree.c"
}
}
void sidebar_tree_enable_editing (SidebarTree* self) {
GtkTreePath* path = NULL;
- GtkTreePath* _tmp0_ = NULL;
+ GtkTreePath* _tmp0_;
gboolean _tmp1_ = FALSE;
gboolean _tmp2_ = FALSE;
- GtkTreePath* _tmp3_ = NULL;
+ GtkTreePath* _tmp3_;
#line 347 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2187,23 +2198,23 @@ void sidebar_tree_enable_editing (SidebarTree* self) {
_tmp3_ = path;
#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp3_ != NULL) {
-#line 2191 "Tree.c"
- gint _tmp4_ = 0;
+#line 2202 "Tree.c"
+ gint _tmp4_;
#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp4_ = self->priv->editing_disabled;
#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp2_ = _tmp4_ > 0;
-#line 2197 "Tree.c"
+#line 2208 "Tree.c"
} else {
#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp2_ = FALSE;
-#line 2201 "Tree.c"
+#line 2212 "Tree.c"
}
#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp2_) {
-#line 2205 "Tree.c"
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
+#line 2216 "Tree.c"
+ gint _tmp5_;
+ gint _tmp6_;
#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp5_ = self->priv->editing_disabled;
#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2212,20 +2223,20 @@ void sidebar_tree_enable_editing (SidebarTree* self) {
_tmp6_ = self->priv->editing_disabled;
#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp1_ = _tmp6_ == 0;
-#line 2216 "Tree.c"
+#line 2227 "Tree.c"
} else {
#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp1_ = FALSE;
-#line 2220 "Tree.c"
+#line 2231 "Tree.c"
}
#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp1_) {
-#line 2224 "Tree.c"
+#line 2235 "Tree.c"
SidebarTreeEntryWrapper* wrapper = NULL;
- GtkTreePath* _tmp7_ = NULL;
- SidebarTreeEntryWrapper* _tmp8_ = NULL;
+ GtkTreePath* _tmp7_;
+ SidebarTreeEntryWrapper* _tmp8_;
gboolean _tmp9_ = FALSE;
- SidebarTreeEntryWrapper* _tmp10_ = NULL;
+ SidebarTreeEntryWrapper* _tmp10_;
#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp7_ = path;
#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2236,28 +2247,28 @@ void sidebar_tree_enable_editing (SidebarTree* self) {
_tmp10_ = wrapper;
#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp10_ != NULL) {
-#line 2240 "Tree.c"
- SidebarTreeEntryWrapper* _tmp11_ = NULL;
- SidebarEntry* _tmp12_ = NULL;
+#line 2251 "Tree.c"
+ SidebarTreeEntryWrapper* _tmp11_;
+ SidebarEntry* _tmp12_;
#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp11_ = wrapper;
#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp12_ = _tmp11_->entry;
#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, SIDEBAR_TYPE_RENAMEABLE_ENTRY);
-#line 2249 "Tree.c"
+#line 2260 "Tree.c"
} else {
#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp9_ = FALSE;
-#line 2253 "Tree.c"
+#line 2264 "Tree.c"
}
#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp9_) {
-#line 2257 "Tree.c"
- GtkCellRendererText* _tmp13_ = NULL;
- SidebarTreeEntryWrapper* _tmp14_ = NULL;
- SidebarEntry* _tmp15_ = NULL;
- gboolean _tmp16_ = FALSE;
+#line 2268 "Tree.c"
+ GtkCellRendererText* _tmp13_;
+ SidebarTreeEntryWrapper* _tmp14_;
+ SidebarEntry* _tmp15_;
+ gboolean _tmp16_;
#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp13_ = self->priv->text_renderer;
#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2268,21 +2279,21 @@ void sidebar_tree_enable_editing (SidebarTree* self) {
_tmp16_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry));
#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_object_set (_tmp13_, "editable", _tmp16_, NULL);
-#line 2272 "Tree.c"
+#line 2283 "Tree.c"
}
#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (wrapper);
-#line 2276 "Tree.c"
+#line 2287 "Tree.c"
}
#line 347 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_gtk_tree_path_free0 (path);
-#line 2280 "Tree.c"
+#line 2291 "Tree.c"
}
void sidebar_tree_toggle_branch_expansion (SidebarTree* self, GtkTreePath* path, gboolean expand_all) {
- GtkTreePath* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ GtkTreePath* _tmp0_;
+ gboolean _tmp1_;
#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2295,23 +2306,23 @@ void sidebar_tree_toggle_branch_expansion (SidebarTree* self, GtkTreePath* path,
_tmp1_ = gtk_tree_view_row_expanded (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp0_);
#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp1_) {
-#line 2299 "Tree.c"
- GtkTreePath* _tmp2_ = NULL;
+#line 2310 "Tree.c"
+ GtkTreePath* _tmp2_;
#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp2_ = path;
#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
gtk_tree_view_collapse_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp2_);
-#line 2305 "Tree.c"
+#line 2316 "Tree.c"
} else {
- GtkTreePath* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+ GtkTreePath* _tmp3_;
+ gboolean _tmp4_;
#line 362 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp3_ = path;
#line 362 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp4_ = expand_all;
#line 362 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
gtk_tree_view_expand_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp3_, _tmp4_);
-#line 2315 "Tree.c"
+#line 2326 "Tree.c"
}
}
@@ -2319,12 +2330,12 @@ void sidebar_tree_toggle_branch_expansion (SidebarTree* self, GtkTreePath* path,
gboolean sidebar_tree_expand_to_entry (SidebarTree* self, SidebarEntry* entry) {
gboolean result = FALSE;
SidebarTreeEntryWrapper* wrapper = NULL;
- SidebarEntry* _tmp0_ = NULL;
- SidebarTreeEntryWrapper* _tmp1_ = NULL;
- SidebarTreeEntryWrapper* _tmp2_ = NULL;
- SidebarTreeEntryWrapper* _tmp3_ = NULL;
- GtkTreePath* _tmp4_ = NULL;
- GtkTreePath* _tmp5_ = NULL;
+ SidebarEntry* _tmp0_;
+ SidebarTreeEntryWrapper* _tmp1_;
+ SidebarTreeEntryWrapper* _tmp2_;
+ SidebarTreeEntryWrapper* _tmp3_;
+ GtkTreePath* _tmp4_;
+ GtkTreePath* _tmp5_;
#line 365 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
#line 365 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2347,7 +2358,7 @@ gboolean sidebar_tree_expand_to_entry (SidebarTree* self, SidebarEntry* entry) {
_g_object_unref0 (wrapper);
#line 369 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 2351 "Tree.c"
+#line 2362 "Tree.c"
}
#line 371 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp3_ = wrapper;
@@ -2365,20 +2376,20 @@ gboolean sidebar_tree_expand_to_entry (SidebarTree* self, SidebarEntry* entry) {
_g_object_unref0 (wrapper);
#line 373 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 2369 "Tree.c"
+#line 2380 "Tree.c"
}
void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry) {
SidebarTreeEntryWrapper* wrapper = NULL;
- SidebarEntry* _tmp0_ = NULL;
- SidebarTreeEntryWrapper* _tmp1_ = NULL;
- SidebarTreeEntryWrapper* _tmp2_ = NULL;
+ SidebarEntry* _tmp0_;
+ SidebarTreeEntryWrapper* _tmp1_;
+ SidebarTreeEntryWrapper* _tmp2_;
GtkTreePath* path = NULL;
- SidebarTreeEntryWrapper* _tmp3_ = NULL;
- GtkTreePath* _tmp4_ = NULL;
+ SidebarTreeEntryWrapper* _tmp3_;
+ GtkTreePath* _tmp4_;
GtkTreeIter iter = {0};
- GtkTreePath* _tmp13_ = NULL;
+ GtkTreePath* _tmp13_;
#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2399,7 +2410,7 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry)
_g_object_unref0 (wrapper);
#line 380 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return;
-#line 2403 "Tree.c"
+#line 2414 "Tree.c"
}
#line 382 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp3_ = wrapper;
@@ -2409,15 +2420,15 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry)
path = _tmp4_;
#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
while (TRUE) {
-#line 2413 "Tree.c"
- GtkTreeStore* _tmp5_ = NULL;
- GtkTreePath* _tmp6_ = NULL;
+#line 2424 "Tree.c"
+ GtkTreeStore* _tmp5_;
+ GtkTreePath* _tmp6_;
GtkTreeIter _tmp7_ = {0};
- gboolean _tmp8_ = FALSE;
- GtkTreeStore* _tmp9_ = NULL;
- GtkTreeIter _tmp10_ = {0};
- gboolean _tmp11_ = FALSE;
- GtkTreePath* _tmp12_ = NULL;
+ gboolean _tmp8_;
+ GtkTreeStore* _tmp9_;
+ GtkTreeIter _tmp10_;
+ gboolean _tmp11_;
+ GtkTreePath* _tmp12_;
#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp5_ = self->priv->store;
#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2430,7 +2441,7 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry)
if (!_tmp8_) {
#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
break;
-#line 2434 "Tree.c"
+#line 2445 "Tree.c"
}
#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp9_ = self->priv->store;
@@ -2442,13 +2453,13 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry)
if (!_tmp11_) {
#line 387 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
break;
-#line 2446 "Tree.c"
+#line 2457 "Tree.c"
}
#line 389 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp12_ = path;
#line 389 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
gtk_tree_path_down (_tmp12_);
-#line 2452 "Tree.c"
+#line 2463 "Tree.c"
}
#line 392 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp13_ = path;
@@ -2458,69 +2469,69 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry)
_gtk_tree_path_free0 (path);
#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (wrapper);
-#line 2462 "Tree.c"
+#line 2473 "Tree.c"
}
static void _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
#line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_on_branch_entry_added ((SidebarTree*) self, _sender, entry);
-#line 2469 "Tree.c"
+#line 2480 "Tree.c"
}
static void _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_on_branch_entry_removed ((SidebarTree*) self, _sender, entry);
-#line 2476 "Tree.c"
+#line 2487 "Tree.c"
}
static void _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_on_branch_entry_moved ((SidebarTree*) self, _sender, entry);
-#line 2483 "Tree.c"
+#line 2494 "Tree.c"
}
static void _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented (SidebarBranch* _sender, SidebarEntry* entry, SidebarEntry* old_parent, gpointer self) {
#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_on_branch_entry_reparented ((SidebarTree*) self, _sender, entry, old_parent);
-#line 2490 "Tree.c"
+#line 2501 "Tree.c"
}
static void _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_on_branch_children_reordered ((SidebarTree*) self, _sender, entry);
-#line 2497 "Tree.c"
+#line 2508 "Tree.c"
}
static void _sidebar_tree_on_show_branch_sidebar_branch_show_branch (SidebarBranch* _sender, gboolean show, gpointer self) {
#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_on_show_branch ((SidebarTree*) self, _sender, show);
-#line 2504 "Tree.c"
+#line 2515 "Tree.c"
}
void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position) {
- gint _tmp0_ = 0;
- GeeHashMap* _tmp1_ = NULL;
- SidebarBranch* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
- GeeHashMap* _tmp4_ = NULL;
- SidebarBranch* _tmp5_ = NULL;
- gint _tmp6_ = 0;
- SidebarBranch* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
- SidebarBranch* _tmp20_ = NULL;
- SidebarBranch* _tmp21_ = NULL;
- SidebarBranch* _tmp22_ = NULL;
- SidebarBranch* _tmp23_ = NULL;
- SidebarBranch* _tmp24_ = NULL;
- SidebarBranch* _tmp25_ = NULL;
- SidebarBranch* _tmp26_ = NULL;
+ gint _tmp0_;
+ GeeHashMap* _tmp1_;
+ SidebarBranch* _tmp2_;
+ gboolean _tmp3_;
+ GeeHashMap* _tmp4_;
+ SidebarBranch* _tmp5_;
+ gint _tmp6_;
+ SidebarBranch* _tmp7_;
+ gboolean _tmp8_;
+ SidebarBranch* _tmp20_;
+ SidebarBranch* _tmp21_;
+ SidebarBranch* _tmp22_;
+ SidebarBranch* _tmp23_;
+ SidebarBranch* _tmp24_;
+ SidebarBranch* _tmp25_;
+ SidebarBranch* _tmp26_;
#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2551,12 +2562,12 @@ void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position
_tmp8_ = sidebar_branch_get_show_branch (_tmp7_);
#line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp8_) {
-#line 2555 "Tree.c"
- SidebarBranch* _tmp9_ = NULL;
- SidebarBranch* _tmp10_ = NULL;
- gboolean _tmp11_ = FALSE;
- SidebarBranch* _tmp15_ = NULL;
- gboolean _tmp16_ = FALSE;
+#line 2566 "Tree.c"
+ SidebarBranch* _tmp9_;
+ SidebarBranch* _tmp10_;
+ gboolean _tmp11_;
+ SidebarBranch* _tmp15_;
+ gboolean _tmp16_;
#line 401 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp9_ = branch;
#line 401 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2567,10 +2578,10 @@ void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position
_tmp11_ = sidebar_branch_is_startup_expand_to_first_child (_tmp10_);
#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp11_) {
-#line 2571 "Tree.c"
- SidebarBranch* _tmp12_ = NULL;
- SidebarEntry* _tmp13_ = NULL;
- SidebarEntry* _tmp14_ = NULL;
+#line 2582 "Tree.c"
+ SidebarBranch* _tmp12_;
+ SidebarEntry* _tmp13_;
+ SidebarEntry* _tmp14_;
#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp12_ = branch;
#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2581,7 +2592,7 @@ void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position
sidebar_tree_expand_to_first_child (self, _tmp14_);
#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (_tmp14_);
-#line 2585 "Tree.c"
+#line 2596 "Tree.c"
}
#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp15_ = branch;
@@ -2589,10 +2600,10 @@ void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position
_tmp16_ = sidebar_branch_is_startup_open_grouping (_tmp15_);
#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp16_) {
-#line 2593 "Tree.c"
- SidebarBranch* _tmp17_ = NULL;
- SidebarEntry* _tmp18_ = NULL;
- SidebarEntry* _tmp19_ = NULL;
+#line 2604 "Tree.c"
+ SidebarBranch* _tmp17_;
+ SidebarEntry* _tmp18_;
+ SidebarEntry* _tmp19_;
#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp17_ = branch;
#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2603,7 +2614,7 @@ void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position
sidebar_tree_expand_to_entry (self, _tmp19_);
#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (_tmp19_);
-#line 2607 "Tree.c"
+#line 2618 "Tree.c"
}
}
#line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2633,8 +2644,8 @@ void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position
#line 417 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp26_ = branch;
#line 417 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- g_signal_emit_by_name (self, "branch-added", _tmp26_);
-#line 2638 "Tree.c"
+ g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_ADDED_SIGNAL], 0, _tmp26_);
+#line 2649 "Tree.c"
}
@@ -2646,52 +2657,52 @@ static GtkTreeIter* _gtk_tree_iter_dup (GtkTreeIter* self) {
memcpy (dup, self, sizeof (GtkTreeIter));
#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return dup;
-#line 2650 "Tree.c"
+#line 2661 "Tree.c"
}
static gpointer __gtk_tree_iter_dup0 (gpointer self) {
#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return self ? _gtk_tree_iter_dup (self) : NULL;
-#line 2657 "Tree.c"
+#line 2668 "Tree.c"
}
static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* branch) {
- GeeHashMap* _tmp0_ = NULL;
- SidebarBranch* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ GeeHashMap* _tmp0_;
+ SidebarBranch* _tmp1_;
+ gboolean _tmp2_;
gint position = 0;
- GeeHashMap* _tmp3_ = NULL;
- SidebarBranch* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
+ GeeHashMap* _tmp3_;
+ SidebarBranch* _tmp4_;
+ gpointer _tmp5_;
GtkTreeIter* insertion_iter = NULL;
GtkTreeIter iter = {0};
gboolean found = FALSE;
- GtkTreeStore* _tmp6_ = NULL;
+ GtkTreeStore* _tmp6_;
GtkTreeIter _tmp7_ = {0};
- gboolean _tmp8_ = FALSE;
- GtkTreeIter* _tmp24_ = NULL;
- GtkTreeIter* _tmp29_ = NULL;
- GtkTreeStore* _tmp30_ = NULL;
- SidebarBranch* _tmp31_ = NULL;
- SidebarEntry* _tmp32_ = NULL;
- SidebarEntry* _tmp33_ = NULL;
- GtkTreeStore* _tmp34_ = NULL;
- GtkTreeIter* _tmp35_ = NULL;
- GtkTreeIter _tmp36_ = {0};
- GtkTreePath* _tmp37_ = NULL;
- GtkTreePath* _tmp38_ = NULL;
- gint _tmp39_ = 0;
- SidebarTreeRootWrapper* _tmp40_ = NULL;
- SidebarTreeRootWrapper* _tmp41_ = NULL;
- GtkTreeIter _tmp42_ = {0};
- SidebarBranch* _tmp43_ = NULL;
- SidebarBranch* _tmp44_ = NULL;
- SidebarEntry* _tmp45_ = NULL;
- SidebarEntry* _tmp46_ = NULL;
- GtkTreeIter* _tmp47_ = NULL;
- GtkTreeIter _tmp48_ = {0};
+ gboolean _tmp8_;
+ GtkTreeIter* _tmp24_;
+ GtkTreeIter* _tmp29_;
+ GtkTreeStore* _tmp30_;
+ SidebarBranch* _tmp31_;
+ SidebarEntry* _tmp32_;
+ SidebarEntry* _tmp33_;
+ GtkTreeStore* _tmp34_;
+ GtkTreeIter* _tmp35_;
+ GtkTreeIter _tmp36_;
+ GtkTreePath* _tmp37_;
+ GtkTreePath* _tmp38_;
+ gint _tmp39_;
+ SidebarTreeRootWrapper* _tmp40_;
+ SidebarTreeRootWrapper* _tmp41_;
+ GtkTreeIter _tmp42_;
+ SidebarBranch* _tmp43_;
+ SidebarBranch* _tmp44_;
+ SidebarEntry* _tmp45_;
+ SidebarEntry* _tmp46_;
+ GtkTreeIter* _tmp47_;
+ GtkTreeIter _tmp48_;
#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2724,25 +2735,25 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
found = _tmp8_;
#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
while (TRUE) {
-#line 2728 "Tree.c"
- gboolean _tmp9_ = FALSE;
+#line 2739 "Tree.c"
+ gboolean _tmp9_;
SidebarTreeRootWrapper* root_wrapper = NULL;
- GtkTreeIter _tmp10_ = {0};
- SidebarTreeEntryWrapper* _tmp11_ = NULL;
- SidebarTreeRootWrapper* _tmp12_ = NULL;
- SidebarTreeRootWrapper* _tmp13_ = NULL;
- gint _tmp14_ = 0;
- SidebarTreeRootWrapper* _tmp15_ = NULL;
- gint _tmp16_ = 0;
- GtkTreeStore* _tmp22_ = NULL;
- gboolean _tmp23_ = FALSE;
+ GtkTreeIter _tmp10_;
+ SidebarTreeEntryWrapper* _tmp11_;
+ SidebarTreeRootWrapper* _tmp12_;
+ SidebarTreeRootWrapper* _tmp13_;
+ gint _tmp14_;
+ SidebarTreeRootWrapper* _tmp15_;
+ gint _tmp16_;
+ GtkTreeStore* _tmp22_;
+ gboolean _tmp23_;
#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp9_ = found;
#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (!_tmp9_) {
#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
break;
-#line 2746 "Tree.c"
+#line 2757 "Tree.c"
}
#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp10_ = iter;
@@ -2754,7 +2765,7 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
if (_tmp12_ == NULL) {
#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (_tmp11_);
-#line 2758 "Tree.c"
+#line 2769 "Tree.c"
}
#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
root_wrapper = _tmp12_;
@@ -2770,12 +2781,12 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
_tmp16_ = _tmp15_->root_position;
#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp14_ < _tmp16_) {
-#line 2774 "Tree.c"
- GtkTreeStore* _tmp17_ = NULL;
- GtkTreeIter _tmp18_ = {0};
+#line 2785 "Tree.c"
+ GtkTreeStore* _tmp17_;
+ GtkTreeIter _tmp18_;
GtkTreeIter _tmp19_ = {0};
- GtkTreeIter _tmp20_ = {0};
- GtkTreeIter* _tmp21_ = NULL;
+ GtkTreeIter _tmp20_;
+ GtkTreeIter* _tmp21_;
#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp17_ = self->priv->store;
#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2794,7 +2805,7 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
_g_object_unref0 (root_wrapper);
#line 438 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
break;
-#line 2798 "Tree.c"
+#line 2809 "Tree.c"
}
#line 441 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp22_ = self->priv->store;
@@ -2804,17 +2815,17 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
found = _tmp23_;
#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (root_wrapper);
-#line 2808 "Tree.c"
+#line 2819 "Tree.c"
}
#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp24_ = insertion_iter;
#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp24_ == NULL) {
-#line 2814 "Tree.c"
- GtkTreeStore* _tmp25_ = NULL;
+#line 2825 "Tree.c"
+ GtkTreeStore* _tmp25_;
GtkTreeIter _tmp26_ = {0};
- GtkTreeIter _tmp27_ = {0};
- GtkTreeIter* _tmp28_ = NULL;
+ GtkTreeIter _tmp27_;
+ GtkTreeIter* _tmp28_;
#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp25_ = self->priv->store;
#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2827,7 +2838,7 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
_tmp28_ = __gtk_tree_iter_dup0 (&_tmp27_);
#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
insertion_iter = _tmp28_;
-#line 2831 "Tree.c"
+#line 2842 "Tree.c"
}
#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp29_ = insertion_iter;
@@ -2883,16 +2894,16 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
_g_object_unref0 (_tmp46_);
#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_free0 (insertion_iter);
-#line 2887 "Tree.c"
+#line 2898 "Tree.c"
}
static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* branch, SidebarEntry* parent, GtkTreeIter* parent_iter) {
GeeList* children = NULL;
- SidebarBranch* _tmp0_ = NULL;
- SidebarEntry* _tmp1_ = NULL;
- GeeList* _tmp2_ = NULL;
- GeeList* _tmp3_ = NULL;
+ SidebarBranch* _tmp0_;
+ SidebarEntry* _tmp1_;
+ GeeList* _tmp2_;
+ GeeList* _tmp3_;
#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2917,16 +2928,16 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b
_g_object_unref0 (children);
#line 460 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return;
-#line 2921 "Tree.c"
+#line 2932 "Tree.c"
}
{
GeeList* _child_list = NULL;
- GeeList* _tmp4_ = NULL;
- GeeList* _tmp5_ = NULL;
+ GeeList* _tmp4_;
+ GeeList* _tmp5_;
gint _child_size = 0;
- GeeList* _tmp6_ = NULL;
- gint _tmp7_ = 0;
- gint _tmp8_ = 0;
+ GeeList* _tmp6_;
+ gint _tmp7_;
+ gint _tmp8_;
gint _child_index = 0;
#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp4_ = children;
@@ -2946,23 +2957,23 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b
_child_index = -1;
#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
while (TRUE) {
-#line 2950 "Tree.c"
- gint _tmp9_ = 0;
- gint _tmp10_ = 0;
- gint _tmp11_ = 0;
+#line 2961 "Tree.c"
+ gint _tmp9_;
+ gint _tmp10_;
+ gint _tmp11_;
SidebarEntry* child = NULL;
- GeeList* _tmp12_ = NULL;
- gint _tmp13_ = 0;
- gpointer _tmp14_ = NULL;
+ GeeList* _tmp12_;
+ gint _tmp13_;
+ gpointer _tmp14_;
GtkTreeIter append_iter = {0};
- GtkTreeStore* _tmp15_ = NULL;
- GtkTreeIter _tmp16_ = {0};
+ GtkTreeStore* _tmp15_;
+ GtkTreeIter _tmp16_;
GtkTreeIter _tmp17_ = {0};
- GtkTreeIter _tmp18_ = {0};
- SidebarEntry* _tmp19_ = NULL;
- SidebarBranch* _tmp20_ = NULL;
- SidebarEntry* _tmp21_ = NULL;
- GtkTreeIter _tmp22_ = {0};
+ GtkTreeIter _tmp18_;
+ SidebarEntry* _tmp19_;
+ SidebarBranch* _tmp20_;
+ SidebarEntry* _tmp21_;
+ GtkTreeIter _tmp22_;
#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp9_ = _child_index;
#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2975,7 +2986,7 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b
if (!(_tmp10_ < _tmp11_)) {
#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
break;
-#line 2979 "Tree.c"
+#line 2990 "Tree.c"
}
#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp12_ = _child_list;
@@ -3009,28 +3020,28 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b
sidebar_tree_associate_children (self, _tmp20_, _tmp21_, &_tmp22_);
#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (child);
-#line 3013 "Tree.c"
+#line 3024 "Tree.c"
}
#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (_child_list);
-#line 3017 "Tree.c"
+#line 3028 "Tree.c"
}
#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (children);
-#line 3021 "Tree.c"
+#line 3032 "Tree.c"
}
static void sidebar_tree_associate_entry (SidebarTree* self, GtkTreeIter* assoc_iter, SidebarEntry* entry) {
- GtkTreeIter _tmp0_ = {0};
- GtkTreeStore* _tmp1_ = NULL;
- SidebarEntry* _tmp2_ = NULL;
- GtkTreeStore* _tmp3_ = NULL;
- GtkTreeIter _tmp4_ = {0};
- GtkTreePath* _tmp5_ = NULL;
- GtkTreePath* _tmp6_ = NULL;
- SidebarTreeEntryWrapper* _tmp7_ = NULL;
- SidebarTreeEntryWrapper* _tmp8_ = NULL;
+ GtkTreeIter _tmp0_;
+ GtkTreeStore* _tmp1_;
+ SidebarEntry* _tmp2_;
+ GtkTreeStore* _tmp3_;
+ GtkTreeIter _tmp4_;
+ GtkTreePath* _tmp5_;
+ GtkTreePath* _tmp6_;
+ SidebarTreeEntryWrapper* _tmp7_;
+ SidebarTreeEntryWrapper* _tmp8_;
#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3061,94 +3072,94 @@ static void sidebar_tree_associate_entry (SidebarTree* self, GtkTreeIter* assoc_
_g_object_unref0 (_tmp8_);
#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_gtk_tree_path_free0 (_tmp6_);
-#line 3065 "Tree.c"
+#line 3076 "Tree.c"
}
static void _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed (SidebarEntry* _sender, const gchar* tooltip, gpointer self) {
#line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_on_sidebar_tooltip_changed ((SidebarTree*) self, _sender, tooltip);
-#line 3072 "Tree.c"
+#line 3083 "Tree.c"
}
static void _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed (SidebarEntry* _sender, const gchar* icon, gpointer self) {
#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_on_sidebar_icon_changed ((SidebarTree*) self, _sender, icon);
-#line 3079 "Tree.c"
+#line 3090 "Tree.c"
}
static void _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender, Page* page, gpointer self) {
#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_on_sidebar_page_created ((SidebarTree*) self, _sender, page);
-#line 3086 "Tree.c"
+#line 3097 "Tree.c"
}
static void _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, Page* page, gpointer self) {
#line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_on_sidebar_destroying_page ((SidebarTree*) self, _sender, page);
-#line 3093 "Tree.c"
+#line 3104 "Tree.c"
}
static void _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed (SidebarEmphasizableEntry* _sender, gboolean emphasized, gpointer self) {
#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_on_is_emphasized_changed ((SidebarTree*) self, _sender, emphasized);
-#line 3100 "Tree.c"
+#line 3111 "Tree.c"
}
static void _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed (SidebarRenameableEntry* _sender, const gchar* name, gpointer self) {
#line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_on_sidebar_name_changed ((SidebarTree*) self, _sender, name);
-#line 3107 "Tree.c"
+#line 3118 "Tree.c"
}
static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* assoc_iter, SidebarTreeEntryWrapper* wrapper) {
SidebarEntry* entry = NULL;
- SidebarTreeEntryWrapper* _tmp0_ = NULL;
- SidebarEntry* _tmp1_ = NULL;
- SidebarEntry* _tmp2_ = NULL;
- GeeHashMap* _tmp3_ = NULL;
- SidebarEntry* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- GeeHashMap* _tmp6_ = NULL;
- SidebarEntry* _tmp7_ = NULL;
- SidebarTreeEntryWrapper* _tmp8_ = NULL;
- GtkTreeStore* _tmp9_ = NULL;
- GtkTreeIter _tmp10_ = {0};
- SidebarEntry* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
- GtkTreeStore* _tmp14_ = NULL;
- GtkTreeIter _tmp15_ = {0};
- SidebarEntry* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
- gchar* _tmp18_ = NULL;
- gchar* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
- GtkTreeStore* _tmp21_ = NULL;
- GtkTreeIter _tmp22_ = {0};
- SidebarTreeEntryWrapper* _tmp23_ = NULL;
- GtkTreeIter _tmp24_ = {0};
- SidebarEntry* _tmp25_ = NULL;
- SidebarEntry* _tmp26_ = NULL;
+ SidebarTreeEntryWrapper* _tmp0_;
+ SidebarEntry* _tmp1_;
+ SidebarEntry* _tmp2_;
+ GeeHashMap* _tmp3_;
+ SidebarEntry* _tmp4_;
+ gboolean _tmp5_;
+ GeeHashMap* _tmp6_;
+ SidebarEntry* _tmp7_;
+ SidebarTreeEntryWrapper* _tmp8_;
+ GtkTreeStore* _tmp9_;
+ GtkTreeIter _tmp10_;
+ SidebarEntry* _tmp11_;
+ gchar* _tmp12_;
+ gchar* _tmp13_;
+ GtkTreeStore* _tmp14_;
+ GtkTreeIter _tmp15_;
+ SidebarEntry* _tmp16_;
+ gchar* _tmp17_;
+ gchar* _tmp18_;
+ gchar* _tmp19_;
+ gchar* _tmp20_;
+ GtkTreeStore* _tmp21_;
+ GtkTreeIter _tmp22_;
+ SidebarTreeEntryWrapper* _tmp23_;
+ GtkTreeIter _tmp24_;
+ SidebarEntry* _tmp25_;
+ SidebarEntry* _tmp26_;
SidebarPageRepresentative* pageable = NULL;
- SidebarEntry* _tmp27_ = NULL;
- SidebarPageRepresentative* _tmp28_ = NULL;
- SidebarPageRepresentative* _tmp29_ = NULL;
+ SidebarEntry* _tmp27_;
+ SidebarPageRepresentative* _tmp28_;
+ SidebarPageRepresentative* _tmp29_;
SidebarEmphasizableEntry* emphasizable = NULL;
- SidebarEntry* _tmp32_ = NULL;
- SidebarEmphasizableEntry* _tmp33_ = NULL;
- SidebarEmphasizableEntry* _tmp34_ = NULL;
+ SidebarEntry* _tmp32_;
+ SidebarEmphasizableEntry* _tmp33_;
+ SidebarEmphasizableEntry* _tmp34_;
SidebarRenameableEntry* renameable = NULL;
- SidebarEntry* _tmp36_ = NULL;
- SidebarRenameableEntry* _tmp37_ = NULL;
- SidebarRenameableEntry* _tmp38_ = NULL;
- SidebarEntry* _tmp40_ = NULL;
+ SidebarEntry* _tmp36_;
+ SidebarRenameableEntry* _tmp37_;
+ SidebarRenameableEntry* _tmp38_;
+ SidebarEntry* _tmp40_;
#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3243,9 +3254,9 @@ static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* asso
_tmp29_ = pageable;
#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp29_ != NULL) {
-#line 3247 "Tree.c"
- SidebarPageRepresentative* _tmp30_ = NULL;
- SidebarPageRepresentative* _tmp31_ = NULL;
+#line 3258 "Tree.c"
+ SidebarPageRepresentative* _tmp30_;
+ SidebarPageRepresentative* _tmp31_;
#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp30_ = pageable;
#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3254,7 +3265,7 @@ static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* asso
_tmp31_ = pageable;
#line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_signal_connect_object (_tmp31_, "destroying-page", (GCallback) _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page, self, 0);
-#line 3258 "Tree.c"
+#line 3269 "Tree.c"
}
#line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp32_ = entry;
@@ -3266,13 +3277,13 @@ static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* asso
_tmp34_ = emphasizable;
#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp34_ != NULL) {
-#line 3270 "Tree.c"
- SidebarEmphasizableEntry* _tmp35_ = NULL;
+#line 3281 "Tree.c"
+ SidebarEmphasizableEntry* _tmp35_;
#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp35_ = emphasizable;
#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_signal_connect_object (_tmp35_, "is-emphasized-changed", (GCallback) _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed, self, 0);
-#line 3276 "Tree.c"
+#line 3287 "Tree.c"
}
#line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp36_ = entry;
@@ -3284,13 +3295,13 @@ static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* asso
_tmp38_ = renameable;
#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp38_ != NULL) {
-#line 3288 "Tree.c"
- SidebarRenameableEntry* _tmp39_ = NULL;
+#line 3299 "Tree.c"
+ SidebarRenameableEntry* _tmp39_;
#line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp39_ = renameable;
#line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_signal_connect_object (_tmp39_, "sidebar-name-changed", (GCallback) _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed, self, 0);
-#line 3294 "Tree.c"
+#line 3305 "Tree.c"
}
#line 503 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp40_ = entry;
@@ -3304,41 +3315,41 @@ static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* asso
_g_object_unref0 (pageable);
#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (entry);
-#line 3308 "Tree.c"
+#line 3319 "Tree.c"
}
static SidebarTreeEntryWrapper* sidebar_tree_reparent_wrapper (SidebarTree* self, GtkTreeIter* new_iter, SidebarTreeEntryWrapper* current_wrapper) {
SidebarTreeEntryWrapper* result = NULL;
SidebarEntry* entry = NULL;
- SidebarTreeEntryWrapper* _tmp0_ = NULL;
- SidebarEntry* _tmp1_ = NULL;
- SidebarEntry* _tmp2_ = NULL;
+ SidebarTreeEntryWrapper* _tmp0_;
+ SidebarEntry* _tmp1_;
+ SidebarEntry* _tmp2_;
gboolean removed = FALSE;
- GeeHashMap* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+ GeeHashMap* _tmp3_;
+ gboolean _tmp4_;
SidebarTreeEntryWrapper* new_wrapper = NULL;
- GtkTreeStore* _tmp5_ = NULL;
- GtkTreeStore* _tmp6_ = NULL;
- GtkTreeIter _tmp7_ = {0};
- GtkTreePath* _tmp8_ = NULL;
- GtkTreePath* _tmp9_ = NULL;
- SidebarTreeEntryWrapper* _tmp10_ = NULL;
- SidebarTreeEntryWrapper* _tmp11_ = NULL;
- GeeHashMap* _tmp12_ = NULL;
- GtkTreeStore* _tmp13_ = NULL;
- GtkTreeIter _tmp14_ = {0};
- gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
- GtkTreeStore* _tmp17_ = NULL;
- GtkTreeIter _tmp18_ = {0};
- gchar* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
- gchar* _tmp21_ = NULL;
- gchar* _tmp22_ = NULL;
- GtkTreeStore* _tmp23_ = NULL;
- GtkTreeIter _tmp24_ = {0};
- GtkTreeIter _tmp25_ = {0};
+ GtkTreeStore* _tmp5_;
+ GtkTreeStore* _tmp6_;
+ GtkTreeIter _tmp7_;
+ GtkTreePath* _tmp8_;
+ GtkTreePath* _tmp9_;
+ SidebarTreeEntryWrapper* _tmp10_;
+ SidebarTreeEntryWrapper* _tmp11_;
+ GeeHashMap* _tmp12_;
+ GtkTreeStore* _tmp13_;
+ GtkTreeIter _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
+ GtkTreeStore* _tmp17_;
+ GtkTreeIter _tmp18_;
+ gchar* _tmp19_;
+ gchar* _tmp20_;
+ gchar* _tmp21_;
+ gchar* _tmp22_;
+ GtkTreeStore* _tmp23_;
+ GtkTreeIter _tmp24_;
+ GtkTreeIter _tmp25_;
#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3429,36 +3440,36 @@ static SidebarTreeEntryWrapper* sidebar_tree_reparent_wrapper (SidebarTree* self
_g_object_unref0 (entry);
#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 3433 "Tree.c"
+#line 3444 "Tree.c"
}
void sidebar_tree_prune (SidebarTree* self, SidebarBranch* branch) {
- GeeHashMap* _tmp0_ = NULL;
- SidebarBranch* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
- SidebarBranch* _tmp3_ = NULL;
- SidebarEntry* _tmp4_ = NULL;
- SidebarEntry* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
- gboolean _tmp7_ = FALSE;
- SidebarBranch* _tmp9_ = NULL;
- guint _tmp10_ = 0U;
- SidebarBranch* _tmp11_ = NULL;
- guint _tmp12_ = 0U;
- SidebarBranch* _tmp13_ = NULL;
- guint _tmp14_ = 0U;
- SidebarBranch* _tmp15_ = NULL;
- guint _tmp16_ = 0U;
- SidebarBranch* _tmp17_ = NULL;
- guint _tmp18_ = 0U;
- SidebarBranch* _tmp19_ = NULL;
- guint _tmp20_ = 0U;
+ GeeHashMap* _tmp0_;
+ SidebarBranch* _tmp1_;
+ gboolean _tmp2_;
+ SidebarBranch* _tmp3_;
+ SidebarEntry* _tmp4_;
+ SidebarEntry* _tmp5_;
+ gboolean _tmp6_;
+ gboolean _tmp7_;
+ SidebarBranch* _tmp9_;
+ guint _tmp10_;
+ SidebarBranch* _tmp11_;
+ guint _tmp12_;
+ SidebarBranch* _tmp13_;
+ guint _tmp14_;
+ SidebarBranch* _tmp15_;
+ guint _tmp16_;
+ SidebarBranch* _tmp17_;
+ guint _tmp18_;
+ SidebarBranch* _tmp19_;
+ guint _tmp20_;
gboolean removed = FALSE;
- GeeHashMap* _tmp21_ = NULL;
- SidebarBranch* _tmp22_ = NULL;
- gboolean _tmp23_ = FALSE;
- SidebarBranch* _tmp24_ = NULL;
+ GeeHashMap* _tmp21_;
+ SidebarBranch* _tmp22_;
+ gboolean _tmp23_;
+ SidebarBranch* _tmp24_;
#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3485,13 +3496,13 @@ void sidebar_tree_prune (SidebarTree* self, SidebarBranch* branch) {
_g_object_unref0 (_tmp5_);
#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp7_) {
-#line 3489 "Tree.c"
- SidebarBranch* _tmp8_ = NULL;
+#line 3500 "Tree.c"
+ SidebarBranch* _tmp8_;
#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp8_ = branch;
#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_disassociate_branch (self, _tmp8_);
-#line 3495 "Tree.c"
+#line 3506 "Tree.c"
}
#line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp9_ = branch;
@@ -3542,19 +3553,19 @@ void sidebar_tree_prune (SidebarTree* self, SidebarBranch* branch) {
#line 539 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp24_ = branch;
#line 539 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- g_signal_emit_by_name (self, "branch-removed", _tmp24_);
-#line 3547 "Tree.c"
+ g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_REMOVED_SIGNAL], 0, _tmp24_);
+#line 3558 "Tree.c"
}
static void sidebar_tree_disassociate_branch (SidebarTree* self, SidebarBranch* branch) {
SidebarTreeRootWrapper* root_wrapper = NULL;
- SidebarBranch* _tmp0_ = NULL;
- SidebarEntry* _tmp1_ = NULL;
- SidebarEntry* _tmp2_ = NULL;
- SidebarTreeEntryWrapper* _tmp3_ = NULL;
- SidebarTreeRootWrapper* _tmp4_ = NULL;
- SidebarTreeRootWrapper* _tmp5_ = NULL;
+ SidebarBranch* _tmp0_;
+ SidebarEntry* _tmp1_;
+ SidebarEntry* _tmp2_;
+ SidebarTreeEntryWrapper* _tmp3_;
+ SidebarTreeRootWrapper* _tmp4_;
+ SidebarTreeRootWrapper* _tmp5_;
#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3573,7 +3584,7 @@ static void sidebar_tree_disassociate_branch (SidebarTree* self, SidebarBranch*
if (_tmp4_ == NULL) {
#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (_tmp3_);
-#line 3577 "Tree.c"
+#line 3588 "Tree.c"
}
#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp5_ = _tmp4_;
@@ -3587,18 +3598,18 @@ static void sidebar_tree_disassociate_branch (SidebarTree* self, SidebarBranch*
sidebar_tree_disassociate_wrapper_and_signal (self, G_TYPE_CHECK_INSTANCE_CAST (root_wrapper, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, SidebarTreeEntryWrapper), FALSE);
#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (root_wrapper);
-#line 3591 "Tree.c"
+#line 3602 "Tree.c"
}
static void sidebar_tree_disassociate_wrapper_and_signal (SidebarTree* self, SidebarTreeEntryWrapper* wrapper, gboolean only_children) {
gboolean selected = FALSE;
- SidebarTreeEntryWrapper* _tmp0_ = NULL;
- SidebarEntry* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
- SidebarTreeEntryWrapper* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
- gboolean _tmp5_ = FALSE;
+ SidebarTreeEntryWrapper* _tmp0_;
+ SidebarEntry* _tmp1_;
+ gboolean _tmp2_;
+ SidebarTreeEntryWrapper* _tmp3_;
+ gboolean _tmp4_;
+ gboolean _tmp5_;
#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3621,13 +3632,13 @@ static void sidebar_tree_disassociate_wrapper_and_signal (SidebarTree* self, Sid
_tmp5_ = selected;
#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp5_) {
-#line 3625 "Tree.c"
+#line 3636 "Tree.c"
SidebarSelectableEntry* selectable = NULL;
- SidebarTreeEntryWrapper* _tmp6_ = NULL;
- SidebarEntry* _tmp7_ = NULL;
- SidebarSelectableEntry* _tmp8_ = NULL;
- SidebarSelectableEntry* _tmp9_ = NULL;
- SidebarSelectableEntry* _tmp10_ = NULL;
+ SidebarTreeEntryWrapper* _tmp6_;
+ SidebarEntry* _tmp7_;
+ SidebarSelectableEntry* _tmp8_;
+ SidebarSelectableEntry* _tmp9_;
+ SidebarSelectableEntry* _tmp10_;
#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp6_ = wrapper;
#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3643,57 +3654,57 @@ static void sidebar_tree_disassociate_wrapper_and_signal (SidebarTree* self, Sid
#line 560 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp10_ = selectable;
#line 560 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- g_signal_emit_by_name (self, "selected-entry-removed", _tmp10_);
+ g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_SELECTED_ENTRY_REMOVED_SIGNAL], 0, _tmp10_);
#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (selectable);
-#line 3650 "Tree.c"
+#line 3661 "Tree.c"
}
}
static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEntryWrapper* wrapper, gboolean only_children) {
GeeArrayList* children = NULL;
- GeeArrayList* _tmp0_ = NULL;
+ GeeArrayList* _tmp0_;
GtkTreeIter child_iter = {0};
gboolean found = FALSE;
- GtkTreeStore* _tmp1_ = NULL;
- SidebarTreeEntryWrapper* _tmp2_ = NULL;
+ GtkTreeStore* _tmp1_;
+ SidebarTreeEntryWrapper* _tmp2_;
GtkTreeIter _tmp3_ = {0};
GtkTreeIter _tmp4_ = {0};
- gboolean _tmp5_ = FALSE;
- gboolean _tmp26_ = FALSE;
+ gboolean _tmp5_;
+ gboolean _tmp26_;
GtkTreeIter iter = {0};
- SidebarTreeEntryWrapper* _tmp27_ = NULL;
+ SidebarTreeEntryWrapper* _tmp27_;
GtkTreeIter _tmp28_ = {0};
- GtkTreeStore* _tmp29_ = NULL;
- SidebarTreeEntryWrapper* _tmp30_ = NULL;
- SidebarTreeEntryWrapper* _tmp31_ = NULL;
+ GtkTreeStore* _tmp29_;
+ SidebarTreeEntryWrapper* _tmp30_;
+ SidebarTreeEntryWrapper* _tmp31_;
SidebarEntry* entry = NULL;
- SidebarTreeEntryWrapper* _tmp32_ = NULL;
- SidebarEntry* _tmp33_ = NULL;
- SidebarEntry* _tmp34_ = NULL;
- SidebarEntry* _tmp35_ = NULL;
- SidebarEntry* _tmp36_ = NULL;
- guint _tmp37_ = 0U;
- SidebarEntry* _tmp38_ = NULL;
- guint _tmp39_ = 0U;
+ SidebarTreeEntryWrapper* _tmp32_;
+ SidebarEntry* _tmp33_;
+ SidebarEntry* _tmp34_;
+ SidebarEntry* _tmp35_;
+ SidebarEntry* _tmp36_;
+ guint _tmp37_;
+ SidebarEntry* _tmp38_;
+ guint _tmp39_;
SidebarPageRepresentative* pageable = NULL;
- SidebarEntry* _tmp40_ = NULL;
- SidebarPageRepresentative* _tmp41_ = NULL;
- SidebarPageRepresentative* _tmp42_ = NULL;
+ SidebarEntry* _tmp40_;
+ SidebarPageRepresentative* _tmp41_;
+ SidebarPageRepresentative* _tmp42_;
SidebarRenameableEntry* renameable = NULL;
- SidebarEntry* _tmp47_ = NULL;
- SidebarRenameableEntry* _tmp48_ = NULL;
- SidebarRenameableEntry* _tmp49_ = NULL;
+ SidebarEntry* _tmp47_;
+ SidebarRenameableEntry* _tmp48_;
+ SidebarRenameableEntry* _tmp49_;
SidebarEmphasizableEntry* emphasizable = NULL;
- SidebarEntry* _tmp52_ = NULL;
- SidebarEmphasizableEntry* _tmp53_ = NULL;
- SidebarEmphasizableEntry* _tmp54_ = NULL;
+ SidebarEntry* _tmp52_;
+ SidebarEmphasizableEntry* _tmp53_;
+ SidebarEmphasizableEntry* _tmp54_;
gboolean removed = FALSE;
- GeeHashMap* _tmp57_ = NULL;
- SidebarEntry* _tmp58_ = NULL;
- gboolean _tmp59_ = FALSE;
- gboolean _tmp60_ = FALSE;
+ GeeHashMap* _tmp57_;
+ SidebarEntry* _tmp58_;
+ gboolean _tmp59_;
+ gboolean _tmp60_;
#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3716,23 +3727,23 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
found = _tmp5_;
#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
while (TRUE) {
-#line 3720 "Tree.c"
- gboolean _tmp6_ = FALSE;
+#line 3731 "Tree.c"
+ gboolean _tmp6_;
SidebarTreeEntryWrapper* child_wrapper = NULL;
- GtkTreeIter _tmp7_ = {0};
- SidebarTreeEntryWrapper* _tmp8_ = NULL;
- SidebarTreeEntryWrapper* _tmp9_ = NULL;
- GeeArrayList* _tmp10_ = NULL;
- SidebarTreeEntryWrapper* _tmp11_ = NULL;
- GtkTreeStore* _tmp12_ = NULL;
- gboolean _tmp13_ = FALSE;
+ GtkTreeIter _tmp7_;
+ SidebarTreeEntryWrapper* _tmp8_;
+ SidebarTreeEntryWrapper* _tmp9_;
+ GeeArrayList* _tmp10_;
+ SidebarTreeEntryWrapper* _tmp11_;
+ GtkTreeStore* _tmp12_;
+ gboolean _tmp13_;
#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp6_ = found;
#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (!_tmp6_) {
#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
break;
-#line 3736 "Tree.c"
+#line 3747 "Tree.c"
}
#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp7_ = child_iter;
@@ -3758,16 +3769,16 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
found = _tmp13_;
#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (child_wrapper);
-#line 3762 "Tree.c"
+#line 3773 "Tree.c"
}
{
GeeArrayList* _child_wrapper_list = NULL;
- GeeArrayList* _tmp14_ = NULL;
- GeeArrayList* _tmp15_ = NULL;
+ GeeArrayList* _tmp14_;
+ GeeArrayList* _tmp15_;
gint _child_wrapper_size = 0;
- GeeArrayList* _tmp16_ = NULL;
- gint _tmp17_ = 0;
- gint _tmp18_ = 0;
+ GeeArrayList* _tmp16_;
+ gint _tmp17_;
+ gint _tmp18_;
gint _child_wrapper_index = 0;
#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp14_ = children;
@@ -3787,15 +3798,15 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
_child_wrapper_index = -1;
#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
while (TRUE) {
-#line 3791 "Tree.c"
- gint _tmp19_ = 0;
- gint _tmp20_ = 0;
- gint _tmp21_ = 0;
+#line 3802 "Tree.c"
+ gint _tmp19_;
+ gint _tmp20_;
+ gint _tmp21_;
SidebarTreeEntryWrapper* child_wrapper = NULL;
- GeeArrayList* _tmp22_ = NULL;
- gint _tmp23_ = 0;
- gpointer _tmp24_ = NULL;
- SidebarTreeEntryWrapper* _tmp25_ = NULL;
+ GeeArrayList* _tmp22_;
+ gint _tmp23_;
+ gpointer _tmp24_;
+ SidebarTreeEntryWrapper* _tmp25_;
#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp19_ = _child_wrapper_index;
#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3808,7 +3819,7 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
if (!(_tmp20_ < _tmp21_)) {
#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
break;
-#line 3812 "Tree.c"
+#line 3823 "Tree.c"
}
#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp22_ = _child_wrapper_list;
@@ -3824,11 +3835,11 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
sidebar_tree_disassociate_wrapper (self, _tmp25_, FALSE);
#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (child_wrapper);
-#line 3828 "Tree.c"
+#line 3839 "Tree.c"
}
#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (_child_wrapper_list);
-#line 3832 "Tree.c"
+#line 3843 "Tree.c"
}
#line 581 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp26_ = only_children;
@@ -3838,7 +3849,7 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
_g_object_unref0 (children);
#line 582 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return;
-#line 3842 "Tree.c"
+#line 3853 "Tree.c"
}
#line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp27_ = wrapper;
@@ -3858,7 +3869,7 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
if (_tmp30_ == _tmp31_) {
#line 588 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
self->priv->selected_wrapper = NULL;
-#line 3862 "Tree.c"
+#line 3873 "Tree.c"
}
#line 590 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp32_ = wrapper;
@@ -3894,11 +3905,11 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
_tmp42_ = pageable;
#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp42_ != NULL) {
-#line 3898 "Tree.c"
- SidebarPageRepresentative* _tmp43_ = NULL;
- guint _tmp44_ = 0U;
- SidebarPageRepresentative* _tmp45_ = NULL;
- guint _tmp46_ = 0U;
+#line 3909 "Tree.c"
+ SidebarPageRepresentative* _tmp43_;
+ guint _tmp44_;
+ SidebarPageRepresentative* _tmp45_;
+ guint _tmp46_;
#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp43_ = pageable;
#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3911,7 +3922,7 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
g_signal_parse_name ("destroying-page", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, &_tmp46_, NULL, FALSE);
#line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_signal_handlers_disconnect_matched (_tmp45_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp46_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page, self);
-#line 3915 "Tree.c"
+#line 3926 "Tree.c"
}
#line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp47_ = entry;
@@ -3923,16 +3934,16 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
_tmp49_ = renameable;
#line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp49_ != NULL) {
-#line 3927 "Tree.c"
- SidebarRenameableEntry* _tmp50_ = NULL;
- guint _tmp51_ = 0U;
+#line 3938 "Tree.c"
+ SidebarRenameableEntry* _tmp50_;
+ guint _tmp51_;
#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp50_ = renameable;
#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_signal_parse_name ("sidebar-name-changed", SIDEBAR_TYPE_RENAMEABLE_ENTRY, &_tmp51_, NULL, FALSE);
#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_signal_handlers_disconnect_matched (_tmp50_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp51_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed, self);
-#line 3936 "Tree.c"
+#line 3947 "Tree.c"
}
#line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp52_ = entry;
@@ -3944,16 +3955,16 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
_tmp54_ = emphasizable;
#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp54_ != NULL) {
-#line 3948 "Tree.c"
- SidebarEmphasizableEntry* _tmp55_ = NULL;
- guint _tmp56_ = 0U;
+#line 3959 "Tree.c"
+ SidebarEmphasizableEntry* _tmp55_;
+ guint _tmp56_;
#line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp55_ = emphasizable;
#line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_signal_parse_name ("is-emphasized-changed", SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, &_tmp56_, NULL, FALSE);
#line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_signal_handlers_disconnect_matched (_tmp55_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp56_, 0, NULL, (GCallback) _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed, self);
-#line 3957 "Tree.c"
+#line 3968 "Tree.c"
}
#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp57_ = self->priv->entry_map;
@@ -3977,33 +3988,33 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
_g_object_unref0 (entry);
#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (children);
-#line 3981 "Tree.c"
+#line 3992 "Tree.c"
}
static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry) {
SidebarEntry* parent = NULL;
- SidebarBranch* _tmp0_ = NULL;
- SidebarEntry* _tmp1_ = NULL;
- SidebarEntry* _tmp2_ = NULL;
- SidebarEntry* _tmp3_ = NULL;
+ SidebarBranch* _tmp0_;
+ SidebarEntry* _tmp1_;
+ SidebarEntry* _tmp2_;
+ SidebarEntry* _tmp3_;
SidebarTreeEntryWrapper* parent_wrapper = NULL;
- SidebarEntry* _tmp4_ = NULL;
- SidebarTreeEntryWrapper* _tmp5_ = NULL;
- SidebarTreeEntryWrapper* _tmp6_ = NULL;
+ SidebarEntry* _tmp4_;
+ SidebarTreeEntryWrapper* _tmp5_;
+ SidebarTreeEntryWrapper* _tmp6_;
GtkTreeIter insertion_iter = {0};
SidebarEntry* next = NULL;
- SidebarBranch* _tmp7_ = NULL;
- SidebarEntry* _tmp8_ = NULL;
- SidebarEntry* _tmp9_ = NULL;
- SidebarEntry* _tmp10_ = NULL;
- GtkTreeIter _tmp23_ = {0};
- SidebarEntry* _tmp24_ = NULL;
- SidebarBranch* _tmp25_ = NULL;
- SidebarEntry* _tmp26_ = NULL;
- GtkTreeIter _tmp27_ = {0};
- SidebarBranch* _tmp28_ = NULL;
- gboolean _tmp29_ = FALSE;
+ SidebarBranch* _tmp7_;
+ SidebarEntry* _tmp8_;
+ SidebarEntry* _tmp9_;
+ SidebarEntry* _tmp10_;
+ GtkTreeIter _tmp23_;
+ SidebarEntry* _tmp24_;
+ SidebarBranch* _tmp25_;
+ SidebarEntry* _tmp26_;
+ GtkTreeIter _tmp27_;
+ SidebarBranch* _tmp28_;
+ gboolean _tmp29_;
#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4044,14 +4055,14 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch
_tmp10_ = next;
#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp10_ != NULL) {
-#line 4048 "Tree.c"
+#line 4059 "Tree.c"
SidebarTreeEntryWrapper* next_wrapper = NULL;
- SidebarEntry* _tmp11_ = NULL;
- SidebarTreeEntryWrapper* _tmp12_ = NULL;
- GtkTreeStore* _tmp13_ = NULL;
- SidebarTreeEntryWrapper* _tmp14_ = NULL;
+ SidebarEntry* _tmp11_;
+ SidebarTreeEntryWrapper* _tmp12_;
+ GtkTreeStore* _tmp13_;
+ SidebarTreeEntryWrapper* _tmp14_;
GtkTreeIter _tmp15_ = {0};
- SidebarTreeEntryWrapper* _tmp16_ = NULL;
+ SidebarTreeEntryWrapper* _tmp16_;
GtkTreeIter _tmp17_ = {0};
GtkTreeIter _tmp18_ = {0};
#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4076,10 +4087,10 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch
insertion_iter = _tmp18_;
#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (next_wrapper);
-#line 4080 "Tree.c"
+#line 4091 "Tree.c"
} else {
- GtkTreeStore* _tmp19_ = NULL;
- SidebarTreeEntryWrapper* _tmp20_ = NULL;
+ GtkTreeStore* _tmp19_;
+ SidebarTreeEntryWrapper* _tmp20_;
GtkTreeIter _tmp21_ = {0};
GtkTreeIter _tmp22_ = {0};
#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4092,7 +4103,7 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch
gtk_tree_store_append (_tmp19_, &_tmp22_, &_tmp21_);
#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
insertion_iter = _tmp22_;
-#line 4096 "Tree.c"
+#line 4107 "Tree.c"
}
#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp23_ = insertion_iter;
@@ -4114,13 +4125,13 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch
_tmp29_ = sidebar_branch_is_auto_open_on_new_child (_tmp28_);
#line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp29_) {
-#line 4118 "Tree.c"
- SidebarEntry* _tmp30_ = NULL;
+#line 4129 "Tree.c"
+ SidebarEntry* _tmp30_;
#line 638 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp30_ = entry;
#line 638 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_expand_to_entry (self, _tmp30_);
-#line 4124 "Tree.c"
+#line 4135 "Tree.c"
}
#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (next);
@@ -4128,14 +4139,14 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch
_g_object_unref0 (parent_wrapper);
#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (parent);
-#line 4132 "Tree.c"
+#line 4143 "Tree.c"
}
static void sidebar_tree_on_branch_entry_removed (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry) {
SidebarTreeEntryWrapper* wrapper = NULL;
- SidebarEntry* _tmp0_ = NULL;
- SidebarTreeEntryWrapper* _tmp1_ = NULL;
+ SidebarEntry* _tmp0_;
+ SidebarTreeEntryWrapper* _tmp1_;
#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4156,27 +4167,27 @@ static void sidebar_tree_on_branch_entry_removed (SidebarTree* self, SidebarBran
sidebar_tree_disassociate_wrapper_and_signal (self, wrapper, FALSE);
#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (wrapper);
-#line 4160 "Tree.c"
+#line 4171 "Tree.c"
}
static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry) {
SidebarTreeEntryWrapper* wrapper = NULL;
- SidebarEntry* _tmp0_ = NULL;
- SidebarTreeEntryWrapper* _tmp1_ = NULL;
- SidebarTreeEntryWrapper* _tmp2_ = NULL;
- SidebarTreeEntryWrapper* _tmp3_ = NULL;
+ SidebarEntry* _tmp0_;
+ SidebarTreeEntryWrapper* _tmp1_;
+ SidebarTreeEntryWrapper* _tmp2_;
+ SidebarTreeEntryWrapper* _tmp3_;
GtkTreeIter* prev_iter = NULL;
SidebarEntry* prev = NULL;
- SidebarBranch* _tmp4_ = NULL;
- SidebarEntry* _tmp5_ = NULL;
- SidebarEntry* _tmp6_ = NULL;
- SidebarEntry* _tmp7_ = NULL;
+ SidebarBranch* _tmp4_;
+ SidebarEntry* _tmp5_;
+ SidebarEntry* _tmp6_;
+ SidebarEntry* _tmp7_;
GtkTreeIter entry_iter = {0};
- SidebarTreeEntryWrapper* _tmp14_ = NULL;
+ SidebarTreeEntryWrapper* _tmp14_;
GtkTreeIter _tmp15_ = {0};
- GtkTreeStore* _tmp16_ = NULL;
- GtkTreeIter* _tmp17_ = NULL;
+ GtkTreeStore* _tmp16_;
+ GtkTreeIter* _tmp17_;
#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4211,14 +4222,14 @@ static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch
_tmp7_ = prev;
#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp7_ != NULL) {
-#line 4215 "Tree.c"
+#line 4226 "Tree.c"
SidebarTreeEntryWrapper* prev_wrapper = NULL;
- SidebarEntry* _tmp8_ = NULL;
- SidebarTreeEntryWrapper* _tmp9_ = NULL;
- SidebarTreeEntryWrapper* _tmp10_ = NULL;
- SidebarTreeEntryWrapper* _tmp11_ = NULL;
+ SidebarEntry* _tmp8_;
+ SidebarTreeEntryWrapper* _tmp9_;
+ SidebarTreeEntryWrapper* _tmp10_;
+ SidebarTreeEntryWrapper* _tmp11_;
GtkTreeIter _tmp12_ = {0};
- GtkTreeIter* _tmp13_ = NULL;
+ GtkTreeIter* _tmp13_;
#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp8_ = prev;
#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4241,7 +4252,7 @@ static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch
prev_iter = _tmp13_;
#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (prev_wrapper);
-#line 4245 "Tree.c"
+#line 4256 "Tree.c"
}
#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp14_ = wrapper;
@@ -4261,54 +4272,54 @@ static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch
_g_free0 (prev_iter);
#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (wrapper);
-#line 4265 "Tree.c"
+#line 4276 "Tree.c"
}
static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry, SidebarEntry* old_parent) {
SidebarTreeEntryWrapper* wrapper = NULL;
- SidebarEntry* _tmp0_ = NULL;
- SidebarTreeEntryWrapper* _tmp1_ = NULL;
- SidebarTreeEntryWrapper* _tmp2_ = NULL;
- SidebarTreeEntryWrapper* _tmp3_ = NULL;
+ SidebarEntry* _tmp0_;
+ SidebarTreeEntryWrapper* _tmp1_;
+ SidebarTreeEntryWrapper* _tmp2_;
+ SidebarTreeEntryWrapper* _tmp3_;
gboolean selected = FALSE;
- GtkTreePath* _tmp4_ = NULL;
- GtkTreePath* _tmp5_ = NULL;
- SidebarTreeEntryWrapper* _tmp6_ = NULL;
- GtkTreePath* _tmp7_ = NULL;
- GtkTreePath* _tmp8_ = NULL;
- gint _tmp9_ = 0;
- gboolean _tmp10_ = FALSE;
+ GtkTreePath* _tmp4_;
+ GtkTreePath* _tmp5_;
+ SidebarTreeEntryWrapper* _tmp6_;
+ GtkTreePath* _tmp7_;
+ GtkTreePath* _tmp8_;
+ gint _tmp9_;
+ gboolean _tmp10_;
GtkTreeIter iter = {0};
- SidebarTreeEntryWrapper* _tmp11_ = NULL;
+ SidebarTreeEntryWrapper* _tmp11_;
GtkTreeIter _tmp12_ = {0};
- GtkTreeStore* _tmp13_ = NULL;
+ GtkTreeStore* _tmp13_;
SidebarEntry* parent = NULL;
- SidebarBranch* _tmp14_ = NULL;
- SidebarEntry* _tmp15_ = NULL;
- SidebarEntry* _tmp16_ = NULL;
- SidebarEntry* _tmp17_ = NULL;
+ SidebarBranch* _tmp14_;
+ SidebarEntry* _tmp15_;
+ SidebarEntry* _tmp16_;
+ SidebarEntry* _tmp17_;
SidebarTreeEntryWrapper* parent_wrapper = NULL;
- SidebarEntry* _tmp18_ = NULL;
- SidebarTreeEntryWrapper* _tmp19_ = NULL;
- SidebarTreeEntryWrapper* _tmp20_ = NULL;
+ SidebarEntry* _tmp18_;
+ SidebarTreeEntryWrapper* _tmp19_;
+ SidebarTreeEntryWrapper* _tmp20_;
GtkTreeIter* prev_iter = NULL;
SidebarEntry* prev = NULL;
- SidebarBranch* _tmp21_ = NULL;
- SidebarEntry* _tmp22_ = NULL;
- SidebarEntry* _tmp23_ = NULL;
- SidebarEntry* _tmp24_ = NULL;
+ SidebarBranch* _tmp21_;
+ SidebarEntry* _tmp22_;
+ SidebarEntry* _tmp23_;
+ SidebarEntry* _tmp24_;
GtkTreeIter new_iter = {0};
- GtkTreeStore* _tmp31_ = NULL;
- SidebarTreeEntryWrapper* _tmp32_ = NULL;
+ GtkTreeStore* _tmp31_;
+ SidebarTreeEntryWrapper* _tmp32_;
GtkTreeIter _tmp33_ = {0};
- GtkTreeIter* _tmp34_ = NULL;
+ GtkTreeIter* _tmp34_;
GtkTreeIter _tmp35_ = {0};
SidebarTreeEntryWrapper* new_wrapper = NULL;
- GtkTreeIter _tmp36_ = {0};
- SidebarTreeEntryWrapper* _tmp37_ = NULL;
- SidebarTreeEntryWrapper* _tmp38_ = NULL;
- gboolean _tmp39_ = FALSE;
+ GtkTreeIter _tmp36_;
+ SidebarTreeEntryWrapper* _tmp37_;
+ SidebarTreeEntryWrapper* _tmp38_;
+ gboolean _tmp39_;
#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4397,14 +4408,14 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB
_tmp24_ = prev;
#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp24_ != NULL) {
-#line 4401 "Tree.c"
+#line 4412 "Tree.c"
SidebarTreeEntryWrapper* prev_wrapper = NULL;
- SidebarEntry* _tmp25_ = NULL;
- SidebarTreeEntryWrapper* _tmp26_ = NULL;
- SidebarTreeEntryWrapper* _tmp27_ = NULL;
- SidebarTreeEntryWrapper* _tmp28_ = NULL;
+ SidebarEntry* _tmp25_;
+ SidebarTreeEntryWrapper* _tmp26_;
+ SidebarTreeEntryWrapper* _tmp27_;
+ SidebarTreeEntryWrapper* _tmp28_;
GtkTreeIter _tmp29_ = {0};
- GtkTreeIter* _tmp30_ = NULL;
+ GtkTreeIter* _tmp30_;
#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp25_ = prev;
#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4427,7 +4438,7 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB
prev_iter = _tmp30_;
#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (prev_wrapper);
-#line 4431 "Tree.c"
+#line 4442 "Tree.c"
}
#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp31_ = self->priv->store;
@@ -4453,11 +4464,11 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB
_tmp39_ = selected;
#line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp39_) {
-#line 4457 "Tree.c"
- SidebarTreeEntryWrapper* _tmp40_ = NULL;
- SidebarEntry* _tmp41_ = NULL;
- SidebarTreeEntryWrapper* _tmp42_ = NULL;
- SidebarEntry* _tmp43_ = NULL;
+#line 4468 "Tree.c"
+ SidebarTreeEntryWrapper* _tmp40_;
+ SidebarEntry* _tmp41_;
+ SidebarTreeEntryWrapper* _tmp42_;
+ SidebarEntry* _tmp43_;
#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp40_ = new_wrapper;
#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4470,7 +4481,7 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB
_tmp43_ = _tmp42_->entry;
#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_place_cursor (self, _tmp43_, FALSE);
-#line 4474 "Tree.c"
+#line 4485 "Tree.c"
}
#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (new_wrapper);
@@ -4484,16 +4495,16 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB
_g_object_unref0 (parent);
#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (wrapper);
-#line 4488 "Tree.c"
+#line 4499 "Tree.c"
}
static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry) {
GeeList* children = NULL;
- SidebarBranch* _tmp0_ = NULL;
- SidebarEntry* _tmp1_ = NULL;
- GeeList* _tmp2_ = NULL;
- GeeList* _tmp3_ = NULL;
+ SidebarBranch* _tmp0_;
+ SidebarEntry* _tmp1_;
+ GeeList* _tmp2_;
+ GeeList* _tmp3_;
#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4516,16 +4527,16 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba
_g_object_unref0 (children);
#line 710 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return;
-#line 4520 "Tree.c"
+#line 4531 "Tree.c"
}
{
GeeList* _child_list = NULL;
- GeeList* _tmp4_ = NULL;
- GeeList* _tmp5_ = NULL;
+ GeeList* _tmp4_;
+ GeeList* _tmp5_;
gint _child_size = 0;
- GeeList* _tmp6_ = NULL;
- gint _tmp7_ = 0;
- gint _tmp8_ = 0;
+ GeeList* _tmp6_;
+ gint _tmp7_;
+ gint _tmp8_;
gint _child_index = 0;
#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp4_ = children;
@@ -4545,22 +4556,22 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba
_child_index = -1;
#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
while (TRUE) {
-#line 4549 "Tree.c"
- gint _tmp9_ = 0;
- gint _tmp10_ = 0;
- gint _tmp11_ = 0;
+#line 4560 "Tree.c"
+ gint _tmp9_;
+ gint _tmp10_;
+ gint _tmp11_;
SidebarEntry* child = NULL;
- GeeList* _tmp12_ = NULL;
- gint _tmp13_ = 0;
- gpointer _tmp14_ = NULL;
+ GeeList* _tmp12_;
+ gint _tmp13_;
+ gpointer _tmp14_;
SidebarTreeEntryWrapper* child_wrapper = NULL;
- SidebarEntry* _tmp15_ = NULL;
- SidebarTreeEntryWrapper* _tmp16_ = NULL;
- SidebarTreeEntryWrapper* _tmp17_ = NULL;
+ SidebarEntry* _tmp15_;
+ SidebarTreeEntryWrapper* _tmp16_;
+ SidebarTreeEntryWrapper* _tmp17_;
GtkTreeIter child_iter = {0};
- SidebarTreeEntryWrapper* _tmp18_ = NULL;
+ SidebarTreeEntryWrapper* _tmp18_;
GtkTreeIter _tmp19_ = {0};
- GtkTreeStore* _tmp20_ = NULL;
+ GtkTreeStore* _tmp20_;
#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp9_ = _child_index;
#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4573,7 +4584,7 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba
if (!(_tmp10_ < _tmp11_)) {
#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
break;
-#line 4577 "Tree.c"
+#line 4588 "Tree.c"
}
#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp12_ = _child_list;
@@ -4607,22 +4618,22 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba
_g_object_unref0 (child_wrapper);
#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (child);
-#line 4611 "Tree.c"
+#line 4622 "Tree.c"
}
#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (_child_list);
-#line 4615 "Tree.c"
+#line 4626 "Tree.c"
}
#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (children);
-#line 4619 "Tree.c"
+#line 4630 "Tree.c"
}
static void sidebar_tree_on_show_branch (SidebarTree* self, SidebarBranch* branch, gboolean shown) {
- gboolean _tmp0_ = FALSE;
- SidebarBranch* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+ gboolean _tmp0_;
+ SidebarBranch* _tmp3_;
+ gboolean _tmp4_;
#line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4631,40 +4642,40 @@ static void sidebar_tree_on_show_branch (SidebarTree* self, SidebarBranch* branc
_tmp0_ = shown;
#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp0_) {
-#line 4635 "Tree.c"
- SidebarBranch* _tmp1_ = NULL;
+#line 4646 "Tree.c"
+ SidebarBranch* _tmp1_;
#line 725 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp1_ = branch;
#line 725 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_associate_branch (self, _tmp1_);
-#line 4641 "Tree.c"
+#line 4652 "Tree.c"
} else {
- SidebarBranch* _tmp2_ = NULL;
+ SidebarBranch* _tmp2_;
#line 727 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp2_ = branch;
#line 727 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_disassociate_branch (self, _tmp2_);
-#line 4648 "Tree.c"
+#line 4659 "Tree.c"
}
#line 729 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp3_ = branch;
#line 729 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp4_ = shown;
#line 729 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- g_signal_emit_by_name (self, "branch-shown", _tmp3_, _tmp4_);
-#line 4656 "Tree.c"
+ g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_SHOWN_SIGNAL], 0, _tmp3_, _tmp4_);
+#line 4667 "Tree.c"
}
static void sidebar_tree_on_sidebar_tooltip_changed (SidebarTree* self, SidebarEntry* entry, const gchar* tooltip) {
SidebarTreeEntryWrapper* wrapper = NULL;
- SidebarEntry* _tmp0_ = NULL;
- SidebarTreeEntryWrapper* _tmp1_ = NULL;
- GtkTreeStore* _tmp2_ = NULL;
+ SidebarEntry* _tmp0_;
+ SidebarTreeEntryWrapper* _tmp1_;
+ GtkTreeStore* _tmp2_;
GtkTreeIter _tmp3_ = {0};
- const gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4693,17 +4704,17 @@ static void sidebar_tree_on_sidebar_tooltip_changed (SidebarTree* self, SidebarE
_g_free0 (_tmp6_);
#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (wrapper);
-#line 4697 "Tree.c"
+#line 4708 "Tree.c"
}
static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntry* entry, const gchar* icon) {
SidebarTreeEntryWrapper* wrapper = NULL;
- SidebarEntry* _tmp0_ = NULL;
- SidebarTreeEntryWrapper* _tmp1_ = NULL;
- GtkTreeStore* _tmp2_ = NULL;
+ SidebarEntry* _tmp0_;
+ SidebarTreeEntryWrapper* _tmp1_;
+ GtkTreeStore* _tmp2_;
GtkTreeIter _tmp3_ = {0};
- const gchar* _tmp4_ = NULL;
+ const gchar* _tmp4_;
#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4726,19 +4737,19 @@ static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntr
gtk_tree_store_set (_tmp2_, &_tmp3_, SIDEBAR_TREE_COLUMNS_ICON, _tmp4_, -1);
#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (wrapper);
-#line 4730 "Tree.c"
+#line 4741 "Tree.c"
}
static void sidebar_tree_rename_entry (SidebarTree* self, SidebarEntry* entry) {
SidebarTreeEntryWrapper* wrapper = NULL;
- SidebarEntry* _tmp0_ = NULL;
- SidebarTreeEntryWrapper* _tmp1_ = NULL;
- GtkTreeStore* _tmp2_ = NULL;
+ SidebarEntry* _tmp0_;
+ SidebarTreeEntryWrapper* _tmp1_;
+ GtkTreeStore* _tmp2_;
GtkTreeIter _tmp3_ = {0};
- SidebarEntry* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
+ SidebarEntry* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
#line 746 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 746 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4767,12 +4778,12 @@ static void sidebar_tree_rename_entry (SidebarTree* self, SidebarEntry* entry) {
_g_free0 (_tmp6_);
#line 746 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (wrapper);
-#line 4771 "Tree.c"
+#line 4782 "Tree.c"
}
static void sidebar_tree_on_sidebar_name_changed (SidebarTree* self, SidebarEntry* entry, const gchar* name) {
- SidebarEntry* _tmp0_ = NULL;
+ SidebarEntry* _tmp0_;
#line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4783,13 +4794,13 @@ static void sidebar_tree_on_sidebar_name_changed (SidebarTree* self, SidebarEntr
_tmp0_ = entry;
#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_rename_entry (self, _tmp0_);
-#line 4787 "Tree.c"
+#line 4798 "Tree.c"
}
static void sidebar_tree_on_sidebar_page_created (SidebarTree* self, SidebarPageRepresentative* entry, Page* page) {
- SidebarPageRepresentative* _tmp0_ = NULL;
- Page* _tmp1_ = NULL;
+ SidebarPageRepresentative* _tmp0_;
+ Page* _tmp1_;
#line 757 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 757 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4801,13 +4812,13 @@ static void sidebar_tree_on_sidebar_page_created (SidebarTree* self, SidebarPage
#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp1_ = page;
#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- g_signal_emit_by_name (self, "page-created", _tmp0_, _tmp1_);
-#line 4806 "Tree.c"
+ g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_PAGE_CREATED_SIGNAL], 0, _tmp0_, _tmp1_);
+#line 4817 "Tree.c"
}
static void sidebar_tree_on_is_emphasized_changed (SidebarTree* self, SidebarEmphasizableEntry* entry, gboolean is_emphasized) {
- SidebarEmphasizableEntry* _tmp0_ = NULL;
+ SidebarEmphasizableEntry* _tmp0_;
#line 761 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 761 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4816,13 +4827,13 @@ static void sidebar_tree_on_is_emphasized_changed (SidebarTree* self, SidebarEmp
_tmp0_ = entry;
#line 762 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_rename_entry (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 4820 "Tree.c"
+#line 4831 "Tree.c"
}
static void sidebar_tree_on_sidebar_destroying_page (SidebarTree* self, SidebarPageRepresentative* entry, Page* page) {
- SidebarPageRepresentative* _tmp0_ = NULL;
- Page* _tmp1_ = NULL;
+ SidebarPageRepresentative* _tmp0_;
+ Page* _tmp1_;
#line 765 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 765 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4834,23 +4845,23 @@ static void sidebar_tree_on_sidebar_destroying_page (SidebarTree* self, SidebarP
#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp1_ = page;
#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- g_signal_emit_by_name (self, "destroying-page", _tmp0_, _tmp1_);
-#line 4839 "Tree.c"
+ g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_DESTROYING_PAGE_SIGNAL], 0, _tmp0_, _tmp1_);
+#line 4850 "Tree.c"
}
static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter) {
SidebarTreeEntryWrapper* wrapper = NULL;
- GtkTreeIter _tmp0_ = {0};
- SidebarTreeEntryWrapper* _tmp1_ = NULL;
- SidebarTreeEntryWrapper* _tmp2_ = NULL;
+ GtkTreeIter _tmp0_;
+ SidebarTreeEntryWrapper* _tmp1_;
+ SidebarTreeEntryWrapper* _tmp2_;
gchar* icon = NULL;
- SidebarTreeEntryWrapper* _tmp3_ = NULL;
- SidebarEntry* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- GtkTreeStore* _tmp6_ = NULL;
- GtkTreeIter _tmp7_ = {0};
- const gchar* _tmp8_ = NULL;
+ SidebarTreeEntryWrapper* _tmp3_;
+ SidebarEntry* _tmp4_;
+ gchar* _tmp5_;
+ GtkTreeStore* _tmp6_;
+ GtkTreeIter _tmp7_;
+ const gchar* _tmp8_;
#line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4869,7 +4880,7 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter)
_g_object_unref0 (wrapper);
#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return;
-#line 4873 "Tree.c"
+#line 4884 "Tree.c"
}
#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp3_ = wrapper;
@@ -4891,17 +4902,17 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter)
_g_free0 (icon);
#line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (wrapper);
-#line 4895 "Tree.c"
+#line 4906 "Tree.c"
}
static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter) {
- GtkTreeIter _tmp0_ = {0};
+ GtkTreeIter _tmp0_;
GtkTreeIter child_iter = {0};
- GtkTreeStore* _tmp1_ = NULL;
- GtkTreeIter _tmp2_ = {0};
+ GtkTreeStore* _tmp1_;
+ GtkTreeIter _tmp2_;
GtkTreeIter _tmp3_ = {0};
- gboolean _tmp4_ = FALSE;
+ gboolean _tmp4_;
#line 777 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 777 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4920,20 +4931,20 @@ static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter
child_iter = _tmp3_;
#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp4_) {
-#line 4924 "Tree.c"
+#line 4935 "Tree.c"
{
gboolean _tmp5_ = FALSE;
#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp5_ = TRUE;
#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
while (TRUE) {
-#line 4931 "Tree.c"
- GtkTreeIter _tmp8_ = {0};
+#line 4942 "Tree.c"
+ GtkTreeIter _tmp8_;
#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (!_tmp5_) {
-#line 4935 "Tree.c"
- GtkTreeStore* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+#line 4946 "Tree.c"
+ GtkTreeStore* _tmp6_;
+ gboolean _tmp7_;
#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp6_ = self->priv->store;
#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4942,7 +4953,7 @@ static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter
if (!_tmp7_) {
#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
break;
-#line 4946 "Tree.c"
+#line 4957 "Tree.c"
}
}
#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4951,7 +4962,7 @@ static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter
_tmp8_ = child_iter;
#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_load_branch_icons (self, &_tmp8_);
-#line 4955 "Tree.c"
+#line 4966 "Tree.c"
}
}
}
@@ -4961,10 +4972,10 @@ static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter
static gboolean sidebar_tree_on_selection (SidebarTree* self, GtkTreeSelection* selection, GtkTreeModel* model, GtkTreePath* path, gboolean path_currently_selected) {
gboolean result = FALSE;
SidebarTreeEntryWrapper* wrapper = NULL;
- GtkTreePath* _tmp0_ = NULL;
- SidebarTreeEntryWrapper* _tmp1_ = NULL;
+ GtkTreePath* _tmp0_;
+ SidebarTreeEntryWrapper* _tmp1_;
gboolean _tmp2_ = FALSE;
- SidebarTreeEntryWrapper* _tmp3_ = NULL;
+ SidebarTreeEntryWrapper* _tmp3_;
#line 788 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
#line 788 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4983,20 +4994,20 @@ static gboolean sidebar_tree_on_selection (SidebarTree* self, GtkTreeSelection*
_tmp3_ = wrapper;
#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp3_ != NULL) {
-#line 4987 "Tree.c"
- SidebarTreeEntryWrapper* _tmp4_ = NULL;
- SidebarEntry* _tmp5_ = NULL;
+#line 4998 "Tree.c"
+ SidebarTreeEntryWrapper* _tmp4_;
+ SidebarEntry* _tmp5_;
#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp4_ = wrapper;
#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp5_ = _tmp4_->entry;
#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_SELECTABLE_ENTRY);
-#line 4996 "Tree.c"
+#line 5007 "Tree.c"
} else {
#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp2_ = FALSE;
-#line 5000 "Tree.c"
+#line 5011 "Tree.c"
}
#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
result = _tmp2_;
@@ -5004,7 +5015,7 @@ static gboolean sidebar_tree_on_selection (SidebarTree* self, GtkTreeSelection*
_g_object_unref0 (wrapper);
#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 5008 "Tree.c"
+#line 5019 "Tree.c"
}
@@ -5013,11 +5024,11 @@ static GtkTreePath* sidebar_tree_get_path_from_event (SidebarTree* self, GdkEven
gint x = 0;
gint y = 0;
GdkModifierType mask = 0;
- GdkEventButton* _tmp0_ = NULL;
- GdkWindow* _tmp1_ = NULL;
- GdkDisplay* _tmp2_ = NULL;
- GdkDeviceManager* _tmp3_ = NULL;
- GdkDevice* _tmp4_ = NULL;
+ GdkEventButton* _tmp0_;
+ GdkWindow* _tmp1_;
+ GdkDisplay* _tmp2_;
+ GdkDeviceManager* _tmp3_;
+ GdkDevice* _tmp4_;
gint _tmp5_ = 0;
gint _tmp6_ = 0;
GdkModifierType _tmp7_ = 0;
@@ -5025,13 +5036,13 @@ static GtkTreePath* sidebar_tree_get_path_from_event (SidebarTree* self, GdkEven
gint cell_y = 0;
GtkTreePath* path = NULL;
GtkTreePath* _tmp8_ = NULL;
- gint _tmp9_ = 0;
- gint _tmp10_ = 0;
+ gint _tmp9_;
+ gint _tmp10_;
GtkTreePath* _tmp11_ = NULL;
gint _tmp12_ = 0;
gint _tmp13_ = 0;
- gboolean _tmp14_ = FALSE;
- GtkTreePath* _tmp16_ = NULL;
+ gboolean _tmp14_;
+ GtkTreePath* _tmp16_;
#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5070,17 +5081,17 @@ static GtkTreePath* sidebar_tree_get_path_from_event (SidebarTree* self, GdkEven
cell_y = _tmp13_;
#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp14_) {
-#line 5074 "Tree.c"
- GtkTreePath* _tmp15_ = NULL;
+#line 5085 "Tree.c"
+ GtkTreePath* _tmp15_;
#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp15_ = path;
#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp8_ = _tmp15_;
-#line 5080 "Tree.c"
+#line 5091 "Tree.c"
} else {
#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp8_ = NULL;
-#line 5084 "Tree.c"
+#line 5095 "Tree.c"
}
#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp16_ = _gtk_tree_path_copy0 (_tmp8_);
@@ -5090,7 +5101,7 @@ static GtkTreePath* sidebar_tree_get_path_from_event (SidebarTree* self, GdkEven
_gtk_tree_path_free0 (path);
#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 5094 "Tree.c"
+#line 5105 "Tree.c"
}
@@ -5098,17 +5109,17 @@ static GtkTreePath* sidebar_tree_get_current_path (SidebarTree* self) {
GtkTreePath* result = NULL;
GtkTreeModel* model = NULL;
GList* rows = NULL;
- GtkTreeSelection* _tmp0_ = NULL;
+ GtkTreeSelection* _tmp0_;
GtkTreeModel* _tmp1_ = NULL;
- GList* _tmp2_ = NULL;
- GtkTreeModel* _tmp3_ = NULL;
+ GList* _tmp2_;
+ GtkTreeModel* _tmp3_;
gboolean _tmp4_ = FALSE;
- GList* _tmp5_ = NULL;
- guint _tmp6_ = 0U;
+ GList* _tmp5_;
+ guint _tmp6_;
GtkTreePath* _tmp9_ = NULL;
- GList* _tmp10_ = NULL;
- guint _tmp11_ = 0U;
- GtkTreePath* _tmp14_ = NULL;
+ GList* _tmp10_;
+ guint _tmp11_;
+ GtkTreePath* _tmp14_;
#line 807 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5131,17 +5142,17 @@ static GtkTreePath* sidebar_tree_get_current_path (SidebarTree* self) {
if (_tmp6_ == ((guint) 0)) {
#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp4_ = TRUE;
-#line 5135 "Tree.c"
+#line 5146 "Tree.c"
} else {
- GList* _tmp7_ = NULL;
- guint _tmp8_ = 0U;
+ GList* _tmp7_;
+ guint _tmp8_;
#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp7_ = rows;
#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp8_ = g_list_length (_tmp7_);
#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp4_ = _tmp8_ == ((guint) 1);
-#line 5145 "Tree.c"
+#line 5156 "Tree.c"
}
#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_vala_assert (_tmp4_, "rows.length() == 0 || rows.length() == 1");
@@ -5151,20 +5162,20 @@ static GtkTreePath* sidebar_tree_get_current_path (SidebarTree* self) {
_tmp11_ = g_list_length (_tmp10_);
#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp11_ != ((guint) 0)) {
-#line 5155 "Tree.c"
- GList* _tmp12_ = NULL;
- gconstpointer _tmp13_ = NULL;
+#line 5166 "Tree.c"
+ GList* _tmp12_;
+ gconstpointer _tmp13_;
#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp12_ = rows;
#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp13_ = g_list_nth_data (_tmp12_, (guint) 0);
#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp9_ = (GtkTreePath*) _tmp13_;
-#line 5164 "Tree.c"
+#line 5175 "Tree.c"
} else {
#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp9_ = NULL;
-#line 5168 "Tree.c"
+#line 5179 "Tree.c"
}
#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp14_ = _gtk_tree_path_copy0 (_tmp9_);
@@ -5176,24 +5187,24 @@ static GtkTreePath* sidebar_tree_get_current_path (SidebarTree* self) {
_g_object_unref0 (model);
#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 5180 "Tree.c"
+#line 5191 "Tree.c"
}
static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) {
gboolean result = FALSE;
GList* rows = NULL;
- GtkTreeSelection* _tmp0_ = NULL;
- GList* _tmp1_ = NULL;
- GList* _tmp2_ = NULL;
+ GtkTreeSelection* _tmp0_;
+ GList* _tmp1_;
+ GList* _tmp2_;
GtkTreePath* path = NULL;
- GList* _tmp3_ = NULL;
- gconstpointer _tmp4_ = NULL;
- GtkTreePath* _tmp5_ = NULL;
- GtkTreePath* _tmp6_ = NULL;
- GtkTreePath* _tmp7_ = NULL;
- GtkTreePath* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+ GList* _tmp3_;
+ gconstpointer _tmp4_;
+ GtkTreePath* _tmp5_;
+ GtkTreePath* _tmp6_;
+ GtkTreePath* _tmp7_;
+ GtkTreePath* _tmp8_;
+ gboolean _tmp9_;
#line 815 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
#line 816 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5212,7 +5223,7 @@ static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) {
__g_list_free__gtk_tree_path_free0_0 (rows);
#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 5216 "Tree.c"
+#line 5227 "Tree.c"
}
#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp3_ = rows;
@@ -5234,7 +5245,7 @@ static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) {
__g_list_free__gtk_tree_path_free0_0 (rows);
#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 5238 "Tree.c"
+#line 5249 "Tree.c"
}
#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp7_ = path;
@@ -5252,34 +5263,34 @@ static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) {
__g_list_free__gtk_tree_path_free0_0 (rows);
#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 5256 "Tree.c"
+#line 5267 "Tree.c"
}
static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath* path, GdkEventButton* event) {
gboolean result = FALSE;
SidebarTreeEntryWrapper* wrapper = NULL;
- GtkTreePath* _tmp0_ = NULL;
- SidebarTreeEntryWrapper* _tmp1_ = NULL;
- SidebarTreeEntryWrapper* _tmp2_ = NULL;
+ GtkTreePath* _tmp0_;
+ SidebarTreeEntryWrapper* _tmp1_;
+ SidebarTreeEntryWrapper* _tmp2_;
SidebarContextable* contextable = NULL;
- SidebarTreeEntryWrapper* _tmp3_ = NULL;
- SidebarEntry* _tmp4_ = NULL;
- SidebarContextable* _tmp5_ = NULL;
- SidebarContextable* _tmp6_ = NULL;
+ SidebarTreeEntryWrapper* _tmp3_;
+ SidebarEntry* _tmp4_;
+ SidebarContextable* _tmp5_;
+ SidebarContextable* _tmp6_;
SidebarSelectableEntry* selectable = NULL;
- SidebarTreeEntryWrapper* _tmp7_ = NULL;
- SidebarEntry* _tmp8_ = NULL;
- SidebarSelectableEntry* _tmp9_ = NULL;
- SidebarSelectableEntry* _tmp10_ = NULL;
+ SidebarTreeEntryWrapper* _tmp7_;
+ SidebarEntry* _tmp8_;
+ SidebarSelectableEntry* _tmp9_;
+ SidebarSelectableEntry* _tmp10_;
GtkMenu* context_menu = NULL;
- SidebarContextable* _tmp12_ = NULL;
- GdkEventButton* _tmp13_ = NULL;
- GtkMenu* _tmp14_ = NULL;
- GtkMenu* _tmp15_ = NULL;
- GtkMenu* _tmp16_ = NULL;
- GtkWidget* _tmp17_ = NULL;
- GdkEventButton* _tmp19_ = NULL;
+ SidebarContextable* _tmp12_;
+ GdkEventButton* _tmp13_;
+ GtkMenu* _tmp14_;
+ GtkMenu* _tmp15_;
+ GtkMenu* _tmp16_;
+ GtkWidget* _tmp17_;
+ GdkEventButton* _tmp19_;
#line 829 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
#line 829 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5300,7 +5311,7 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
_g_object_unref0 (wrapper);
#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 5304 "Tree.c"
+#line 5315 "Tree.c"
}
#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp3_ = wrapper;
@@ -5322,7 +5333,7 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
_g_object_unref0 (wrapper);
#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 5326 "Tree.c"
+#line 5337 "Tree.c"
}
#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp7_ = wrapper;
@@ -5336,13 +5347,13 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
_tmp10_ = selectable;
#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp10_ != NULL) {
-#line 5340 "Tree.c"
- SidebarSelectableEntry* _tmp11_ = NULL;
+#line 5351 "Tree.c"
+ SidebarSelectableEntry* _tmp11_;
#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp11_ = selectable;
#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- g_signal_emit_by_name (self, "entry-selected", _tmp11_);
-#line 5346 "Tree.c"
+ g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL], 0, _tmp11_);
+#line 5357 "Tree.c"
}
#line 843 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp12_ = contextable;
@@ -5368,7 +5379,7 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
_g_object_unref0 (wrapper);
#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 5372 "Tree.c"
+#line 5383 "Tree.c"
}
#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp16_ = context_menu;
@@ -5376,24 +5387,24 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
_tmp17_ = gtk_menu_get_attach_widget (_tmp16_);
#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp17_ == NULL) {
-#line 5380 "Tree.c"
- GtkMenu* _tmp18_ = NULL;
+#line 5391 "Tree.c"
+ GtkMenu* _tmp18_;
#line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp18_ = context_menu;
#line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
gtk_menu_attach_to_widget (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
-#line 5386 "Tree.c"
+#line 5397 "Tree.c"
}
#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp19_ = event;
#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp19_ != NULL) {
-#line 5392 "Tree.c"
- GtkMenu* _tmp20_ = NULL;
- GdkEventButton* _tmp21_ = NULL;
- guint _tmp22_ = 0U;
- GdkEventButton* _tmp23_ = NULL;
- guint32 _tmp24_ = 0U;
+#line 5403 "Tree.c"
+ GtkMenu* _tmp20_;
+ GdkEventButton* _tmp21_;
+ guint _tmp22_;
+ GdkEventButton* _tmp23_;
+ guint32 _tmp24_;
#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp20_ = context_menu;
#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5406,17 +5417,17 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
_tmp24_ = _tmp23_->time;
#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
gtk_menu_popup (_tmp20_, NULL, NULL, NULL, NULL, _tmp22_, _tmp24_);
-#line 5410 "Tree.c"
+#line 5421 "Tree.c"
} else {
- GtkMenu* _tmp25_ = NULL;
- guint32 _tmp26_ = 0U;
+ GtkMenu* _tmp25_;
+ guint32 _tmp26_;
#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp25_ = context_menu;
#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp26_ = gtk_get_current_event_time ();
#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
gtk_menu_popup (_tmp25_, NULL, NULL, NULL, NULL, (guint) 0, _tmp26_);
-#line 5420 "Tree.c"
+#line 5431 "Tree.c"
}
#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
result = TRUE;
@@ -5430,17 +5441,17 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
_g_object_unref0 (wrapper);
#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 5434 "Tree.c"
+#line 5445 "Tree.c"
}
static gboolean sidebar_tree_popup_default_context_menu (SidebarTree* self, GdkEventButton* event) {
gboolean result = FALSE;
- GtkMenu* _tmp0_ = NULL;
- GdkEventButton* _tmp1_ = NULL;
- guint _tmp2_ = 0U;
- GdkEventButton* _tmp3_ = NULL;
- guint32 _tmp4_ = 0U;
+ GtkMenu* _tmp0_;
+ GdkEventButton* _tmp1_;
+ guint _tmp2_;
+ GdkEventButton* _tmp3_;
+ guint32 _tmp4_;
#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5461,23 +5472,23 @@ static gboolean sidebar_tree_popup_default_context_menu (SidebarTree* self, GdkE
result = TRUE;
#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 5465 "Tree.c"
+#line 5476 "Tree.c"
}
gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTreePath* path) {
gboolean result = FALSE;
SidebarTreeEntryWrapper* wrapper = NULL;
- GtkTreeIter _tmp0_ = {0};
- SidebarTreeEntryWrapper* _tmp1_ = NULL;
- SidebarTreeEntryWrapper* _tmp2_ = NULL;
+ GtkTreeIter _tmp0_;
+ SidebarTreeEntryWrapper* _tmp1_;
+ SidebarTreeEntryWrapper* _tmp2_;
gboolean should_allow_toggle = FALSE;
- gboolean _tmp3_ = FALSE;
+ gboolean _tmp3_;
gboolean _tmp4_ = FALSE;
gboolean _tmp5_ = FALSE;
- GtkTreePath* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
- gboolean _tmp16_ = FALSE;
+ GtkTreePath* _tmp6_;
+ gboolean _tmp7_;
+ gboolean _tmp16_;
#line 864 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
#line 864 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5500,7 +5511,7 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
_g_object_unref0 (wrapper);
#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 5504 "Tree.c"
+#line 5515 "Tree.c"
}
#line 872 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp3_ = self->priv->expander_called_manually;
@@ -5514,10 +5525,10 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
_tmp7_ = gtk_tree_view_row_expanded (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp6_);
#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp7_) {
-#line 5518 "Tree.c"
- GtkTreeStore* _tmp8_ = NULL;
- GtkTreeIter _tmp9_ = {0};
- gboolean _tmp10_ = FALSE;
+#line 5529 "Tree.c"
+ GtkTreeStore* _tmp8_;
+ GtkTreeIter _tmp9_;
+ gboolean _tmp10_;
#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp8_ = self->priv->store;
#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5526,34 +5537,34 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
_tmp10_ = gtk_tree_model_iter_has_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp9_);
#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp5_ = _tmp10_;
-#line 5530 "Tree.c"
+#line 5541 "Tree.c"
} else {
#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp5_ = FALSE;
-#line 5534 "Tree.c"
+#line 5545 "Tree.c"
}
#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp5_) {
-#line 5538 "Tree.c"
- SidebarTreeEntryWrapper* _tmp11_ = NULL;
- SidebarEntry* _tmp12_ = NULL;
+#line 5549 "Tree.c"
+ SidebarTreeEntryWrapper* _tmp11_;
+ SidebarEntry* _tmp12_;
#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp11_ = wrapper;
#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp12_ = _tmp11_->entry;
#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, SIDEBAR_TYPE_SELECTABLE_ENTRY);
-#line 5547 "Tree.c"
+#line 5558 "Tree.c"
} else {
#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp4_ = FALSE;
-#line 5551 "Tree.c"
+#line 5562 "Tree.c"
}
#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp4_) {
-#line 5555 "Tree.c"
- gint _tmp13_ = 0;
- gint _tmp14_ = 0;
+#line 5566 "Tree.c"
+ gint _tmp13_;
+ gint _tmp14_;
#line 880 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp13_ = self->priv->expander_special_count;
#line 880 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5568,19 +5579,19 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
_g_object_unref0 (wrapper);
#line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 5572 "Tree.c"
+#line 5583 "Tree.c"
} else {
- gboolean _tmp15_ = FALSE;
+ gboolean _tmp15_;
#line 886 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp15_ = should_allow_toggle;
#line 886 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
should_allow_toggle = !_tmp15_;
-#line 5579 "Tree.c"
+#line 5590 "Tree.c"
}
} else {
#line 890 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
self->priv->expander_special_count = 0;
-#line 5584 "Tree.c"
+#line 5595 "Tree.c"
}
#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp16_ = should_allow_toggle;
@@ -5592,7 +5603,7 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
_g_object_unref0 (wrapper);
#line 894 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 5596 "Tree.c"
+#line 5607 "Tree.c"
}
#line 897 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
result = TRUE;
@@ -5600,7 +5611,7 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
_g_object_unref0 (wrapper);
#line 897 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 5604 "Tree.c"
+#line 5615 "Tree.c"
}
@@ -5608,15 +5619,15 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
SidebarTree * self;
gboolean result = FALSE;
GtkTreePath* path = NULL;
- GdkEventButton* _tmp0_ = NULL;
- GtkTreePath* _tmp1_ = NULL;
+ GdkEventButton* _tmp0_;
+ GtkTreePath* _tmp1_;
gboolean _tmp2_ = FALSE;
- GtkTreePath* _tmp3_ = NULL;
+ GtkTreePath* _tmp3_;
gboolean _tmp6_ = FALSE;
- GdkEventButton* _tmp7_ = NULL;
- guint _tmp8_ = 0U;
- GdkEventButton* _tmp58_ = NULL;
- gboolean _tmp59_ = FALSE;
+ GdkEventButton* _tmp7_;
+ guint _tmp8_;
+ GdkEventButton* _tmp58_;
+ gboolean _tmp59_;
#line 900 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
#line 900 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5631,20 +5642,20 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
_tmp3_ = path;
#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp3_ == NULL) {
-#line 5635 "Tree.c"
- GdkEventButton* _tmp4_ = NULL;
- guint _tmp5_ = 0U;
+#line 5646 "Tree.c"
+ GdkEventButton* _tmp4_;
+ guint _tmp5_;
#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp4_ = event;
#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp5_ = _tmp4_->button;
#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp2_ = _tmp5_ != ((guint) 3);
-#line 5644 "Tree.c"
+#line 5655 "Tree.c"
} else {
#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp2_ = FALSE;
-#line 5648 "Tree.c"
+#line 5659 "Tree.c"
}
#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp2_) {
@@ -5654,7 +5665,7 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
_gtk_tree_path_free0 (path);
#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 5658 "Tree.c"
+#line 5669 "Tree.c"
}
#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp7_ = event;
@@ -5662,99 +5673,99 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
_tmp8_ = _tmp7_->button;
#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp8_ == ((guint) 3)) {
-#line 5666 "Tree.c"
- GdkEventButton* _tmp9_ = NULL;
- GdkEventType _tmp10_ = 0;
+#line 5677 "Tree.c"
+ GdkEventButton* _tmp9_;
+ GdkEventType _tmp10_;
#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp9_ = event;
#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp10_ = _tmp9_->type;
#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp6_ = _tmp10_ == GDK_BUTTON_PRESS;
-#line 5675 "Tree.c"
+#line 5686 "Tree.c"
} else {
#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp6_ = FALSE;
-#line 5679 "Tree.c"
+#line 5690 "Tree.c"
}
#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp6_) {
-#line 5683 "Tree.c"
- GtkTreePath* _tmp11_ = NULL;
+#line 5694 "Tree.c"
+ GtkTreePath* _tmp11_;
#line 910 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp11_ = path;
#line 910 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp11_ != NULL) {
-#line 5689 "Tree.c"
- GtkTreePath* _tmp12_ = NULL;
- GdkEventButton* _tmp13_ = NULL;
+#line 5700 "Tree.c"
+ GtkTreePath* _tmp12_;
+ GdkEventButton* _tmp13_;
#line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp12_ = path;
#line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp13_ = event;
#line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_popup_context_menu (self, _tmp12_, _tmp13_);
-#line 5698 "Tree.c"
+#line 5709 "Tree.c"
} else {
- GdkEventButton* _tmp14_ = NULL;
+ GdkEventButton* _tmp14_;
#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp14_ = event;
#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_popup_default_context_menu (self, _tmp14_);
-#line 5705 "Tree.c"
+#line 5716 "Tree.c"
}
} else {
gboolean _tmp15_ = FALSE;
- GdkEventButton* _tmp16_ = NULL;
- guint _tmp17_ = 0U;
+ GdkEventButton* _tmp16_;
+ guint _tmp17_;
#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp16_ = event;
#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp17_ = _tmp16_->button;
#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp17_ == ((guint) 1)) {
-#line 5717 "Tree.c"
- GdkEventButton* _tmp18_ = NULL;
- GdkEventType _tmp19_ = 0;
+#line 5728 "Tree.c"
+ GdkEventButton* _tmp18_;
+ GdkEventType _tmp19_;
#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp18_ = event;
#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp19_ = _tmp18_->type;
#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp15_ = _tmp19_ == GDK_BUTTON_PRESS;
-#line 5726 "Tree.c"
+#line 5737 "Tree.c"
} else {
#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp15_ = FALSE;
-#line 5730 "Tree.c"
+#line 5741 "Tree.c"
}
#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp15_) {
-#line 5734 "Tree.c"
- GtkTreePath* _tmp20_ = NULL;
+#line 5745 "Tree.c"
+ GtkTreePath* _tmp20_;
SidebarTreeEntryWrapper* wrapper = NULL;
- GtkTreePath* _tmp23_ = NULL;
- SidebarTreeEntryWrapper* _tmp24_ = NULL;
- SidebarTreeEntryWrapper* _tmp25_ = NULL;
+ GtkTreePath* _tmp23_;
+ SidebarTreeEntryWrapper* _tmp24_;
+ SidebarTreeEntryWrapper* _tmp25_;
gboolean _tmp28_ = FALSE;
- SidebarTreeEntryWrapper* _tmp29_ = NULL;
- SidebarEntry* _tmp30_ = NULL;
+ SidebarTreeEntryWrapper* _tmp29_;
+ SidebarEntry* _tmp30_;
gboolean _tmp34_ = FALSE;
gboolean _tmp35_ = FALSE;
- const GtkTreeRowReference* _tmp36_ = NULL;
+ const GtkTreeRowReference* _tmp36_;
gboolean _tmp48_ = FALSE;
- SidebarTreeEntryWrapper* _tmp49_ = NULL;
- SidebarEntry* _tmp50_ = NULL;
- GtkTreeStore* _tmp55_ = NULL;
- GtkTreePath* _tmp56_ = NULL;
- GtkTreeRowReference* _tmp57_ = NULL;
+ SidebarTreeEntryWrapper* _tmp49_;
+ SidebarEntry* _tmp50_;
+ GtkTreeStore* _tmp55_;
+ GtkTreePath* _tmp56_;
+ GtkTreeRowReference* _tmp57_;
#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp20_ = path;
#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp20_ == NULL) {
-#line 5756 "Tree.c"
- GdkEventButton* _tmp21_ = NULL;
- gboolean _tmp22_ = FALSE;
+#line 5767 "Tree.c"
+ GdkEventButton* _tmp21_;
+ gboolean _tmp22_;
#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5769,7 +5780,7 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
_gtk_tree_path_free0 (path);
#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 5773 "Tree.c"
+#line 5784 "Tree.c"
}
#line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp23_ = path;
@@ -5781,9 +5792,9 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
_tmp25_ = wrapper;
#line 922 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp25_ == NULL) {
-#line 5785 "Tree.c"
- GdkEventButton* _tmp26_ = NULL;
- gboolean _tmp27_ = FALSE;
+#line 5796 "Tree.c"
+ GdkEventButton* _tmp26_;
+ gboolean _tmp27_;
#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5800,7 +5811,7 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
_gtk_tree_path_free0 (path);
#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 5804 "Tree.c"
+#line 5815 "Tree.c"
}
#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp29_ = wrapper;
@@ -5810,36 +5821,36 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, SIDEBAR_TYPE_EXPANDABLE_ENTRY)) {
#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp28_ = TRUE;
-#line 5814 "Tree.c"
+#line 5825 "Tree.c"
} else {
- SidebarTreeEntryWrapper* _tmp31_ = NULL;
- SidebarEntry* _tmp32_ = NULL;
+ SidebarTreeEntryWrapper* _tmp31_;
+ SidebarEntry* _tmp32_;
#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp31_ = wrapper;
#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp32_ = _tmp31_->entry;
#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp28_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY);
-#line 5824 "Tree.c"
+#line 5835 "Tree.c"
}
#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp28_) {
-#line 5828 "Tree.c"
- GtkTreePath* _tmp33_ = NULL;
+#line 5839 "Tree.c"
+ GtkTreePath* _tmp33_;
#line 931 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp33_ = path;
#line 931 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_toggle_branch_expansion (self, _tmp33_, FALSE);
-#line 5834 "Tree.c"
+#line 5845 "Tree.c"
}
#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp36_ = self->priv->old_path_ref;
#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp36_ != NULL) {
-#line 5840 "Tree.c"
- const GtkTreeRowReference* _tmp37_ = NULL;
- GtkTreePath* _tmp38_ = NULL;
- GtkTreePath* _tmp39_ = NULL;
+#line 5851 "Tree.c"
+ const GtkTreeRowReference* _tmp37_;
+ GtkTreePath* _tmp38_;
+ GtkTreePath* _tmp39_;
#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp37_ = self->priv->old_path_ref;
#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5850,20 +5861,20 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
_tmp35_ = _tmp39_ != NULL;
#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_gtk_tree_path_free0 (_tmp39_);
-#line 5854 "Tree.c"
+#line 5865 "Tree.c"
} else {
#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp35_ = FALSE;
-#line 5858 "Tree.c"
+#line 5869 "Tree.c"
}
#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp35_) {
-#line 5862 "Tree.c"
- const GtkTreeRowReference* _tmp40_ = NULL;
- GtkTreePath* _tmp41_ = NULL;
- GtkTreePath* _tmp42_ = NULL;
- GtkTreePath* _tmp43_ = NULL;
- gint _tmp44_ = 0;
+#line 5873 "Tree.c"
+ const GtkTreeRowReference* _tmp40_;
+ GtkTreePath* _tmp41_;
+ GtkTreePath* _tmp42_;
+ GtkTreePath* _tmp43_;
+ gint _tmp44_;
#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp40_ = self->priv->old_path_ref;
#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5878,18 +5889,18 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
_tmp34_ = _tmp44_ == 0;
#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_gtk_tree_path_free0 (_tmp42_);
-#line 5882 "Tree.c"
+#line 5893 "Tree.c"
} else {
#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp34_ = FALSE;
-#line 5886 "Tree.c"
+#line 5897 "Tree.c"
}
#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp34_) {
-#line 5890 "Tree.c"
- GtkCellRendererText* _tmp45_ = NULL;
- GdkEventButton* _tmp46_ = NULL;
- gboolean _tmp47_ = FALSE;
+#line 5901 "Tree.c"
+ GtkCellRendererText* _tmp45_;
+ GdkEventButton* _tmp46_;
+ gboolean _tmp47_;
#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp45_ = self->priv->text_renderer;
#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5906,7 +5917,7 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
_gtk_tree_path_free0 (path);
#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 5910 "Tree.c"
+#line 5921 "Tree.c"
}
#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp49_ = wrapper;
@@ -5914,10 +5925,10 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
_tmp50_ = _tmp49_->entry;
#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp50_, SIDEBAR_TYPE_RENAMEABLE_ENTRY)) {
-#line 5918 "Tree.c"
- SidebarTreeEntryWrapper* _tmp51_ = NULL;
- SidebarEntry* _tmp52_ = NULL;
- gboolean _tmp53_ = FALSE;
+#line 5929 "Tree.c"
+ SidebarTreeEntryWrapper* _tmp51_;
+ SidebarEntry* _tmp52_;
+ gboolean _tmp53_;
#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp51_ = wrapper;
#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5926,21 +5937,21 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
_tmp53_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry));
#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp48_ = _tmp53_;
-#line 5930 "Tree.c"
+#line 5941 "Tree.c"
} else {
#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp48_ = FALSE;
-#line 5934 "Tree.c"
+#line 5945 "Tree.c"
}
#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp48_) {
-#line 5938 "Tree.c"
- GtkCellRendererText* _tmp54_ = NULL;
+#line 5949 "Tree.c"
+ GtkCellRendererText* _tmp54_;
#line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp54_ = self->priv->text_renderer;
#line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_object_set (_tmp54_, "editable", TRUE, NULL);
-#line 5944 "Tree.c"
+#line 5955 "Tree.c"
}
#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp55_ = self->priv->store;
@@ -5954,7 +5965,7 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
self->priv->old_path_ref = _tmp57_;
#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (wrapper);
-#line 5958 "Tree.c"
+#line 5969 "Tree.c"
}
}
#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5967,16 +5978,16 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
_gtk_tree_path_free0 (path);
#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 5971 "Tree.c"
+#line 5982 "Tree.c"
}
gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self, GdkEventKey* event) {
gboolean result = FALSE;
- GdkEventKey* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
+ GdkEventKey* _tmp0_;
+ guint _tmp1_;
+ const gchar* _tmp2_;
+ const gchar* _tmp3_;
GQuark _tmp5_ = 0U;
#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
static GQuark _tmp4_label0 = 0;
@@ -6004,27 +6015,27 @@ gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self, GdkEventKey* e
if ((((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("F2")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("Delete"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("Return"))))) || (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("KP_Enter"))))) {
#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
switch (0) {
-#line 6008 "Tree.c"
+#line 6019 "Tree.c"
default:
{
#line 963 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
result = TRUE;
#line 963 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 6015 "Tree.c"
+#line 6026 "Tree.c"
}
}
} else {
#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
switch (0) {
-#line 6021 "Tree.c"
+#line 6032 "Tree.c"
default:
{
#line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
result = FALSE;
#line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 6028 "Tree.c"
+#line 6039 "Tree.c"
}
}
}
@@ -6034,10 +6045,10 @@ gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self, GdkEventKey* e
static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
SidebarTree * self;
gboolean result = FALSE;
- GdkEventKey* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
+ GdkEventKey* _tmp0_;
+ guint _tmp1_;
+ const gchar* _tmp2_;
+ const gchar* _tmp3_;
GQuark _tmp5_ = 0U;
#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
static GQuark _tmp4_label0 = 0;
@@ -6047,9 +6058,9 @@ static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey*
static GQuark _tmp4_label2 = 0;
#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
static GQuark _tmp4_label3 = 0;
-#line 6051 "Tree.c"
- GdkEventKey* _tmp15_ = NULL;
- gboolean _tmp16_ = FALSE;
+#line 6062 "Tree.c"
+ GdkEventKey* _tmp15_;
+ gboolean _tmp16_;
#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6068,12 +6079,12 @@ static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey*
if ((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("Return")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("KP_Enter"))))) {
#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
switch (0) {
-#line 6072 "Tree.c"
+#line 6083 "Tree.c"
default:
{
GtkTreePath* path = NULL;
- GtkTreePath* _tmp6_ = NULL;
- GtkTreePath* _tmp7_ = NULL;
+ GtkTreePath* _tmp6_;
+ GtkTreePath* _tmp7_;
#line 974 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp6_ = sidebar_tree_get_current_path (self);
#line 974 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6082,13 +6093,13 @@ static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey*
_tmp7_ = path;
#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp7_ != NULL) {
-#line 6086 "Tree.c"
- GtkTreePath* _tmp8_ = NULL;
+#line 6097 "Tree.c"
+ GtkTreePath* _tmp8_;
#line 976 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp8_ = path;
#line 976 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_toggle_branch_expansion (self, _tmp8_, FALSE);
-#line 6092 "Tree.c"
+#line 6103 "Tree.c"
}
#line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
result = TRUE;
@@ -6096,35 +6107,35 @@ static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey*
_gtk_tree_path_free0 (path);
#line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 6100 "Tree.c"
+#line 6111 "Tree.c"
}
}
} else if (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("F2")))) {
#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
switch (0) {
-#line 6106 "Tree.c"
+#line 6117 "Tree.c"
default:
{
- gboolean _tmp9_ = FALSE;
+ gboolean _tmp9_;
#line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp9_ = sidebar_tree_rename_in_place (self);
#line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
result = _tmp9_;
#line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 6116 "Tree.c"
+#line 6127 "Tree.c"
}
}
} else if (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("Delete")))) {
#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
switch (0) {
-#line 6122 "Tree.c"
+#line 6133 "Tree.c"
default:
{
GtkTreePath* path = NULL;
- GtkTreePath* _tmp10_ = NULL;
+ GtkTreePath* _tmp10_;
gboolean _tmp11_ = FALSE;
- GtkTreePath* _tmp12_ = NULL;
+ GtkTreePath* _tmp12_;
#line 984 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp10_ = sidebar_tree_get_current_path (self);
#line 984 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6133,20 +6144,20 @@ static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey*
_tmp12_ = path;
#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp12_ != NULL) {
-#line 6137 "Tree.c"
- GtkTreePath* _tmp13_ = NULL;
- gboolean _tmp14_ = FALSE;
+#line 6148 "Tree.c"
+ GtkTreePath* _tmp13_;
+ gboolean _tmp14_;
#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp13_ = path;
#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp14_ = sidebar_tree_destroy_path (self, _tmp13_);
#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp11_ = _tmp14_;
-#line 6146 "Tree.c"
+#line 6157 "Tree.c"
} else {
#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp11_ = FALSE;
-#line 6150 "Tree.c"
+#line 6161 "Tree.c"
}
#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
result = _tmp11_;
@@ -6154,7 +6165,7 @@ static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey*
_gtk_tree_path_free0 (path);
#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 6158 "Tree.c"
+#line 6169 "Tree.c"
}
}
}
@@ -6166,17 +6177,17 @@ static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey*
result = _tmp16_;
#line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 6170 "Tree.c"
+#line 6181 "Tree.c"
}
gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, SidebarEntry* entry) {
gboolean result = FALSE;
- SidebarEntry* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- SidebarEntry* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
- gboolean _tmp4_ = FALSE;
+ SidebarEntry* _tmp0_;
+ gboolean _tmp1_;
+ SidebarEntry* _tmp2_;
+ gboolean _tmp3_;
+ gboolean _tmp4_;
#line 992 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
#line 992 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6191,7 +6202,7 @@ gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, SidebarEntry* en
result = FALSE;
#line 994 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 6195 "Tree.c"
+#line 6206 "Tree.c"
}
#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp2_ = entry;
@@ -6203,7 +6214,7 @@ gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, SidebarEntry* en
result = FALSE;
#line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 6207 "Tree.c"
+#line 6218 "Tree.c"
}
#line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp4_ = sidebar_tree_rename_in_place (self);
@@ -6211,7 +6222,7 @@ gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, SidebarEntry* en
result = _tmp4_;
#line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 6215 "Tree.c"
+#line 6226 "Tree.c"
}
@@ -6221,9 +6232,9 @@ static gboolean sidebar_tree_rename_in_place (SidebarTree* self) {
GtkTreeViewColumn* cursor_column = NULL;
GtkTreePath* _tmp0_ = NULL;
GtkTreeViewColumn* _tmp1_ = NULL;
- GtkTreeViewColumn* _tmp2_ = NULL;
- GtkTreePath* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+ GtkTreeViewColumn* _tmp2_;
+ GtkTreePath* _tmp3_;
+ gboolean _tmp4_;
#line 1002 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
#line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6244,10 +6255,10 @@ static gboolean sidebar_tree_rename_in_place (SidebarTree* self) {
_tmp4_ = sidebar_tree_can_rename_path (self, _tmp3_);
#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp4_) {
-#line 6248 "Tree.c"
- GtkTreePath* _tmp5_ = NULL;
- GtkTreeViewColumn* _tmp6_ = NULL;
- GtkCellRendererText* _tmp7_ = NULL;
+#line 6259 "Tree.c"
+ GtkTreePath* _tmp5_;
+ GtkTreeViewColumn* _tmp6_;
+ GtkCellRendererText* _tmp7_;
#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp5_ = cursor_path;
#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6264,7 +6275,7 @@ static gboolean sidebar_tree_rename_in_place (SidebarTree* self) {
_gtk_tree_path_free0 (cursor_path);
#line 1010 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 6268 "Tree.c"
+#line 6279 "Tree.c"
}
#line 1013 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
result = FALSE;
@@ -6274,19 +6285,19 @@ static gboolean sidebar_tree_rename_in_place (SidebarTree* self) {
_gtk_tree_path_free0 (cursor_path);
#line 1013 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 6278 "Tree.c"
+#line 6289 "Tree.c"
}
gboolean sidebar_tree_scroll_to_entry (SidebarTree* self, SidebarEntry* entry) {
gboolean result = FALSE;
SidebarTreeEntryWrapper* wrapper = NULL;
- SidebarEntry* _tmp0_ = NULL;
- SidebarTreeEntryWrapper* _tmp1_ = NULL;
- SidebarTreeEntryWrapper* _tmp2_ = NULL;
- SidebarTreeEntryWrapper* _tmp3_ = NULL;
- GtkTreePath* _tmp4_ = NULL;
- GtkTreePath* _tmp5_ = NULL;
+ SidebarEntry* _tmp0_;
+ SidebarTreeEntryWrapper* _tmp1_;
+ SidebarTreeEntryWrapper* _tmp2_;
+ SidebarTreeEntryWrapper* _tmp3_;
+ GtkTreePath* _tmp4_;
+ GtkTreePath* _tmp5_;
#line 1016 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
#line 1016 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6307,7 +6318,7 @@ gboolean sidebar_tree_scroll_to_entry (SidebarTree* self, SidebarEntry* entry) {
_g_object_unref0 (wrapper);
#line 1019 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 6311 "Tree.c"
+#line 6322 "Tree.c"
}
#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp3_ = wrapper;
@@ -6325,17 +6336,17 @@ gboolean sidebar_tree_scroll_to_entry (SidebarTree* self, SidebarEntry* entry) {
_g_object_unref0 (wrapper);
#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 6329 "Tree.c"
+#line 6340 "Tree.c"
}
static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint time) {
SidebarTree * self;
SidebarInternalDragSourceEntry* drag_source = NULL;
- SidebarEntry* _tmp0_ = NULL;
- SidebarInternalDragSourceEntry* _tmp6_ = NULL;
- SidebarInternalDragSourceEntry* _tmp16_ = NULL;
- GtkSelectionData* _tmp17_ = NULL;
+ SidebarEntry* _tmp0_;
+ SidebarInternalDragSourceEntry* _tmp6_;
+ SidebarInternalDragSourceEntry* _tmp16_;
+ GtkSelectionData* _tmp17_;
#line 1026 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
#line 1026 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6348,11 +6359,11 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
_tmp0_ = self->priv->internal_drag_source_entry;
#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp0_ != NULL) {
-#line 6352 "Tree.c"
+#line 6363 "Tree.c"
SidebarSelectableEntry* selectable = NULL;
- SidebarEntry* _tmp1_ = NULL;
- SidebarSelectableEntry* _tmp2_ = NULL;
- SidebarSelectableEntry* _tmp3_ = NULL;
+ SidebarEntry* _tmp1_;
+ SidebarSelectableEntry* _tmp2_;
+ SidebarSelectableEntry* _tmp3_;
#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp1_ = self->priv->internal_drag_source_entry;
#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6363,9 +6374,9 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
_tmp3_ = selectable;
#line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp3_ == NULL) {
-#line 6367 "Tree.c"
- SidebarEntry* _tmp4_ = NULL;
- SidebarInternalDragSourceEntry* _tmp5_ = NULL;
+#line 6378 "Tree.c"
+ SidebarEntry* _tmp4_;
+ SidebarInternalDragSourceEntry* _tmp5_;
#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp4_ = self->priv->internal_drag_source_entry;
#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6374,28 +6385,28 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
_g_object_unref0 (drag_source);
#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
drag_source = _tmp5_;
-#line 6378 "Tree.c"
+#line 6389 "Tree.c"
}
#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (selectable);
-#line 6382 "Tree.c"
+#line 6393 "Tree.c"
}
#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp6_ = drag_source;
#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp6_ == NULL) {
-#line 6388 "Tree.c"
+#line 6399 "Tree.c"
GtkTreePath* selected_path = NULL;
- GtkTreePath* _tmp7_ = NULL;
- GtkTreePath* _tmp8_ = NULL;
+ GtkTreePath* _tmp7_;
+ GtkTreePath* _tmp8_;
SidebarTreeEntryWrapper* wrapper = NULL;
- GtkTreePath* _tmp9_ = NULL;
- SidebarTreeEntryWrapper* _tmp10_ = NULL;
- SidebarTreeEntryWrapper* _tmp11_ = NULL;
- SidebarTreeEntryWrapper* _tmp12_ = NULL;
- SidebarEntry* _tmp13_ = NULL;
- SidebarInternalDragSourceEntry* _tmp14_ = NULL;
- SidebarInternalDragSourceEntry* _tmp15_ = NULL;
+ GtkTreePath* _tmp9_;
+ SidebarTreeEntryWrapper* _tmp10_;
+ SidebarTreeEntryWrapper* _tmp11_;
+ SidebarTreeEntryWrapper* _tmp12_;
+ SidebarEntry* _tmp13_;
+ SidebarInternalDragSourceEntry* _tmp14_;
+ SidebarInternalDragSourceEntry* _tmp15_;
#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp7_ = sidebar_tree_get_selected_path (self);
#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6410,7 +6421,7 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
_g_object_unref0 (drag_source);
#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return;
-#line 6414 "Tree.c"
+#line 6425 "Tree.c"
}
#line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp9_ = selected_path;
@@ -6430,7 +6441,7 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
_g_object_unref0 (drag_source);
#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return;
-#line 6434 "Tree.c"
+#line 6445 "Tree.c"
}
#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp12_ = wrapper;
@@ -6454,13 +6465,13 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
_g_object_unref0 (drag_source);
#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return;
-#line 6458 "Tree.c"
+#line 6469 "Tree.c"
}
#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (wrapper);
#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_gtk_tree_path_free0 (selected_path);
-#line 6464 "Tree.c"
+#line 6475 "Tree.c"
}
#line 1052 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp16_ = drag_source;
@@ -6470,7 +6481,7 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
sidebar_internal_drag_source_entry_prepare_selection_data (_tmp16_, _tmp17_);
#line 1026 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (drag_source);
-#line 6474 "Tree.c"
+#line 6485 "Tree.c"
}
@@ -6478,31 +6489,31 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
SidebarTree * self;
GtkTreePath* path = NULL;
GtkTreeViewDropPosition pos = 0;
- gint _tmp0_ = 0;
- gint _tmp1_ = 0;
+ gint _tmp0_;
+ gint _tmp1_;
GtkTreePath* _tmp2_ = NULL;
GtkTreeViewDropPosition _tmp3_ = 0;
- gboolean _tmp4_ = FALSE;
+ gboolean _tmp4_;
SidebarTreeEntryWrapper* wrapper = NULL;
- GtkTreePath* _tmp14_ = NULL;
- SidebarTreeEntryWrapper* _tmp15_ = NULL;
- GdkDragContext* _tmp16_ = NULL;
- GtkWidget* _tmp17_ = NULL;
- SidebarTreeEntryWrapper* _tmp27_ = NULL;
+ GtkTreePath* _tmp14_;
+ SidebarTreeEntryWrapper* _tmp15_;
+ GdkDragContext* _tmp16_;
+ GtkWidget* _tmp17_;
+ SidebarTreeEntryWrapper* _tmp27_;
SidebarInternalDropTargetEntry* targetable = NULL;
- SidebarTreeEntryWrapper* _tmp30_ = NULL;
- SidebarEntry* _tmp31_ = NULL;
- SidebarInternalDropTargetEntry* _tmp32_ = NULL;
- SidebarInternalDropTargetEntry* _tmp33_ = NULL;
+ SidebarTreeEntryWrapper* _tmp30_;
+ SidebarEntry* _tmp31_;
+ SidebarInternalDropTargetEntry* _tmp32_;
+ SidebarInternalDropTargetEntry* _tmp33_;
gboolean success = FALSE;
- GtkSelectionData* _tmp36_ = NULL;
- GdkAtom _tmp37_ = 0U;
- gchar* _tmp38_ = NULL;
- gchar* _tmp39_ = NULL;
- gboolean _tmp40_ = FALSE;
- GdkDragContext* _tmp57_ = NULL;
- gboolean _tmp58_ = FALSE;
- guint _tmp59_ = 0U;
+ GtkSelectionData* _tmp36_;
+ GdkAtom _tmp37_;
+ gchar* _tmp38_;
+ gchar* _tmp39_;
+ gboolean _tmp40_;
+ GdkDragContext* _tmp57_;
+ gboolean _tmp58_;
+ guint _tmp59_;
#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6523,22 +6534,22 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
pos = _tmp3_;
#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (!_tmp4_) {
-#line 6527 "Tree.c"
- GdkDragContext* _tmp5_ = NULL;
- GtkWidget* _tmp6_ = NULL;
+#line 6538 "Tree.c"
+ GdkDragContext* _tmp5_;
+ GtkWidget* _tmp6_;
#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp5_ = context;
#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp6_ = gtk_drag_get_source_widget (_tmp5_);
#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp6_ == NULL) {
-#line 6536 "Tree.c"
- SidebarTreeExternalDropHandler _tmp7_ = NULL;
- void* _tmp7__target = NULL;
- GdkDragContext* _tmp8_ = NULL;
- GtkSelectionData* _tmp9_ = NULL;
- guint _tmp10_ = 0U;
- guint _tmp11_ = 0U;
+#line 6547 "Tree.c"
+ SidebarTreeExternalDropHandler _tmp7_;
+ void* _tmp7__target;
+ GdkDragContext* _tmp8_;
+ GtkSelectionData* _tmp9_;
+ guint _tmp10_;
+ guint _tmp11_;
#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp7_ = self->priv->drop_handler;
#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6553,23 +6564,23 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
_tmp11_ = time;
#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp7_ (_tmp8_, NULL, _tmp9_, _tmp10_, _tmp11_, _tmp7__target);
-#line 6557 "Tree.c"
+#line 6568 "Tree.c"
} else {
- GdkDragContext* _tmp12_ = NULL;
- guint _tmp13_ = 0U;
+ GdkDragContext* _tmp12_;
+ guint _tmp13_;
#line 1065 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp12_ = context;
#line 1065 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp13_ = time;
#line 1065 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
gtk_drag_finish (_tmp12_, FALSE, FALSE, (guint32) _tmp13_);
-#line 6567 "Tree.c"
+#line 6578 "Tree.c"
}
#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_gtk_tree_path_free0 (path);
#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return;
-#line 6573 "Tree.c"
+#line 6584 "Tree.c"
}
#line 1071 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp14_ = path;
@@ -6583,33 +6594,33 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
_tmp17_ = gtk_drag_get_source_widget (_tmp16_);
#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp17_ == NULL) {
-#line 6587 "Tree.c"
+#line 6598 "Tree.c"
SidebarEntry* _tmp18_ = NULL;
- SidebarTreeEntryWrapper* _tmp19_ = NULL;
- SidebarTreeExternalDropHandler _tmp22_ = NULL;
- void* _tmp22__target = NULL;
- GdkDragContext* _tmp23_ = NULL;
- GtkSelectionData* _tmp24_ = NULL;
- guint _tmp25_ = 0U;
- guint _tmp26_ = 0U;
+ SidebarTreeEntryWrapper* _tmp19_;
+ SidebarTreeExternalDropHandler _tmp22_;
+ void* _tmp22__target;
+ GdkDragContext* _tmp23_;
+ GtkSelectionData* _tmp24_;
+ guint _tmp25_;
+ guint _tmp26_;
#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp19_ = wrapper;
#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp19_ != NULL) {
-#line 6600 "Tree.c"
- SidebarTreeEntryWrapper* _tmp20_ = NULL;
- SidebarEntry* _tmp21_ = NULL;
+#line 6611 "Tree.c"
+ SidebarTreeEntryWrapper* _tmp20_;
+ SidebarEntry* _tmp21_;
#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp20_ = wrapper;
#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp21_ = _tmp20_->entry;
#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp18_ = _tmp21_;
-#line 6609 "Tree.c"
+#line 6620 "Tree.c"
} else {
#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp18_ = NULL;
-#line 6613 "Tree.c"
+#line 6624 "Tree.c"
}
#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp22_ = self->priv->drop_handler;
@@ -6631,15 +6642,15 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
_gtk_tree_path_free0 (path);
#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return;
-#line 6635 "Tree.c"
+#line 6646 "Tree.c"
}
#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp27_ = wrapper;
#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp27_ == NULL) {
-#line 6641 "Tree.c"
- GdkDragContext* _tmp28_ = NULL;
- guint _tmp29_ = 0U;
+#line 6652 "Tree.c"
+ GdkDragContext* _tmp28_;
+ guint _tmp29_;
#line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp28_ = context;
#line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6652,7 +6663,7 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
_gtk_tree_path_free0 (path);
#line 1085 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return;
-#line 6656 "Tree.c"
+#line 6667 "Tree.c"
}
#line 1088 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp30_ = wrapper;
@@ -6666,9 +6677,9 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
_tmp33_ = targetable;
#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp33_ == NULL) {
-#line 6670 "Tree.c"
- GdkDragContext* _tmp34_ = NULL;
- guint _tmp35_ = 0U;
+#line 6681 "Tree.c"
+ GdkDragContext* _tmp34_;
+ guint _tmp35_;
#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp34_ = context;
#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6683,7 +6694,7 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
_gtk_tree_path_free0 (path);
#line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return;
-#line 6687 "Tree.c"
+#line 6698 "Tree.c"
}
#line 1095 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
success = FALSE;
@@ -6701,10 +6712,10 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
_g_free0 (_tmp39_);
#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp40_) {
-#line 6705 "Tree.c"
- SidebarInternalDropTargetEntry* _tmp41_ = NULL;
- GtkSelectionData* _tmp42_ = NULL;
- gboolean _tmp43_ = FALSE;
+#line 6716 "Tree.c"
+ SidebarInternalDropTargetEntry* _tmp41_;
+ GtkSelectionData* _tmp42_;
+ gboolean _tmp43_;
#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp41_ = targetable;
#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6713,16 +6724,16 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
_tmp43_ = sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (_tmp41_, _tmp42_);
#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
success = _tmp43_;
-#line 6717 "Tree.c"
+#line 6728 "Tree.c"
} else {
GeeList* media = NULL;
- GtkSelectionData* _tmp44_ = NULL;
- guchar* _tmp45_ = NULL;
- GtkSelectionData* _tmp46_ = NULL;
- gint _tmp47_ = 0;
- GeeList* _tmp48_ = NULL;
+ GtkSelectionData* _tmp44_;
+ guchar* _tmp45_;
+ GtkSelectionData* _tmp46_;
+ gint _tmp47_;
+ GeeList* _tmp48_;
gboolean _tmp49_ = FALSE;
- GeeList* _tmp50_ = NULL;
+ GeeList* _tmp50_;
#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp44_ = selection_data;
#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6739,10 +6750,10 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
_tmp50_ = media;
#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp50_ != NULL) {
-#line 6743 "Tree.c"
- GeeList* _tmp51_ = NULL;
- gint _tmp52_ = 0;
- gint _tmp53_ = 0;
+#line 6754 "Tree.c"
+ GeeList* _tmp51_;
+ gint _tmp52_;
+ gint _tmp53_;
#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp51_ = media;
#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6751,18 +6762,18 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
_tmp53_ = _tmp52_;
#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp49_ = _tmp53_ > 0;
-#line 6755 "Tree.c"
+#line 6766 "Tree.c"
} else {
#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp49_ = FALSE;
-#line 6759 "Tree.c"
+#line 6770 "Tree.c"
}
#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp49_) {
-#line 6763 "Tree.c"
- SidebarInternalDropTargetEntry* _tmp54_ = NULL;
- GeeList* _tmp55_ = NULL;
- gboolean _tmp56_ = FALSE;
+#line 6774 "Tree.c"
+ SidebarInternalDropTargetEntry* _tmp54_;
+ GeeList* _tmp55_;
+ gboolean _tmp56_;
#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp54_ = targetable;
#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6771,11 +6782,11 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
_tmp56_ = sidebar_internal_drop_target_entry_internal_drop_received (_tmp54_, _tmp55_);
#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
success = _tmp56_;
-#line 6775 "Tree.c"
+#line 6786 "Tree.c"
}
#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (media);
-#line 6779 "Tree.c"
+#line 6790 "Tree.c"
}
#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp57_ = context;
@@ -6791,31 +6802,31 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
_g_object_unref0 (wrapper);
#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_gtk_tree_path_free0 (path);
-#line 6795 "Tree.c"
+#line 6806 "Tree.c"
}
static gboolean sidebar_tree_real_drag_motion (GtkWidget* base, GdkDragContext* context, gint x, gint y, guint time) {
SidebarTree * self;
gboolean result = FALSE;
- GdkDragContext* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
- guint _tmp3_ = 0U;
+ GdkDragContext* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
+ guint _tmp3_;
GtkTreePath* path = NULL;
GtkTreeViewDropPosition pos = 0;
gboolean has_dest = FALSE;
- gint _tmp4_ = 0;
- gint _tmp5_ = 0;
+ gint _tmp4_;
+ gint _tmp5_;
GtkTreePath* _tmp6_ = NULL;
GtkTreeViewDropPosition _tmp7_ = 0;
- gboolean _tmp8_ = FALSE;
+ gboolean _tmp8_;
gboolean _tmp9_ = FALSE;
- gboolean _tmp10_ = FALSE;
- GdkDragContext* _tmp15_ = NULL;
- GdkDragContext* _tmp16_ = NULL;
- GdkDragAction _tmp17_ = 0;
- guint _tmp18_ = 0U;
+ gboolean _tmp10_;
+ GdkDragContext* _tmp15_;
+ GdkDragContext* _tmp16_;
+ GdkDragAction _tmp17_;
+ guint _tmp18_;
#line 1109 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
#line 1109 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6850,37 +6861,37 @@ static gboolean sidebar_tree_real_drag_motion (GtkWidget* base, GdkDragContext*
if (!_tmp10_) {
#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp9_ = TRUE;
-#line 6854 "Tree.c"
+#line 6865 "Tree.c"
} else {
- GtkTreeViewDropPosition _tmp11_ = 0;
+ GtkTreeViewDropPosition _tmp11_;
#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp11_ = pos;
#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp9_ = _tmp11_ == GTK_TREE_VIEW_DROP_BEFORE;
-#line 6861 "Tree.c"
+#line 6872 "Tree.c"
}
#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp9_) {
-#line 6865 "Tree.c"
- GtkTreePath* _tmp12_ = NULL;
+#line 6876 "Tree.c"
+ GtkTreePath* _tmp12_;
#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp12_ = path;
#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
gtk_tree_view_set_drag_dest_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp12_, GTK_TREE_VIEW_DROP_INTO_OR_BEFORE);
-#line 6871 "Tree.c"
+#line 6882 "Tree.c"
} else {
- GtkTreeViewDropPosition _tmp13_ = 0;
+ GtkTreeViewDropPosition _tmp13_;
#line 1120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp13_ = pos;
#line 1120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp13_ == GTK_TREE_VIEW_DROP_AFTER) {
-#line 6878 "Tree.c"
- GtkTreePath* _tmp14_ = NULL;
+#line 6889 "Tree.c"
+ GtkTreePath* _tmp14_;
#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp14_ = path;
#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
gtk_tree_view_set_drag_dest_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp14_, GTK_TREE_VIEW_DROP_INTO_OR_AFTER);
-#line 6884 "Tree.c"
+#line 6895 "Tree.c"
}
}
#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6899,26 +6910,26 @@ static gboolean sidebar_tree_real_drag_motion (GtkWidget* base, GdkDragContext*
_gtk_tree_path_free0 (path);
#line 1125 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 6903 "Tree.c"
+#line 6914 "Tree.c"
}
static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* path) {
gboolean result = FALSE;
- gint _tmp0_ = 0;
+ gint _tmp0_;
SidebarTreeEntryWrapper* wrapper = NULL;
- GtkTreePath* _tmp1_ = NULL;
- SidebarTreeEntryWrapper* _tmp2_ = NULL;
- SidebarTreeEntryWrapper* _tmp3_ = NULL;
+ GtkTreePath* _tmp1_;
+ SidebarTreeEntryWrapper* _tmp2_;
+ SidebarTreeEntryWrapper* _tmp3_;
SidebarRenameableEntry* renameable = NULL;
- SidebarTreeEntryWrapper* _tmp4_ = NULL;
- SidebarEntry* _tmp5_ = NULL;
- SidebarRenameableEntry* _tmp6_ = NULL;
- SidebarRenameableEntry* _tmp7_ = NULL;
- SidebarTreeEntryWrapper* _tmp8_ = NULL;
- SidebarEntry* _tmp9_ = NULL;
- GtkTreeSelection* _tmp10_ = NULL;
- GtkTreePath* _tmp11_ = NULL;
+ SidebarTreeEntryWrapper* _tmp4_;
+ SidebarEntry* _tmp5_;
+ SidebarRenameableEntry* _tmp6_;
+ SidebarRenameableEntry* _tmp7_;
+ SidebarTreeEntryWrapper* _tmp8_;
+ SidebarEntry* _tmp9_;
+ GtkTreeSelection* _tmp10_;
+ GtkTreePath* _tmp11_;
#line 1129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
#line 1129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6931,7 +6942,7 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa
result = FALSE;
#line 1131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 6935 "Tree.c"
+#line 6946 "Tree.c"
}
#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp1_ = path;
@@ -6949,7 +6960,7 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa
_g_object_unref0 (wrapper);
#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 6953 "Tree.c"
+#line 6964 "Tree.c"
}
#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp4_ = wrapper;
@@ -6971,7 +6982,7 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa
_g_object_unref0 (wrapper);
#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 6975 "Tree.c"
+#line 6986 "Tree.c"
}
#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp8_ = wrapper;
@@ -6987,7 +6998,7 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa
_g_object_unref0 (wrapper);
#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 6991 "Tree.c"
+#line 7002 "Tree.c"
}
#line 1144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp10_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
@@ -7003,22 +7014,22 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa
_g_object_unref0 (wrapper);
#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 7007 "Tree.c"
+#line 7018 "Tree.c"
}
static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path) {
gboolean result = FALSE;
SidebarTreeEntryWrapper* wrapper = NULL;
- GtkTreePath* _tmp0_ = NULL;
- SidebarTreeEntryWrapper* _tmp1_ = NULL;
- SidebarTreeEntryWrapper* _tmp2_ = NULL;
+ GtkTreePath* _tmp0_;
+ SidebarTreeEntryWrapper* _tmp1_;
+ SidebarTreeEntryWrapper* _tmp2_;
SidebarDestroyableEntry* destroyable = NULL;
- SidebarTreeEntryWrapper* _tmp3_ = NULL;
- SidebarEntry* _tmp4_ = NULL;
- SidebarDestroyableEntry* _tmp5_ = NULL;
- SidebarDestroyableEntry* _tmp6_ = NULL;
- SidebarDestroyableEntry* _tmp7_ = NULL;
+ SidebarTreeEntryWrapper* _tmp3_;
+ SidebarEntry* _tmp4_;
+ SidebarDestroyableEntry* _tmp5_;
+ SidebarDestroyableEntry* _tmp6_;
+ SidebarDestroyableEntry* _tmp7_;
#line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
#line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7039,7 +7050,7 @@ static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path)
_g_object_unref0 (wrapper);
#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 7043 "Tree.c"
+#line 7054 "Tree.c"
}
#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp3_ = wrapper;
@@ -7061,7 +7072,7 @@ static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path)
_g_object_unref0 (wrapper);
#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 7065 "Tree.c"
+#line 7076 "Tree.c"
}
#line 1158 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp7_ = destroyable;
@@ -7075,14 +7086,14 @@ static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path)
_g_object_unref0 (wrapper);
#line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 7079 "Tree.c"
+#line 7090 "Tree.c"
}
static void _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done (GtkCellEditable* _sender, gpointer self) {
#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_tree_on_editing_done ((SidebarTree*) self);
-#line 7086 "Tree.c"
+#line 7097 "Tree.c"
}
@@ -7091,12 +7102,12 @@ static gboolean _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event (G
result = sidebar_tree_on_editing_focus_out ((SidebarTree*) self, event);
#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 7095 "Tree.c"
+#line 7106 "Tree.c"
}
static void sidebar_tree_on_editing_started (SidebarTree* self, GtkCellEditable* editable, const gchar* path) {
- GtkCellEditable* _tmp0_ = NULL;
+ GtkCellEditable* _tmp0_;
#line 1163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 1163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7107,12 +7118,12 @@ static void sidebar_tree_on_editing_started (SidebarTree* self, GtkCellEditable*
_tmp0_ = editable;
#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_entry_get_type ())) {
-#line 7111 "Tree.c"
- GtkCellEditable* _tmp1_ = NULL;
- GtkEntry* _tmp2_ = NULL;
- GtkEntry* _tmp3_ = NULL;
- GtkEntry* _tmp4_ = NULL;
- GtkEntry* _tmp5_ = NULL;
+#line 7122 "Tree.c"
+ GtkCellEditable* _tmp1_;
+ GtkEntry* _tmp2_;
+ GtkEntry* _tmp3_;
+ GtkEntry* _tmp4_;
+ GtkEntry* _tmp5_;
#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp1_ = editable;
#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7133,17 +7144,17 @@ static void sidebar_tree_on_editing_started (SidebarTree* self, GtkCellEditable*
_tmp5_ = self->priv->text_entry;
#line 1168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_object_set (_tmp5_, "editable", TRUE, NULL);
-#line 7137 "Tree.c"
+#line 7148 "Tree.c"
}
}
static void sidebar_tree_on_editing_canceled (SidebarTree* self) {
- GtkEntry* _tmp0_ = NULL;
- GtkEntry* _tmp1_ = NULL;
- guint _tmp2_ = 0U;
- GtkEntry* _tmp3_ = NULL;
- guint _tmp4_ = 0U;
+ GtkEntry* _tmp0_;
+ GtkEntry* _tmp1_;
+ guint _tmp2_;
+ GtkEntry* _tmp3_;
+ guint _tmp4_;
#line 1172 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 1173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7162,22 +7173,22 @@ static void sidebar_tree_on_editing_canceled (SidebarTree* self) {
g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp4_, NULL, FALSE);
#line 1176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event, self);
-#line 7166 "Tree.c"
+#line 7177 "Tree.c"
}
static void sidebar_tree_on_editing_done (SidebarTree* self) {
- GtkEntry* _tmp0_ = NULL;
+ GtkEntry* _tmp0_;
SidebarTreeEntryWrapper* wrapper = NULL;
- GtkTreePath* _tmp1_ = NULL;
- GtkTreePath* _tmp2_ = NULL;
- SidebarTreeEntryWrapper* _tmp3_ = NULL;
- SidebarTreeEntryWrapper* _tmp4_ = NULL;
- SidebarTreeEntryWrapper* _tmp5_ = NULL;
- GtkEntry* _tmp13_ = NULL;
- guint _tmp14_ = 0U;
- GtkEntry* _tmp15_ = NULL;
- guint _tmp16_ = 0U;
+ GtkTreePath* _tmp1_;
+ GtkTreePath* _tmp2_;
+ SidebarTreeEntryWrapper* _tmp3_;
+ SidebarTreeEntryWrapper* _tmp4_;
+ SidebarTreeEntryWrapper* _tmp5_;
+ GtkEntry* _tmp13_;
+ guint _tmp14_;
+ GtkEntry* _tmp15_;
+ guint _tmp16_;
#line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7200,12 +7211,12 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) {
_tmp5_ = wrapper;
#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp5_ != NULL) {
-#line 7204 "Tree.c"
+#line 7215 "Tree.c"
SidebarRenameableEntry* renameable = NULL;
- SidebarTreeEntryWrapper* _tmp6_ = NULL;
- SidebarEntry* _tmp7_ = NULL;
- SidebarRenameableEntry* _tmp8_ = NULL;
- SidebarRenameableEntry* _tmp9_ = NULL;
+ SidebarTreeEntryWrapper* _tmp6_;
+ SidebarEntry* _tmp7_;
+ SidebarRenameableEntry* _tmp8_;
+ SidebarRenameableEntry* _tmp9_;
#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp6_ = wrapper;
#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7218,10 +7229,10 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) {
_tmp9_ = renameable;
#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
if (_tmp9_ != NULL) {
-#line 7222 "Tree.c"
- SidebarRenameableEntry* _tmp10_ = NULL;
- GtkEntry* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
+#line 7233 "Tree.c"
+ SidebarRenameableEntry* _tmp10_;
+ GtkEntry* _tmp11_;
+ const gchar* _tmp12_;
#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp10_ = renameable;
#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7230,11 +7241,11 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) {
_tmp12_ = gtk_entry_get_text (_tmp11_);
#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
sidebar_renameable_entry_rename (_tmp10_, _tmp12_);
-#line 7234 "Tree.c"
+#line 7245 "Tree.c"
}
#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (renameable);
-#line 7238 "Tree.c"
+#line 7249 "Tree.c"
}
#line 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_tmp13_ = self->priv->text_entry;
@@ -7250,7 +7261,7 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) {
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event, self);
#line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (wrapper);
-#line 7254 "Tree.c"
+#line 7265 "Tree.c"
}
@@ -7264,13 +7275,13 @@ static gboolean sidebar_tree_on_editing_focus_out (SidebarTree* self, GdkEventFo
result = FALSE;
#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 7268 "Tree.c"
+#line 7279 "Tree.c"
}
static void sidebar_tree_on_new_search (SidebarTree* self) {
- SavedSearchDialog* _tmp0_ = NULL;
- SavedSearchDialog* _tmp1_ = NULL;
+ SavedSearchDialog* _tmp0_;
+ SavedSearchDialog* _tmp1_;
#line 1200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7281,19 +7292,19 @@ static void sidebar_tree_on_new_search (SidebarTree* self) {
saved_search_dialog_show (_tmp1_);
#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_saved_search_dialog_unref0 (_tmp1_);
-#line 7285 "Tree.c"
+#line 7296 "Tree.c"
}
static void sidebar_tree_on_new_tag (SidebarTree* self) {
NewRootTagCommand* creation_command = NULL;
- NewRootTagCommand* _tmp0_ = NULL;
- CommandManager* _tmp1_ = NULL;
- CommandManager* _tmp2_ = NULL;
- LibraryWindow* _tmp3_ = NULL;
- LibraryWindow* _tmp4_ = NULL;
- Tag* _tmp5_ = NULL;
- Tag* _tmp6_ = NULL;
+ NewRootTagCommand* _tmp0_;
+ CommandManager* _tmp1_;
+ CommandManager* _tmp2_;
+ LibraryWindow* _tmp3_;
+ LibraryWindow* _tmp4_;
+ Tag* _tmp5_;
+ Tag* _tmp6_;
#line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_IS_TREE (self));
#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7324,7 +7335,7 @@ static void sidebar_tree_on_new_tag (SidebarTree* self) {
_g_object_unref0 (_tmp4_);
#line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
_g_object_unref0 (creation_command);
-#line 7328 "Tree.c"
+#line 7339 "Tree.c"
}
@@ -7343,19 +7354,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, GV
data1 = closure->data;
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
data2 = param_values->data[0].v_pointer;
-#line 7347 "Tree.c"
+#line 7358 "Tree.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
data1 = param_values->data[0].v_pointer;
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
data2 = closure->data;
-#line 7353 "Tree.c"
+#line 7364 "Tree.c"
}
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
callback = (GMarshalFunc_VOID__OBJECT_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
callback (data1, g_value_get_object (param_values + 1), g_value_get_boolean (param_values + 2), data2);
-#line 7359 "Tree.c"
+#line 7370 "Tree.c"
}
@@ -7374,29 +7385,29 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
data1 = closure->data;
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
data2 = param_values->data[0].v_pointer;
-#line 7378 "Tree.c"
+#line 7389 "Tree.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
data1 = param_values->data[0].v_pointer;
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
data2 = closure->data;
-#line 7384 "Tree.c"
+#line 7395 "Tree.c"
}
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 7390 "Tree.c"
+#line 7401 "Tree.c"
}
static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_construct (GType object_type, GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path) {
SidebarTreeEntryWrapper * self = NULL;
- SidebarEntry* _tmp0_ = NULL;
- SidebarEntry* _tmp1_ = NULL;
- GtkTreeModel* _tmp2_ = NULL;
- GtkTreePath* _tmp3_ = NULL;
- GtkTreeRowReference* _tmp4_ = NULL;
+ SidebarEntry* _tmp0_;
+ SidebarEntry* _tmp1_;
+ GtkTreeModel* _tmp2_;
+ GtkTreePath* _tmp3_;
+ GtkTreeRowReference* _tmp4_;
#line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (GTK_IS_TREE_MODEL (model), NULL);
#line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7425,21 +7436,21 @@ static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_construct (GType obje
self->row = _tmp4_;
#line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return self;
-#line 7429 "Tree.c"
+#line 7440 "Tree.c"
}
static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_new (GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path) {
#line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return sidebar_tree_entry_wrapper_construct (SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, model, entry, path);
-#line 7436 "Tree.c"
+#line 7447 "Tree.c"
}
static GtkTreePath* sidebar_tree_entry_wrapper_get_path (SidebarTreeEntryWrapper* self) {
GtkTreePath* result = NULL;
- const GtkTreeRowReference* _tmp0_ = NULL;
- GtkTreePath* _tmp1_ = NULL;
+ const GtkTreeRowReference* _tmp0_;
+ GtkTreePath* _tmp1_;
#line 24 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (self), NULL);
#line 25 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7450,20 +7461,20 @@ static GtkTreePath* sidebar_tree_entry_wrapper_get_path (SidebarTreeEntryWrapper
result = _tmp1_;
#line 25 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return result;
-#line 7454 "Tree.c"
+#line 7465 "Tree.c"
}
static void sidebar_tree_entry_wrapper_get_iter (SidebarTreeEntryWrapper* self, GtkTreeIter* result) {
GtkTreeIter iter = {0};
gboolean valid = FALSE;
- const GtkTreeRowReference* _tmp0_ = NULL;
- GtkTreeModel* _tmp1_ = NULL;
- GtkTreePath* _tmp2_ = NULL;
- GtkTreePath* _tmp3_ = NULL;
+ const GtkTreeRowReference* _tmp0_;
+ GtkTreeModel* _tmp1_;
+ GtkTreePath* _tmp2_;
+ GtkTreePath* _tmp3_;
GtkTreeIter _tmp4_ = {0};
- gboolean _tmp5_ = FALSE;
- gboolean _tmp6_ = FALSE;
+ gboolean _tmp5_;
+ gboolean _tmp6_;
#line 28 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (self));
#line 30 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7490,7 +7501,7 @@ static void sidebar_tree_entry_wrapper_get_iter (SidebarTreeEntryWrapper* self,
*result = iter;
#line 33 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return;
-#line 7494 "Tree.c"
+#line 7505 "Tree.c"
}
@@ -7499,7 +7510,7 @@ static void sidebar_tree_entry_wrapper_class_init (SidebarTreeEntryWrapperClass
sidebar_tree_entry_wrapper_parent_class = g_type_class_peek_parent (klass);
#line 15 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
G_OBJECT_CLASS (klass)->finalize = sidebar_tree_entry_wrapper_finalize;
-#line 7503 "Tree.c"
+#line 7514 "Tree.c"
}
@@ -7507,7 +7518,7 @@ static void sidebar_tree_entry_wrapper_instance_init (SidebarTreeEntryWrapper *
}
-static void sidebar_tree_entry_wrapper_finalize (GObject* obj) {
+static void sidebar_tree_entry_wrapper_finalize (GObject * obj) {
SidebarTreeEntryWrapper * self;
#line 15 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, SidebarTreeEntryWrapper);
@@ -7517,7 +7528,7 @@ static void sidebar_tree_entry_wrapper_finalize (GObject* obj) {
_gtk_tree_row_reference_free0 (self->row);
#line 15 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
G_OBJECT_CLASS (sidebar_tree_entry_wrapper_parent_class)->finalize (obj);
-#line 7521 "Tree.c"
+#line 7532 "Tree.c"
}
@@ -7535,10 +7546,10 @@ static GType sidebar_tree_entry_wrapper_get_type (void) {
static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_construct (GType object_type, GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path, gint root_position) {
SidebarTreeRootWrapper * self = NULL;
- GtkTreeModel* _tmp0_ = NULL;
- SidebarEntry* _tmp1_ = NULL;
- GtkTreePath* _tmp2_ = NULL;
- gint _tmp3_ = 0;
+ GtkTreeModel* _tmp0_;
+ SidebarEntry* _tmp1_;
+ GtkTreePath* _tmp2_;
+ gint _tmp3_;
#line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_return_val_if_fail (GTK_IS_TREE_MODEL (model), NULL);
#line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7559,14 +7570,14 @@ static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_construct (GType object
self->root_position = _tmp3_;
#line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return self;
-#line 7563 "Tree.c"
+#line 7574 "Tree.c"
}
static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_new (GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path, gint root_position) {
#line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
return sidebar_tree_root_wrapper_construct (SIDEBAR_TREE_TYPE_ROOT_WRAPPER, model, entry, path, root_position);
-#line 7570 "Tree.c"
+#line 7581 "Tree.c"
}
@@ -7575,7 +7586,7 @@ static void sidebar_tree_root_wrapper_class_init (SidebarTreeRootWrapperClass *
sidebar_tree_root_wrapper_parent_class = g_type_class_peek_parent (klass);
#line 37 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
G_OBJECT_CLASS (klass)->finalize = sidebar_tree_root_wrapper_finalize;
-#line 7579 "Tree.c"
+#line 7590 "Tree.c"
}
@@ -7583,13 +7594,13 @@ static void sidebar_tree_root_wrapper_instance_init (SidebarTreeRootWrapper * se
}
-static void sidebar_tree_root_wrapper_finalize (GObject* obj) {
+static void sidebar_tree_root_wrapper_finalize (GObject * obj) {
SidebarTreeRootWrapper * self;
#line 37 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TREE_TYPE_ROOT_WRAPPER, SidebarTreeRootWrapper);
#line 37 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
G_OBJECT_CLASS (sidebar_tree_root_wrapper_parent_class)->finalize (obj);
-#line 7593 "Tree.c"
+#line 7604 "Tree.c"
}
@@ -7611,44 +7622,44 @@ static void sidebar_tree_class_init (SidebarTreeClass * klass) {
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
g_type_class_add_private (klass, sizeof (SidebarTreePrivate));
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- ((SidebarTreeClass *) klass)->accept_cursor_changed = (gboolean (*)(SidebarTree*)) sidebar_tree_real_accept_cursor_changed;
+ ((SidebarTreeClass *) klass)->accept_cursor_changed = (gboolean (*) (SidebarTree *)) sidebar_tree_real_accept_cursor_changed;
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- ((GtkTreeViewClass *) klass)->cursor_changed = (void (*)(GtkTreeView*)) sidebar_tree_real_cursor_changed;
+ ((GtkTreeViewClass *) klass)->cursor_changed = (void (*) (GtkTreeView *)) sidebar_tree_real_cursor_changed;
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- ((GtkWidgetClass *) klass)->button_press_event = (gboolean (*)(GtkWidget*, GdkEventButton*)) sidebar_tree_real_button_press_event;
+ ((GtkWidgetClass *) klass)->button_press_event = (gboolean (*) (GtkWidget *, GdkEventButton*)) sidebar_tree_real_button_press_event;
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) sidebar_tree_real_key_press_event;
+ ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) sidebar_tree_real_key_press_event;
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- ((GtkWidgetClass *) klass)->drag_data_get = (void (*)(GtkWidget*, GdkDragContext*, GtkSelectionData*, guint, guint)) sidebar_tree_real_drag_data_get;
+ ((GtkWidgetClass *) klass)->drag_data_get = (void (*) (GtkWidget *, GdkDragContext*, GtkSelectionData*, guint, guint)) sidebar_tree_real_drag_data_get;
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- ((GtkWidgetClass *) klass)->drag_data_received = (void (*)(GtkWidget*, GdkDragContext*, gint, gint, GtkSelectionData*, guint, guint)) sidebar_tree_real_drag_data_received;
+ ((GtkWidgetClass *) klass)->drag_data_received = (void (*) (GtkWidget *, GdkDragContext*, gint, gint, GtkSelectionData*, guint, guint)) sidebar_tree_real_drag_data_received;
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- ((GtkWidgetClass *) klass)->drag_motion = (gboolean (*)(GtkWidget*, GdkDragContext*, gint, gint, guint)) sidebar_tree_real_drag_motion;
+ ((GtkWidgetClass *) klass)->drag_motion = (gboolean (*) (GtkWidget *, GdkDragContext*, gint, gint, guint)) sidebar_tree_real_drag_motion;
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
G_OBJECT_CLASS (klass)->finalize = sidebar_tree_finalize;
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- g_signal_new ("entry_selected", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_SELECTABLE_ENTRY);
+ sidebar_tree_signals[SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL] = g_signal_new ("entry-selected", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_SELECTABLE_ENTRY);
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- g_signal_new ("selected_entry_removed", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_SELECTABLE_ENTRY);
+ sidebar_tree_signals[SIDEBAR_TREE_SELECTED_ENTRY_REMOVED_SIGNAL] = g_signal_new ("selected-entry-removed", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_SELECTABLE_ENTRY);
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- g_signal_new ("branch_added", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_BRANCH);
+ sidebar_tree_signals[SIDEBAR_TREE_BRANCH_ADDED_SIGNAL] = g_signal_new ("branch-added", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_BRANCH);
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- g_signal_new ("branch_removed", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_BRANCH);
+ sidebar_tree_signals[SIDEBAR_TREE_BRANCH_REMOVED_SIGNAL] = g_signal_new ("branch-removed", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_BRANCH);
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- g_signal_new ("branch_shown", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2, SIDEBAR_TYPE_BRANCH, G_TYPE_BOOLEAN);
+ sidebar_tree_signals[SIDEBAR_TREE_BRANCH_SHOWN_SIGNAL] = g_signal_new ("branch-shown", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2, SIDEBAR_TYPE_BRANCH, G_TYPE_BOOLEAN);
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- g_signal_new ("page_created", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, TYPE_PAGE);
+ sidebar_tree_signals[SIDEBAR_TREE_PAGE_CREATED_SIGNAL] = g_signal_new ("page-created", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, TYPE_PAGE);
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
- g_signal_new ("destroying_page", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, TYPE_PAGE);
-#line 7644 "Tree.c"
+ sidebar_tree_signals[SIDEBAR_TREE_DESTROYING_PAGE_SIGNAL] = g_signal_new ("destroying-page", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, TYPE_PAGE);
+#line 7655 "Tree.c"
}
static void sidebar_tree_instance_init (SidebarTree * self) {
- GtkTreeStore* _tmp0_ = NULL;
- GtkBuilder* _tmp1_ = NULL;
- GeeHashMap* _tmp2_ = NULL;
- GeeHashMap* _tmp3_ = NULL;
+ GtkTreeStore* _tmp0_;
+ GtkBuilder* _tmp1_;
+ GeeHashMap* _tmp2_;
+ GeeHashMap* _tmp3_;
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
self->priv = SIDEBAR_TREE_GET_PRIVATE (self);
#line 55 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7687,16 +7698,16 @@ static void sidebar_tree_instance_init (SidebarTree * self) {
self->priv->internal_drag_source_entry = NULL;
#line 77 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
self->priv->old_path_ref = NULL;
-#line 7691 "Tree.c"
+#line 7702 "Tree.c"
}
-static void sidebar_tree_finalize (GObject* obj) {
+static void sidebar_tree_finalize (GObject * obj) {
SidebarTree * self;
- GtkCellRendererText* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- GtkCellRendererText* _tmp2_ = NULL;
- guint _tmp3_ = 0U;
+ GtkCellRendererText* _tmp0_;
+ guint _tmp1_;
+ GtkCellRendererText* _tmp2_;
+ guint _tmp3_;
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_TREE, SidebarTree);
#line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7731,7 +7742,7 @@ static void sidebar_tree_finalize (GObject* obj) {
_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
#line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
G_OBJECT_CLASS (sidebar_tree_parent_class)->finalize (obj);
-#line 7735 "Tree.c"
+#line 7746 "Tree.c"
}
diff --git a/src/sidebar/common.c b/src/sidebar/common.c
index 4a8f7f4..4b46c50 100644
--- a/src/sidebar/common.c
+++ b/src/sidebar/common.c
@@ -1,4 +1,4 @@
-/* common.c generated by valac 0.34.7, the Vala compiler
+/* common.c generated by valac 0.36.6, the Vala compiler
* generated from common.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -266,17 +266,17 @@ struct _SidebarHeaderPrivate {
static gpointer sidebar_grouping_parent_class = NULL;
-static SidebarEntryIface* sidebar_grouping_sidebar_entry_parent_iface = NULL;
-static SidebarExpandableEntryIface* sidebar_grouping_sidebar_expandable_entry_parent_iface = NULL;
-static SidebarRenameableEntryIface* sidebar_grouping_sidebar_renameable_entry_parent_iface = NULL;
+static SidebarEntryIface * sidebar_grouping_sidebar_entry_parent_iface = NULL;
+static SidebarExpandableEntryIface * sidebar_grouping_sidebar_expandable_entry_parent_iface = NULL;
+static SidebarRenameableEntryIface * sidebar_grouping_sidebar_renameable_entry_parent_iface = NULL;
static gpointer sidebar_simple_page_entry_parent_class = NULL;
-static SidebarEntryIface* sidebar_simple_page_entry_sidebar_entry_parent_iface = NULL;
-static SidebarSelectableEntryIface* sidebar_simple_page_entry_sidebar_selectable_entry_parent_iface = NULL;
-static SidebarPageRepresentativeIface* sidebar_simple_page_entry_sidebar_page_representative_parent_iface = NULL;
-static SidebarContextableIface* sidebar_simple_page_entry_sidebar_contextable_parent_iface = NULL;
+static SidebarEntryIface * sidebar_simple_page_entry_sidebar_entry_parent_iface = NULL;
+static SidebarSelectableEntryIface * sidebar_simple_page_entry_sidebar_selectable_entry_parent_iface = NULL;
+static SidebarPageRepresentativeIface * sidebar_simple_page_entry_sidebar_page_representative_parent_iface = NULL;
+static SidebarContextableIface * sidebar_simple_page_entry_sidebar_contextable_parent_iface = NULL;
static gpointer sidebar_root_only_branch_parent_class = NULL;
static gpointer sidebar_header_parent_class = NULL;
-static SidebarEmphasizableEntryIface* sidebar_header_sidebar_emphasizable_entry_parent_iface = NULL;
+static SidebarEmphasizableEntryIface * sidebar_header_sidebar_emphasizable_entry_parent_iface = NULL;
GType sidebar_tree_get_type (void) G_GNUC_CONST;
GType sidebar_entry_get_type (void) G_GNUC_CONST;
@@ -296,7 +296,7 @@ static gchar* sidebar_grouping_real_get_sidebar_tooltip (SidebarEntry* base);
static gchar* sidebar_grouping_real_get_sidebar_icon (SidebarEntry* base);
static gchar* sidebar_grouping_real_to_string (SidebarEntry* base);
static gboolean sidebar_grouping_real_expand_on_select (SidebarExpandableEntry* base);
-static void sidebar_grouping_finalize (GObject* obj);
+static void sidebar_grouping_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;
@@ -323,7 +323,7 @@ static void sidebar_simple_page_entry_real_pruned (SidebarEntry* base, SidebarTr
static GtkMenu* sidebar_simple_page_entry_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event);
Page* sidebar_page_representative_get_page (SidebarPageRepresentative* self);
GtkMenu* page_get_page_context_menu (Page* self);
-static void sidebar_simple_page_entry_finalize (GObject* obj);
+static void sidebar_simple_page_entry_finalize (GObject * obj);
GType sidebar_branch_get_type (void) G_GNUC_CONST;
GType sidebar_root_only_branch_get_type (void) G_GNUC_CONST;
enum {
@@ -345,18 +345,18 @@ enum {
SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized);
SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized);
static gboolean sidebar_header_real_is_emphasized (SidebarEmphasizableEntry* base);
-static void sidebar_header_finalize (GObject* obj);
+static void sidebar_header_finalize (GObject * obj);
GtkMenu* sidebar_contextable_get_sidebar_context_menu (SidebarContextable* self, GdkEventButton* event);
SidebarGrouping* sidebar_grouping_construct (GType object_type, const gchar* name, const gchar* icon, const gchar* tooltip) {
SidebarGrouping * self = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
#line 15 "/home/jens/Source/shotwell/src/sidebar/common.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 15 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -400,9 +400,9 @@ SidebarGrouping* sidebar_grouping_new (const gchar* name, const gchar* icon, con
static void sidebar_grouping_real_rename (SidebarRenameableEntry* base, const gchar* name) {
SidebarGrouping * self;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+ const gchar* _tmp2_;
#line 21 "/home/jens/Source/shotwell/src/sidebar/common.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_GROUPING, SidebarGrouping);
#line 21 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -439,8 +439,8 @@ static gboolean sidebar_grouping_real_is_user_renameable (SidebarRenameableEntry
static gchar* sidebar_grouping_real_get_sidebar_name (SidebarEntry* base) {
SidebarGrouping * self;
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 30 "/home/jens/Source/shotwell/src/sidebar/common.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_GROUPING, SidebarGrouping);
#line 31 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -458,8 +458,8 @@ static gchar* sidebar_grouping_real_get_sidebar_name (SidebarEntry* base) {
static gchar* sidebar_grouping_real_get_sidebar_tooltip (SidebarEntry* base) {
SidebarGrouping * self;
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 34 "/home/jens/Source/shotwell/src/sidebar/common.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_GROUPING, SidebarGrouping);
#line 35 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -477,8 +477,8 @@ static gchar* sidebar_grouping_real_get_sidebar_tooltip (SidebarEntry* base) {
static gchar* sidebar_grouping_real_get_sidebar_icon (SidebarEntry* base) {
SidebarGrouping * self;
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 38 "/home/jens/Source/shotwell/src/sidebar/common.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_GROUPING, SidebarGrouping);
#line 39 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -496,8 +496,8 @@ static gchar* sidebar_grouping_real_get_sidebar_icon (SidebarEntry* base) {
static gchar* sidebar_grouping_real_to_string (SidebarEntry* base) {
SidebarGrouping * self;
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 42 "/home/jens/Source/shotwell/src/sidebar/common.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_GROUPING, SidebarGrouping);
#line 43 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -540,13 +540,13 @@ static void sidebar_grouping_sidebar_entry_interface_init (SidebarEntryIface * i
#line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
sidebar_grouping_sidebar_entry_parent_iface = g_type_interface_peek_parent (iface);
#line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
- iface->get_sidebar_name = (gchar* (*)(SidebarEntry*)) sidebar_grouping_real_get_sidebar_name;
+ iface->get_sidebar_name = (gchar* (*) (SidebarEntry *)) sidebar_grouping_real_get_sidebar_name;
#line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
- iface->get_sidebar_tooltip = (gchar* (*)(SidebarEntry*)) sidebar_grouping_real_get_sidebar_tooltip;
+ iface->get_sidebar_tooltip = (gchar* (*) (SidebarEntry *)) sidebar_grouping_real_get_sidebar_tooltip;
#line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
- iface->get_sidebar_icon = (gchar* (*)(SidebarEntry*)) sidebar_grouping_real_get_sidebar_icon;
+ iface->get_sidebar_icon = (gchar* (*) (SidebarEntry *)) sidebar_grouping_real_get_sidebar_icon;
#line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
- iface->to_string = (gchar* (*)(SidebarEntry*)) sidebar_grouping_real_to_string;
+ iface->to_string = (gchar* (*) (SidebarEntry *)) sidebar_grouping_real_to_string;
#line 551 "common.c"
}
@@ -555,7 +555,7 @@ static void sidebar_grouping_sidebar_expandable_entry_interface_init (SidebarExp
#line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
sidebar_grouping_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface);
#line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
- iface->expand_on_select = (gboolean (*)(SidebarExpandableEntry*)) sidebar_grouping_real_expand_on_select;
+ iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) sidebar_grouping_real_expand_on_select;
#line 560 "common.c"
}
@@ -564,9 +564,9 @@ static void sidebar_grouping_sidebar_renameable_entry_interface_init (SidebarRen
#line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
sidebar_grouping_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface);
#line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
- iface->rename = (void (*)(SidebarRenameableEntry*, const gchar*)) sidebar_grouping_real_rename;
+ iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) sidebar_grouping_real_rename;
#line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
- iface->is_user_renameable = (gboolean (*)(SidebarRenameableEntry*)) sidebar_grouping_real_is_user_renameable;
+ iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) sidebar_grouping_real_is_user_renameable;
#line 571 "common.c"
}
@@ -578,7 +578,7 @@ static void sidebar_grouping_instance_init (SidebarGrouping * self) {
}
-static void sidebar_grouping_finalize (GObject* obj) {
+static void sidebar_grouping_finalize (GObject * obj) {
SidebarGrouping * self;
#line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_GROUPING, SidebarGrouping);
@@ -642,7 +642,7 @@ gchar* sidebar_simple_page_entry_get_sidebar_name (SidebarSimplePageEntry* self)
static gchar* sidebar_simple_page_entry_real_get_sidebar_tooltip (SidebarSimplePageEntry* self) {
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
+ gchar* _tmp0_;
#line 64 "/home/jens/Source/shotwell/src/sidebar/common.vala"
_tmp0_ = sidebar_simple_page_entry_get_sidebar_name (self);
#line 64 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -682,7 +682,7 @@ gchar* sidebar_simple_page_entry_get_sidebar_icon (SidebarSimplePageEntry* self)
static gchar* sidebar_simple_page_entry_real_to_string (SidebarSimplePageEntry* self) {
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
+ gchar* _tmp0_;
#line 70 "/home/jens/Source/shotwell/src/sidebar/common.vala"
_tmp0_ = sidebar_simple_page_entry_get_sidebar_name (self);
#line 70 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -723,7 +723,7 @@ Page* sidebar_simple_page_entry_create_page (SidebarSimplePageEntry* self) {
static gboolean sidebar_simple_page_entry_real_has_page (SidebarPageRepresentative* base) {
SidebarSimplePageEntry * self;
gboolean result = FALSE;
- Page* _tmp0_ = NULL;
+ Page* _tmp0_;
#line 75 "/home/jens/Source/shotwell/src/sidebar/common.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry);
#line 76 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -746,9 +746,9 @@ static gpointer _g_object_ref0 (gpointer self) {
static Page* sidebar_simple_page_entry_real_get_page (SidebarPageRepresentative* base) {
SidebarSimplePageEntry * self;
Page* result = NULL;
- Page* _tmp0_ = NULL;
- Page* _tmp3_ = NULL;
- Page* _tmp4_ = NULL;
+ Page* _tmp0_;
+ Page* _tmp3_;
+ Page* _tmp4_;
#line 79 "/home/jens/Source/shotwell/src/sidebar/common.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry);
#line 80 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -756,8 +756,8 @@ static Page* sidebar_simple_page_entry_real_get_page (SidebarPageRepresentative*
#line 80 "/home/jens/Source/shotwell/src/sidebar/common.vala"
if (_tmp0_ == NULL) {
#line 759 "common.c"
- Page* _tmp1_ = NULL;
- Page* _tmp2_ = NULL;
+ Page* _tmp1_;
+ Page* _tmp2_;
#line 81 "/home/jens/Source/shotwell/src/sidebar/common.vala"
_tmp1_ = sidebar_simple_page_entry_create_page (self);
#line 81 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -784,9 +784,9 @@ static Page* sidebar_simple_page_entry_real_get_page (SidebarPageRepresentative*
static void sidebar_simple_page_entry_real_pruned (SidebarEntry* base, SidebarTree* tree) {
SidebarSimplePageEntry * self;
- Page* _tmp0_ = NULL;
- Page* _tmp1_ = NULL;
- Page* _tmp2_ = NULL;
+ Page* _tmp0_;
+ Page* _tmp1_;
+ Page* _tmp2_;
#line 88 "/home/jens/Source/shotwell/src/sidebar/common.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry);
#line 88 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -818,10 +818,10 @@ static void sidebar_simple_page_entry_real_pruned (SidebarEntry* base, SidebarTr
static GtkMenu* sidebar_simple_page_entry_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event) {
SidebarSimplePageEntry * self;
GtkMenu* result = NULL;
- Page* _tmp0_ = NULL;
- Page* _tmp1_ = NULL;
- GtkMenu* _tmp2_ = NULL;
- GtkMenu* _tmp3_ = NULL;
+ Page* _tmp0_;
+ Page* _tmp1_;
+ GtkMenu* _tmp2_;
+ GtkMenu* _tmp3_;
#line 97 "/home/jens/Source/shotwell/src/sidebar/common.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry);
#line 98 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -848,15 +848,15 @@ static void sidebar_simple_page_entry_class_init (SidebarSimplePageEntryClass *
#line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
g_type_class_add_private (klass, sizeof (SidebarSimplePageEntryPrivate));
#line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) sidebar_simple_page_entry_real_get_sidebar_name;
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) sidebar_simple_page_entry_real_get_sidebar_name;
#line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_tooltip = (gchar* (*)(SidebarSimplePageEntry*)) sidebar_simple_page_entry_real_get_sidebar_tooltip;
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_tooltip = (gchar* (*) (SidebarSimplePageEntry *)) sidebar_simple_page_entry_real_get_sidebar_tooltip;
#line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) sidebar_simple_page_entry_real_get_sidebar_icon;
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) sidebar_simple_page_entry_real_get_sidebar_icon;
#line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
- ((SidebarSimplePageEntryClass *) klass)->to_string = (gchar* (*)(SidebarSimplePageEntry*)) sidebar_simple_page_entry_real_to_string;
+ ((SidebarSimplePageEntryClass *) klass)->to_string = (gchar* (*) (SidebarSimplePageEntry *)) sidebar_simple_page_entry_real_to_string;
#line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
- ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) sidebar_simple_page_entry_real_create_page;
+ ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) sidebar_simple_page_entry_real_create_page;
#line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
G_OBJECT_CLASS (klass)->finalize = sidebar_simple_page_entry_finalize;
#line 863 "common.c"
@@ -867,15 +867,15 @@ static void sidebar_simple_page_entry_sidebar_entry_interface_init (SidebarEntry
#line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
sidebar_simple_page_entry_sidebar_entry_parent_iface = g_type_interface_peek_parent (iface);
#line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
- iface->get_sidebar_name = (gchar* (*)(SidebarEntry*)) sidebar_simple_page_entry_get_sidebar_name;
+ iface->get_sidebar_name = (gchar* (*) (SidebarEntry *)) sidebar_simple_page_entry_get_sidebar_name;
#line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
- iface->get_sidebar_tooltip = (gchar* (*)(SidebarEntry*)) sidebar_simple_page_entry_get_sidebar_tooltip;
+ iface->get_sidebar_tooltip = (gchar* (*) (SidebarEntry *)) sidebar_simple_page_entry_get_sidebar_tooltip;
#line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
- iface->get_sidebar_icon = (gchar* (*)(SidebarEntry*)) sidebar_simple_page_entry_get_sidebar_icon;
+ iface->get_sidebar_icon = (gchar* (*) (SidebarEntry *)) sidebar_simple_page_entry_get_sidebar_icon;
#line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
- iface->to_string = (gchar* (*)(SidebarEntry*)) sidebar_simple_page_entry_to_string;
+ iface->to_string = (gchar* (*) (SidebarEntry *)) sidebar_simple_page_entry_to_string;
#line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
- iface->pruned = (void (*)(SidebarEntry*, SidebarTree*)) sidebar_simple_page_entry_real_pruned;
+ iface->pruned = (void (*) (SidebarEntry *, SidebarTree*)) sidebar_simple_page_entry_real_pruned;
#line 880 "common.c"
}
@@ -891,9 +891,9 @@ static void sidebar_simple_page_entry_sidebar_page_representative_interface_init
#line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
sidebar_simple_page_entry_sidebar_page_representative_parent_iface = g_type_interface_peek_parent (iface);
#line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
- iface->has_page = (gboolean (*)(SidebarPageRepresentative*)) sidebar_simple_page_entry_real_has_page;
+ iface->has_page = (gboolean (*) (SidebarPageRepresentative *)) sidebar_simple_page_entry_real_has_page;
#line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
- iface->get_page = (Page* (*)(SidebarPageRepresentative*)) sidebar_simple_page_entry_real_get_page;
+ iface->get_page = (Page* (*) (SidebarPageRepresentative *)) sidebar_simple_page_entry_real_get_page;
#line 898 "common.c"
}
@@ -902,7 +902,7 @@ static void sidebar_simple_page_entry_sidebar_contextable_interface_init (Sideba
#line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
sidebar_simple_page_entry_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface);
#line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
- iface->get_sidebar_context_menu = (GtkMenu* (*)(SidebarContextable*, GdkEventButton*)) sidebar_simple_page_entry_real_get_sidebar_context_menu;
+ iface->get_sidebar_context_menu = (GtkMenu* (*) (SidebarContextable *, GdkEventButton*)) sidebar_simple_page_entry_real_get_sidebar_context_menu;
#line 907 "common.c"
}
@@ -916,7 +916,7 @@ static void sidebar_simple_page_entry_instance_init (SidebarSimplePageEntry * se
}
-static void sidebar_simple_page_entry_finalize (GObject* obj) {
+static void sidebar_simple_page_entry_finalize (GObject * obj) {
SidebarSimplePageEntry * self;
#line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry);
@@ -959,7 +959,7 @@ static gint _sidebar_root_only_branch_null_comparator_gcompare_func (gconstpoint
SidebarRootOnlyBranch* sidebar_root_only_branch_construct (GType object_type, SidebarEntry* root) {
SidebarRootOnlyBranch * self = NULL;
- SidebarEntry* _tmp0_ = NULL;
+ SidebarEntry* _tmp0_;
#line 104 "/home/jens/Source/shotwell/src/sidebar/common.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (root), NULL);
#line 105 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -982,8 +982,8 @@ SidebarRootOnlyBranch* sidebar_root_only_branch_new (SidebarEntry* root) {
static gint sidebar_root_only_branch_null_comparator (SidebarEntry* a, SidebarEntry* b) {
gint result = 0;
gint _tmp0_ = 0;
- SidebarEntry* _tmp1_ = NULL;
- SidebarEntry* _tmp2_ = NULL;
+ SidebarEntry* _tmp1_;
+ SidebarEntry* _tmp2_;
#line 108 "/home/jens/Source/shotwell/src/sidebar/common.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
#line 108 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -1035,8 +1035,8 @@ GType sidebar_root_only_branch_get_type (void) {
SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized) {
SidebarHeader * self = NULL;
- const gchar* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ const gchar* _tmp0_;
+ gboolean _tmp1_;
#line 123 "/home/jens/Source/shotwell/src/sidebar/common.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 124 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -1063,7 +1063,7 @@ SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized) {
static gboolean sidebar_header_real_is_emphasized (SidebarEmphasizableEntry* base) {
SidebarHeader * self;
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 128 "/home/jens/Source/shotwell/src/sidebar/common.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_HEADER, SidebarHeader);
#line 129 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -1091,7 +1091,7 @@ static void sidebar_header_sidebar_emphasizable_entry_interface_init (SidebarEmp
#line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala"
sidebar_header_sidebar_emphasizable_entry_parent_iface = g_type_interface_peek_parent (iface);
#line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala"
- iface->is_emphasized = (gboolean (*)(SidebarEmphasizableEntry*)) sidebar_header_real_is_emphasized;
+ iface->is_emphasized = (gboolean (*) (SidebarEmphasizableEntry *)) sidebar_header_real_is_emphasized;
#line 1096 "common.c"
}
@@ -1103,7 +1103,7 @@ static void sidebar_header_instance_init (SidebarHeader * self) {
}
-static void sidebar_header_finalize (GObject* obj) {
+static void sidebar_header_finalize (GObject * obj) {
SidebarHeader * self;
#line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_HEADER, SidebarHeader);