From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 14:34:32 +0200 Subject: New upstream version 0.28.2 --- src/sidebar/Tree.c | 5474 ++++++++++++++++++++++++----------------------- src/sidebar/Tree.vala | 29 +- src/sidebar/common.c | 39 +- src/sidebar/common.vala | 4 +- 4 files changed, 2851 insertions(+), 2695 deletions(-) (limited to 'src/sidebar') diff --git a/src/sidebar/Tree.c b/src/sidebar/Tree.c index c6bb85d..1345227 100644 --- a/src/sidebar/Tree.c +++ b/src/sidebar/Tree.c @@ -243,7 +243,6 @@ typedef struct _SidebarDestroyableEntryIface SidebarDestroyableEntryIface; typedef struct _SavedSearchDialog SavedSearchDialog; typedef struct _SavedSearchDialogClass SavedSearchDialogClass; -#define _saved_search_dialog_unref0(var) ((var == NULL) ? NULL : (var = (saved_search_dialog_unref (var), NULL))) #define TYPE_COMMAND (command_get_type ()) #define COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMMAND, Command)) @@ -497,7 +496,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_add67 (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); @@ -581,7 +580,7 @@ gchar* sidebar_entry_get_sidebar_tooltip (SidebarEntry* self); static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter); static void sidebar_tree_on_sidebar_tooltip_changed (SidebarTree* self, SidebarEntry* entry, const gchar* tooltip); static void _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed (SidebarEntry* _sender, const gchar* tooltip, gpointer self); -static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntry* entry, const gchar* icon); +static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntry* entry, const gchar* icon_name); static void _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed (SidebarEntry* _sender, const gchar* icon, gpointer self); GType page_get_type (void) G_GNUC_CONST; GType sidebar_page_representative_get_type (void) G_GNUC_CONST; @@ -645,12 +644,6 @@ static gboolean _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event (G void sidebar_renameable_entry_rename (SidebarRenameableEntry* self, const gchar* new_name); SavedSearchDialog* saved_search_dialog_new (void); SavedSearchDialog* saved_search_dialog_construct (GType object_type); -gpointer saved_search_dialog_ref (gpointer instance); -void saved_search_dialog_unref (gpointer instance); -GParamSpec* param_spec_saved_search_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_saved_search_dialog (GValue* value, gpointer v_object); -void value_take_saved_search_dialog (GValue* value, gpointer v_object); -gpointer value_get_saved_search_dialog (const GValue* value); GType saved_search_dialog_get_type (void) G_GNUC_CONST; void saved_search_dialog_show (SavedSearchDialog* self); GType command_get_type (void) G_GNUC_CONST; @@ -689,16 +682,16 @@ 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" +#line 155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_editing_canceled ((SidebarTree*) self); -#line 695 "Tree.c" +#line 688 "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" +#line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_editing_started ((SidebarTree*) self, editable, path); -#line 702 "Tree.c" +#line 695 "Tree.c" } @@ -715,303 +708,298 @@ 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" +#line 192 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_new_tag ((SidebarTree*) self); -#line 721 "Tree.c" +#line 714 "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" +#line 192 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_new_search ((SidebarTree*) self); -#line 728 "Tree.c" +#line 721 "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" +#line 103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_icon_renderer_function ((SidebarTree*) self, cell_layout, cell, tree_model, iter); -#line 735 "Tree.c" +#line 728 "Tree.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 127 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return self ? g_object_ref (self) : NULL; -#line 742 "Tree.c" +#line 735 "Tree.c" } static gboolean _sidebar_tree_on_selection_gtk_tree_selection_func (GtkTreeSelection* selection, GtkTreeModel* model, GtkTreePath* path, gboolean path_currently_selected, gpointer self) { gboolean result; result = sidebar_tree_on_selection ((SidebarTree*) self, selection, model, path, path_currently_selected); -#line 129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 128 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 751 "Tree.c" +#line 744 "Tree.c" } static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self) { gboolean result; result = sidebar_tree_on_toggle_row ((SidebarTree*) self, iter, path); -#line 131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 760 "Tree.c" +#line 753 "Tree.c" } static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self) { gboolean result; result = sidebar_tree_on_toggle_row ((SidebarTree*) self, iter, path); -#line 132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 769 "Tree.c" +#line 762 "Tree.c" } -static void _vala_array_add64 (GtkTargetEntry* * array, int* length, int* size, const GtkTargetEntry* value) { -#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +static void _vala_array_add67 (GtkTargetEntry* * array, int* length, int* size, const GtkTargetEntry* value) { +#line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if ((*length) == (*size)) { -#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" *array = g_renew (GtkTargetEntry, *array, *size); -#line 780 "Tree.c" +#line 773 "Tree.c" } -#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" (*array)[(*length)++] = *value; -#line 784 "Tree.c" +#line 777 "Tree.c" } static gboolean _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu (GtkWidget* _sender, gpointer self) { gboolean result; result = sidebar_tree_on_context_menu_keypress ((SidebarTree*) self); -#line 146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 793 "Tree.c" +#line 786 "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" +#line 149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_drag_begin ((SidebarTree*) self, context); -#line 800 "Tree.c" +#line 793 "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" +#line 150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_drag_end ((SidebarTree*) self, context); -#line 807 "Tree.c" +#line 800 "Tree.c" } static gboolean _sidebar_tree_on_drag_motion_gtk_widget_drag_motion (GtkWidget* _sender, GdkDragContext* context, gint x, gint y, guint time_, gpointer self) { gboolean result; result = sidebar_tree_on_drag_motion ((SidebarTree*) self, context, x, y, time_); -#line 152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 816 "Tree.c" +#line 809 "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_; - GtkStyleContext* _tmp1_; GtkTreeViewColumn* text_column = NULL; - GtkTreeViewColumn* _tmp2_; + GtkTreeViewColumn* _tmp1_; GtkCellRendererPixbuf* icon_renderer = NULL; - GtkCellRendererPixbuf* _tmp3_; + GtkCellRendererPixbuf* _tmp2_; + GtkCellRendererText* _tmp3_; GtkCellRendererText* _tmp4_; GtkCellRendererText* _tmp5_; GtkCellRendererText* _tmp6_; GtkCellRendererText* _tmp7_; GtkCellRendererText* _tmp8_; - GtkCellRendererText* _tmp9_; GtkCellRendererText* invisitext = NULL; - GtkCellRendererText* _tmp10_; + GtkCellRendererText* _tmp9_; GtkTreeViewColumn* page_holder = NULL; - GtkTreeViewColumn* _tmp11_; + GtkTreeViewColumn* _tmp10_; GtkTreeSelection* selection = NULL; + GtkTreeSelection* _tmp11_; GtkTreeSelection* _tmp12_; - GtkTreeSelection* _tmp13_; - GtkTargetEntry* _tmp14_; - gint _tmp14__length1; - GdkDragAction _tmp15_; + GtkTargetEntry* _tmp13_; + gint _tmp13__length1; + GdkDragAction _tmp14_; GtkTargetEntry* source_entries = NULL; - GtkTargetEntry* _tmp16_; + GtkTargetEntry* _tmp15_; gint source_entries_length1; gint _source_entries_size_; + GtkTargetEntry* _tmp16_; + gint _tmp16__length1; GtkTargetEntry* _tmp17_; gint _tmp17__length1; - GtkTargetEntry* _tmp18_; - gint _tmp18__length1; - GtkTargetEntry _tmp19_; - GtkTargetEntry* _tmp20_; - gint _tmp20__length1; - SidebarTreeExternalDropHandler _tmp21_; - void* _tmp21__target; + GtkTargetEntry _tmp18_; + GtkTargetEntry* _tmp19_; + gint _tmp19__length1; + SidebarTreeExternalDropHandler _tmp20_; + void* _tmp20__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" _tmp0_ = self->priv->store; #line 95 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_TREE_MODEL, GtkTreeModel)); -#line 96 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp1_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 96 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_style_context_add_class (_tmp1_, "sidebar"); -#line 98 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = gtk_tree_view_column_new (); +#line 97 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp1_ = gtk_tree_view_column_new (); +#line 97 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + g_object_ref_sink (_tmp1_); +#line 97 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + text_column = _tmp1_; #line 98 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + gtk_tree_view_column_set_expand (text_column, TRUE); +#line 99 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp2_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new (); +#line 99 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_object_ref_sink (_tmp2_); -#line 98 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - text_column = _tmp2_; #line 99 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_view_column_set_expand (text_column, TRUE); -#line 100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new (); + icon_renderer = _tmp2_; #line 100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_object_ref_sink (_tmp3_); -#line 100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - icon_renderer = _tmp3_; -#line 101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_object_set (icon_renderer, "follow-state", TRUE, NULL); -#line 102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (icon_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE); +#line 102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (icon_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), "gicon", (gint) SIDEBAR_TREE_COLUMNS_ICON); #line 103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (icon_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), "icon_name", (gint) SIDEBAR_TREE_COLUMNS_ICON); -#line 104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_cell_layout_set_cell_data_func (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (icon_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), _sidebar_tree_icon_renderer_function_gtk_cell_layout_data_func, g_object_ref (self), g_object_unref); -#line 105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = (GtkCellRendererText*) gtk_cell_renderer_text_new (); -#line 105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_object_ref_sink (_tmp4_); -#line 105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp3_ = (GtkCellRendererText*) gtk_cell_renderer_text_new (); +#line 104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + g_object_ref_sink (_tmp3_); +#line 104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (self->priv->text_renderer); +#line 104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + self->priv->text_renderer = _tmp3_; +#line 105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp4_ = self->priv->text_renderer; #line 105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - self->priv->text_renderer = _tmp4_; + g_object_set (_tmp4_, "ellipsize", PANGO_ELLIPSIZE_END, NULL); #line 106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = self->priv->text_renderer; #line 106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_object_set (_tmp5_, "ellipsize", PANGO_ELLIPSIZE_END, NULL); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_cell_renderer_get_type (), GtkCellRenderer), "editing-canceled", (GCallback) _sidebar_tree_on_editing_canceled_gtk_cell_renderer_editing_canceled, self, 0); #line 107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = self->priv->text_renderer; #line 107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_cell_renderer_get_type (), GtkCellRenderer), "editing-canceled", (GCallback) _sidebar_tree_on_editing_canceled_gtk_cell_renderer_editing_canceled, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_cell_renderer_get_type (), GtkCellRenderer), "editing-started", (GCallback) _sidebar_tree_on_editing_started_gtk_cell_renderer_editing_started, self, 0); #line 108 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = self->priv->text_renderer; #line 108 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_cell_renderer_get_type (), GtkCellRenderer), "editing-started", (GCallback) _sidebar_tree_on_editing_started_gtk_cell_renderer_editing_started, self, 0); + gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); #line 109 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = self->priv->text_renderer; #line 109 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); + gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_cell_renderer_get_type (), GtkCellRenderer), "markup", (gint) SIDEBAR_TREE_COLUMNS_NAME); #line 110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp9_ = self->priv->text_renderer; -#line 110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_cell_renderer_get_type (), GtkCellRenderer), "markup", (gint) SIDEBAR_TREE_COLUMNS_NAME); -#line 111 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_append_column (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), text_column); +#line 112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp9_ = (GtkCellRendererText*) gtk_cell_renderer_text_new (); +#line 112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + g_object_ref_sink (_tmp9_); +#line 112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + invisitext = _tmp9_; #line 113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp10_ = (GtkCellRendererText*) gtk_cell_renderer_text_new (); + _tmp10_ = gtk_tree_view_column_new (); #line 113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_object_ref_sink (_tmp10_); #line 113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - invisitext = _tmp10_; -#line 114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp11_ = gtk_tree_view_column_new (); + page_holder = _tmp10_; #line 114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_object_ref_sink (_tmp11_); -#line 114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - page_holder = _tmp11_; -#line 115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (page_holder, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (invisitext, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); -#line 116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_column_set_visible (page_holder, FALSE); -#line 117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_append_column (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), page_holder); -#line 119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_set_headers_visible (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), FALSE); -#line 120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_set_enable_search (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), FALSE); -#line 121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_set_show_expanders (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), TRUE); -#line 122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_set_reorderable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), FALSE); -#line 123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_set_enable_tree_lines (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), FALSE); -#line 124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_set_grid_lines (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), GTK_TREE_VIEW_GRID_LINES_NONE); -#line 125 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_set_tooltip_column (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), (gint) SIDEBAR_TREE_COLUMNS_TOOLTIP); +#line 126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp11_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView)); +#line 126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp12_ = _g_object_ref0 (_tmp11_); +#line 126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + selection = _tmp12_; #line 127 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp12_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView)); -#line 127 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp13_ = _g_object_ref0 (_tmp12_); -#line 127 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - selection = _tmp13_; -#line 128 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); -#line 129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 128 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_selection_set_select_function (selection, _sidebar_tree_on_selection_gtk_tree_selection_func, g_object_ref (self), g_object_unref); -#line 131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), "test-expand-row", (GCallback) _sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row, self, 0); -#line 132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), "test-collapse-row", (GCallback) _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row, self, 0); -#line 137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14_ = target_entries; -#line 137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp14__length1 = target_entries_length1; -#line 137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp15_ = actions; -#line 137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_view_enable_model_drag_dest (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp14_, _tmp14__length1, _tmp15_); +#line 136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp13_ = target_entries; +#line 136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp13__length1 = target_entries_length1; +#line 136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp14_ = actions; +#line 136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + gtk_tree_view_enable_model_drag_dest (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp13_, _tmp13__length1, _tmp14_); +#line 138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp15_ = g_new0 (GtkTargetEntry, 0); +#line 138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + source_entries = _tmp15_; +#line 138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + source_entries_length1 = 0; +#line 138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _source_entries_size_ = source_entries_length1; #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp16_ = g_new0 (GtkTargetEntry, 0); + _tmp16_ = source_entries; #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - source_entries = _tmp16_; + _tmp16__length1 = source_entries_length1; #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - source_entries_length1 = 0; + _tmp17_ = target_entries; #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _source_entries_size_ = source_entries_length1; -#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp17_ = source_entries; -#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp17__length1 = source_entries_length1; -#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp18_ = target_entries; + _tmp17__length1 = target_entries_length1; +#line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp18_ = _tmp17_[LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH]; +#line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _vala_array_add67 (&source_entries, &source_entries_length1, &_source_entries_size_, &_tmp18_); #line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp18__length1 = target_entries_length1; + _tmp19_ = source_entries; #line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp19_ = _tmp18_[LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH]; + _tmp19__length1 = source_entries_length1; #line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_array_add64 (&source_entries, &source_entries_length1, &_source_entries_size_, &_tmp19_); -#line 141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp20_ = source_entries; -#line 141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp20__length1 = source_entries_length1; -#line 141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_view_enable_model_drag_source (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), GDK_BUTTON1_MASK, _tmp20_, _tmp20__length1, GDK_ACTION_COPY); -#line 144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp21_ = drop_handler; -#line 144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp21__target = drop_handler_target; -#line 144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - self->priv->drop_handler = _tmp21_; -#line 144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - self->priv->drop_handler_target = _tmp21__target; -#line 146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + gtk_tree_view_enable_model_drag_source (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), GDK_BUTTON1_MASK, _tmp19_, _tmp19__length1, GDK_ACTION_COPY); +#line 143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp20_ = drop_handler; +#line 143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp20__target = drop_handler_target; +#line 143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + self->priv->drop_handler = _tmp20_; +#line 143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + self->priv->drop_handler_target = _tmp20__target; +#line 145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "popup-menu", (GCallback) _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu, self, 0); -#line 148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 147 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_setup_default_context_menu (self); -#line 150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-begin", (GCallback) _sidebar_tree_on_drag_begin_gtk_widget_drag_begin, self, 0); -#line 151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-end", (GCallback) _sidebar_tree_on_drag_end_gtk_widget_drag_end, self, 0); -#line 152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-motion", (GCallback) _sidebar_tree_on_drag_motion_gtk_widget_drag_motion, self, 0); #line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" source_entries = (g_free (source_entries), NULL); @@ -1027,14 +1015,14 @@ 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 1031 "Tree.c" +#line 1019 "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 1038 "Tree.c" +#line 1026 "Tree.c" } @@ -1046,69 +1034,69 @@ void sidebar_tree_icon_renderer_function (SidebarTree* self, GtkCellLayout* layo GtkCellRenderer* _tmp3_; SidebarTreeEntryWrapper* _tmp4_; SidebarEntry* _tmp5_; -#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 159 "/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" +#line 159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (GTK_IS_CELL_LAYOUT (layout)); -#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (GTK_IS_CELL_RENDERER (renderer)); -#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (GTK_IS_TREE_MODEL (model)); -#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (iter != NULL); -#line 161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = *iter; -#line 161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp0_); -#line 161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp1_; -#line 162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = wrapper; -#line 162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp2_ == NULL) { -#line 163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 1074 "Tree.c" +#line 1062 "Tree.c" } -#line 165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = renderer; -#line 165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = wrapper; -#line 165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = _tmp4_->entry; -#line 165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" 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" +#line 159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 1086 "Tree.c" +#line 1074 "Tree.c" } static void sidebar_tree_on_drag_begin (SidebarTree* self, GdkDragContext* ctx) { -#line 168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); -#line 168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (GDK_IS_DRAG_CONTEXT (ctx)); -#line 169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->is_internal_drag_in_progress = TRUE; -#line 1097 "Tree.c" +#line 1085 "Tree.c" } static void sidebar_tree_on_drag_end (SidebarTree* self, GdkDragContext* ctx) { -#line 172 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); -#line 172 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (GDK_IS_DRAG_CONTEXT (ctx)); -#line 173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 172 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->is_internal_drag_in_progress = FALSE; -#line 174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (self->priv->internal_drag_source_entry); -#line 174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->internal_drag_source_entry = NULL; -#line 1112 "Tree.c" +#line 1100 "Tree.c" } @@ -1116,29 +1104,29 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext* gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_; -#line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 176 "/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" +#line 176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE); -#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = self->priv->is_internal_drag_in_progress; -#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp1_) { -#line 1128 "Tree.c" +#line 1116 "Tree.c" SidebarEntry* _tmp2_; -#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 177 "/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" +#line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = _tmp2_ == NULL; -#line 1134 "Tree.c" +#line 1122 "Tree.c" } else { -#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = FALSE; -#line 1138 "Tree.c" +#line 1126 "Tree.c" } -#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp0_) { -#line 1142 "Tree.c" +#line 1130 "Tree.c" GtkTreePath* path = NULL; GtkTreeViewDropPosition position = 0; gint _tmp3_; @@ -1146,74 +1134,74 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext* GtkTreePath* _tmp5_ = NULL; GtkTreeViewDropPosition _tmp6_ = 0; GtkTreePath* _tmp7_; -#line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = x; -#line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = y; -#line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_get_dest_row_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp3_, _tmp4_, &_tmp5_, &_tmp6_); -#line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" path = _tmp5_; -#line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" position = _tmp6_; -#line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = path; -#line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp7_ != NULL) { -#line 1166 "Tree.c" +#line 1154 "Tree.c" SidebarTreeEntryWrapper* wrapper = NULL; GtkTreePath* _tmp8_; SidebarTreeEntryWrapper* _tmp9_; SidebarTreeEntryWrapper* _tmp10_; -#line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = path; -#line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = sidebar_tree_get_wrapper_at_path (self, _tmp8_); -#line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp9_; -#line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = wrapper; -#line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp10_ != NULL) { -#line 1181 "Tree.c" +#line 1169 "Tree.c" SidebarTreeEntryWrapper* _tmp11_; SidebarEntry* _tmp12_; SidebarEntry* _tmp13_; -#line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = wrapper; -#line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = _tmp11_->entry; -#line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = _g_object_ref0 (_tmp12_); -#line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (self->priv->internal_drag_source_entry); -#line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->internal_drag_source_entry = _tmp13_; -#line 1195 "Tree.c" +#line 1183 "Tree.c" } -#line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 1199 "Tree.c" +#line 1187 "Tree.c" } -#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 1203 "Tree.c" +#line 1191 "Tree.c" } -#line 190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1209 "Tree.c" +#line 1197 "Tree.c" } static void sidebar_tree_setup_default_context_menu (SidebarTree* self) { GError * _inner_error_ = NULL; -#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_TREE (self)); -#line 1217 "Tree.c" +#line 1205 "Tree.c" { GtkBuilder* _tmp0_; gchar* _tmp1_; @@ -1229,63 +1217,63 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) { GSimpleActionGroup* _tmp9_; GSimpleActionGroup* _tmp10_; GtkMenu* _tmp11_; -#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = self->priv->builder; -#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = resources_get_ui ("sidebar_default_context.ui"); -#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = _tmp1_; -#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_builder_add_from_resource (_tmp0_, _tmp2_, &_inner_error_); -#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (_tmp2_); -#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1245 "Tree.c" - goto __catch51_g_error; +#line 1233 "Tree.c" + goto __catch55_g_error; } -#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = self->priv->builder; -#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = gtk_builder_get_object (_tmp3_, "popup-menu"); -#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp4_) : NULL); -#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" model = _tmp5_; -#line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = model; -#line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = (GtkMenu*) gtk_menu_new_from_model (_tmp6_); -#line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_object_ref_sink (_tmp7_); -#line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (self->priv->default_context_menu); -#line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->default_context_menu = _tmp7_; -#line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = g_simple_action_group_new (); -#line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" group = _tmp8_; -#line 204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = group; -#line 204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, g_action_map_get_type (), GActionMap), SIDEBAR_TREE_entries, G_N_ELEMENTS (SIDEBAR_TREE_entries), self); -#line 205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = group; -#line 205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_widget_insert_action_group (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "sidebar", G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_action_group_get_type (), GActionGroup)); -#line 206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = self->priv->default_context_menu; -#line 206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_menu_attach_to_widget (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL); -#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (group); -#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (model); -#line 1286 "Tree.c" +#line 1274 "Tree.c" } - goto __finally51; - __catch51_g_error: + goto __finally55; + __catch55_g_error: { GError* _error_ = NULL; GError* _tmp12_; @@ -1294,44 +1282,44 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) { gchar* _tmp15_; Application* _tmp16_; Application* _tmp17_; -#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _error_ = _inner_error_; -#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _inner_error_ = NULL; -#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = _error_; -#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = _tmp12_->message; -#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = g_strdup_printf ("Error loading UI resource: %s", _tmp13_); -#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = _tmp14_; -#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" app_window_error_message (_tmp15_, NULL); -#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (_tmp15_); -#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = application_get_instance (); -#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp17_ = _tmp16_; -#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" application_panic (_tmp17_); -#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _application_unref0 (_tmp17_); -#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_error_free0 (_error_); -#line 1324 "Tree.c" +#line 1312 "Tree.c" } - __finally51: -#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + __finally55: +#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_clear_error (&_inner_error_); -#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 1335 "Tree.c" +#line 1323 "Tree.c" } } @@ -1341,21 +1329,21 @@ static gboolean sidebar_tree_has_wrapper (SidebarTree* self, SidebarEntry* entry GeeHashMap* _tmp0_; SidebarEntry* _tmp1_; gboolean _tmp2_; -#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 213 "/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" +#line 213 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE); -#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = self->priv->entry_map; -#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = entry; -#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = _tmp2_; -#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1359 "Tree.c" +#line 1347 "Tree.c" } @@ -1366,43 +1354,43 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper (SidebarTree* self, Sid SidebarEntry* _tmp1_; gpointer _tmp2_; SidebarTreeEntryWrapper* _tmp3_; -#line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 217 "/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" +#line 217 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL); -#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = self->priv->entry_map; -#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = entry; -#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = (SidebarTreeEntryWrapper*) _tmp2_; -#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = wrapper; -#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp3_ == NULL) { -#line 1386 "Tree.c" +#line 1374 "Tree.c" SidebarEntry* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; -#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = entry; -#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = sidebar_entry_to_string (_tmp4_); -#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = _tmp5_; -#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_warning ("Tree.vala:221: Entry %s not found in sidebar", _tmp6_); -#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + g_warning ("Tree.vala:220: Entry %s not found in sidebar", _tmp6_); +#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (_tmp6_); -#line 1400 "Tree.c" +#line 1388 "Tree.c" } -#line 223 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = wrapper; -#line 223 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1406 "Tree.c" +#line 1394 "Tree.c" } @@ -1416,64 +1404,64 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s GValue _tmp3_; SidebarTreeEntryWrapper* _tmp4_; SidebarTreeEntryWrapper* _tmp5_; -#line 226 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 225 "/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" +#line 225 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (iter != NULL, NULL); -#line 228 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = self->priv->store; -#line 228 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = *iter; -#line 228 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_model_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp1_, (gint) SIDEBAR_TREE_COLUMNS_WRAPPER, &_tmp2_); -#line 228 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL; -#line 228 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" val = _tmp2_; -#line 230 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = val; -#line 230 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = _g_object_ref0 (g_value_get_object (&_tmp3_)); -#line 230 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp4_; -#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 230 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = wrapper; -#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 230 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp5_ == NULL) { -#line 1444 "Tree.c" +#line 1432 "Tree.c" GtkTreeStore* _tmp6_; GtkTreeIter _tmp7_; GtkTreePath* _tmp8_; GtkTreePath* _tmp9_; gchar* _tmp10_; gchar* _tmp11_; -#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = self->priv->store; -#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = *iter; -#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_); -#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = _tmp8_; -#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = gtk_tree_path_to_string (_tmp9_); -#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = _tmp10_; -#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_message ("Tree.vala:232: No entry found in sidebar at %s", _tmp11_); -#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + g_message ("Tree.vala:231: No entry found in sidebar at %s", _tmp11_); +#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (_tmp11_); -#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (_tmp9_); -#line 1469 "Tree.c" +#line 1457 "Tree.c" } -#line 234 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = wrapper; -#line 234 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL; -#line 234 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1477 "Tree.c" +#line 1465 "Tree.c" } @@ -1486,49 +1474,49 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* s gboolean _tmp3_; GtkTreeIter _tmp7_; SidebarTreeEntryWrapper* _tmp8_; -#line 237 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 236 "/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" +#line 236 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (path != NULL, NULL); -#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = self->priv->store; -#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = path; -#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = gtk_tree_model_get_iter (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp2_, _tmp1_); -#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" iter = _tmp2_; -#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (!_tmp3_) { -#line 1504 "Tree.c" +#line 1492 "Tree.c" GtkTreePath* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; -#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = path; -#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = gtk_tree_path_to_string (_tmp4_); -#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = _tmp5_; -#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - g_message ("Tree.vala:240: No entry found in sidebar at %s", _tmp6_); -#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + g_message ("Tree.vala:239: No entry found in sidebar at %s", _tmp6_); +#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (_tmp6_); -#line 242 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = NULL; -#line 242 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1522 "Tree.c" +#line 1510 "Tree.c" } -#line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 244 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = iter; -#line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 244 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp7_); -#line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 244 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = _tmp8_; -#line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 244 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1532 "Tree.c" +#line 1520 "Tree.c" } @@ -1550,79 +1538,79 @@ gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboo GtkTreePath* _tmp12_; SidebarEntry* _tmp13_; gboolean _tmp14_; -#line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 249 "/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" +#line 249 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE); -#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = entry; -#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_tree_expand_to_entry (self, _tmp0_); -#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (!_tmp1_) { -#line 252 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 252 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1568 "Tree.c" +#line 1556 "Tree.c" } -#line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = entry; -#line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = sidebar_tree_get_wrapper (self, _tmp2_); -#line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp3_; -#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = wrapper; -#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp4_ == NULL) { -#line 256 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 256 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 256 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1586 "Tree.c" +#line 1574 "Tree.c" } -#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 257 "/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)); -#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = wrapper; -#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = sidebar_tree_entry_wrapper_get_path (_tmp6_); -#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = _tmp7_; -#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_selection_select_path (_tmp5_, _tmp8_); -#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (_tmp8_); -#line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = mask_signal; -#line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->mask_entry_selected_signal = _tmp9_; -#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = wrapper; -#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = sidebar_tree_entry_wrapper_get_path (_tmp10_); -#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = _tmp11_; -#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp12_, NULL, FALSE); -#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (_tmp12_); -#line 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->mask_entry_selected_signal = FALSE; -#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = entry; -#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = sidebar_tree_scroll_to_entry (self, _tmp13_); -#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = _tmp14_; -#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1626 "Tree.c" +#line 1614 "Tree.c" } @@ -1637,75 +1625,75 @@ gboolean sidebar_tree_is_selected (SidebarTree* self, SidebarEntry* entry) { GtkTreeSelection* _tmp4_; gboolean _tmp5_ = FALSE; SidebarTreeEntryWrapper* _tmp6_; -#line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 266 "/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" +#line 266 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE); -#line 268 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = entry; -#line 268 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_); -#line 268 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp1_; -#line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 271 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView)); -#line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 271 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = _g_object_ref0 (_tmp2_); -#line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 271 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" selection = _tmp3_; -#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = selection; -#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp4_ == NULL) { -#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (selection); -#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1669 "Tree.c" +#line 1657 "Tree.c" } -#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = wrapper; -#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp6_ != NULL) { -#line 1675 "Tree.c" +#line 1663 "Tree.c" GtkTreeSelection* _tmp7_; SidebarTreeEntryWrapper* _tmp8_; GtkTreePath* _tmp9_; GtkTreePath* _tmp10_; gboolean _tmp11_; -#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = selection; -#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = wrapper; -#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = sidebar_tree_entry_wrapper_get_path (_tmp8_); -#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = _tmp9_; -#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = gtk_tree_selection_path_is_selected (_tmp7_, _tmp10_); -#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = _tmp11_; -#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (_tmp10_); -#line 1695 "Tree.c" +#line 1683 "Tree.c" } else { -#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = FALSE; -#line 1699 "Tree.c" +#line 1687 "Tree.c" } -#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = _tmp5_; -#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (selection); -#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1709 "Tree.c" +#line 1697 "Tree.c" } @@ -1713,40 +1701,40 @@ gboolean sidebar_tree_is_any_selected (SidebarTree* self) { gboolean result = FALSE; GtkTreeSelection* _tmp0_; gint _tmp1_; -#line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 278 "/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" +#line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView)); -#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = gtk_tree_selection_count_selected_rows (_tmp0_); -#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = _tmp1_ != 0; -#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1727 "Tree.c" +#line 1715 "Tree.c" } static gpointer _gtk_tree_path_copy0 (gpointer self) { -#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return self ? gtk_tree_path_copy (self) : NULL; -#line 1734 "Tree.c" +#line 1722 "Tree.c" } static void _gtk_tree_path_free0_ (gpointer var) { -#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" (var == NULL) ? NULL : (var = (gtk_tree_path_free (var), NULL)); -#line 1741 "Tree.c" +#line 1729 "Tree.c" } static void _g_list_free__gtk_tree_path_free0_ (GList* self) { -#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_list_foreach (self, (GFunc) _gtk_tree_path_free0_, NULL); -#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_list_free (self); -#line 1750 "Tree.c" +#line 1738 "Tree.c" } @@ -1769,96 +1757,96 @@ static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) { GList* _tmp13_; guint _tmp14_; GtkTreePath* _tmp17_; -#line 283 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 282 "/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" +#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView)); -#line 285 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 285 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" selection = _tmp1_; -#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 285 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = selection; -#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 285 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp2_ == NULL) { -#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = NULL; -#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (selection); -#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (model); -#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1793 "Tree.c" +#line 1781 "Tree.c" } -#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = selection; -#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = gtk_tree_selection_get_selected_rows (_tmp3_, &_tmp4_); -#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (model); -#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = _g_object_ref0 (_tmp4_); -#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" model = _tmp6_; -#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" rows = _tmp5_; -#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = rows; -#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = g_list_length (_tmp8_); -#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp9_ == ((guint) 0)) { -#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = TRUE; -#line 1815 "Tree.c" +#line 1803 "Tree.c" } else { GList* _tmp10_; guint _tmp11_; -#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = rows; -#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = g_list_length (_tmp10_); -#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = _tmp11_ == ((guint) 1); -#line 1825 "Tree.c" +#line 1813 "Tree.c" } -#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (_tmp7_, "rows.length() == 0 || rows.length() == 1"); -#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = rows; -#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = g_list_length (_tmp13_); -#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp14_ != ((guint) 0)) { -#line 1835 "Tree.c" +#line 1823 "Tree.c" GList* _tmp15_; gconstpointer _tmp16_; -#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = rows; -#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 291 "/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" +#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = (GtkTreePath*) _tmp16_; -#line 1844 "Tree.c" +#line 1832 "Tree.c" } else { -#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = NULL; -#line 1848 "Tree.c" +#line 1836 "Tree.c" } -#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp17_ = _gtk_tree_path_copy0 (_tmp12_); -#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = _tmp17_; -#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" __g_list_free__gtk_tree_path_free0_0 (rows); -#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (selection); -#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (model); -#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1862 "Tree.c" +#line 1850 "Tree.c" } @@ -1875,90 +1863,90 @@ static gchar* sidebar_tree_get_name_for_entry (SidebarTree* self, SidebarEntry* SidebarEmphasizableEntry* _tmp6_; gboolean _tmp7_ = FALSE; SidebarEmphasizableEntry* _tmp8_; -#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 294 "/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" +#line 294 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL); -#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = entry; -#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_entry_get_sidebar_name (_tmp0_); -#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = _tmp1_; -#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = guarded_markup_escape_text (_tmp2_); -#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = _tmp3_; -#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (_tmp2_); -#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" name = _tmp4_; -#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = entry; -#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp5_) : NULL); -#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" emphasizable_entry = _tmp6_; -#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = emphasizable_entry; -#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp8_ != NULL) { -#line 1907 "Tree.c" +#line 1895 "Tree.c" SidebarEmphasizableEntry* _tmp9_; gboolean _tmp10_; -#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = emphasizable_entry; -#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 298 "/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" +#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = _tmp10_; -#line 1916 "Tree.c" +#line 1904 "Tree.c" } else { -#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = FALSE; -#line 1920 "Tree.c" +#line 1908 "Tree.c" } -#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp7_) { -#line 1924 "Tree.c" +#line 1912 "Tree.c" const gchar* _tmp11_; gchar* _tmp12_; -#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = name; -#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = g_strdup_printf ("%s", _tmp11_); -#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (name); -#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" name = _tmp12_; -#line 1935 "Tree.c" +#line 1923 "Tree.c" } -#line 302 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = name; -#line 302 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (emphasizable_entry); -#line 302 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1943 "Tree.c" +#line 1931 "Tree.c" } static gboolean sidebar_tree_real_accept_cursor_changed (SidebarTree* self) { gboolean result = FALSE; -#line 306 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 305 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; -#line 306 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 305 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 1953 "Tree.c" +#line 1941 "Tree.c" } gboolean sidebar_tree_accept_cursor_changed (SidebarTree* self) { -#line 305 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 304 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE); -#line 305 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 304 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return SIDEBAR_TREE_GET_CLASS (self)->accept_cursor_changed (self); -#line 1962 "Tree.c" +#line 1950 "Tree.c" } @@ -1972,41 +1960,41 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) { SidebarTreeEntryWrapper* _tmp3_; SidebarTreeEntryWrapper* _tmp4_; SidebarTreeEntryWrapper* _tmp5_; -#line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 308 "/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" +#line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = sidebar_tree_get_selected_path (self); -#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" path = _tmp0_; -#line 311 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = path; -#line 311 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp1_ == NULL) { -#line 312 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 311 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed != NULL) { -#line 313 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 312 "/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 1990 "Tree.c" +#line 1978 "Tree.c" } -#line 314 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 313 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 314 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 313 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 1996 "Tree.c" +#line 1984 "Tree.c" } -#line 317 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 316 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = path; -#line 317 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 316 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = sidebar_tree_get_wrapper_at_path (self, _tmp2_); -#line 317 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 316 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp3_; -#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = self->priv->selected_wrapper; -#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = wrapper; -#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp4_ != _tmp5_) { -#line 2010 "Tree.c" +#line 1998 "Tree.c" SidebarTreeEntryWrapper* old_wrapper = NULL; SidebarTreeEntryWrapper* _tmp6_; SidebarTreeEntryWrapper* _tmp7_; @@ -2016,168 +2004,168 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) { gint _tmp11_; gboolean _tmp19_ = FALSE; SidebarTreeEntryWrapper* _tmp20_; -#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = self->priv->selected_wrapper; -#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = _g_object_ref0 (_tmp6_); -#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" old_wrapper = _tmp7_; -#line 321 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = wrapper; -#line 321 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->selected_wrapper = _tmp8_; -#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = self->priv->editing_disabled; -#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp11_ == 0) { -#line 2034 "Tree.c" +#line 2022 "Tree.c" SidebarTreeEntryWrapper* _tmp12_; -#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = wrapper; -#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = _tmp12_ != NULL; -#line 2040 "Tree.c" +#line 2028 "Tree.c" } else { -#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = FALSE; -#line 2044 "Tree.c" +#line 2032 "Tree.c" } -#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp10_) { -#line 2048 "Tree.c" +#line 2036 "Tree.c" SidebarTreeEntryWrapper* _tmp13_; SidebarEntry* _tmp14_; -#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = wrapper; -#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = _tmp13_->entry; -#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, SIDEBAR_TYPE_RENAMEABLE_ENTRY); -#line 2057 "Tree.c" +#line 2045 "Tree.c" } else { -#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = FALSE; -#line 2061 "Tree.c" +#line 2049 "Tree.c" } -#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp9_) { -#line 2065 "Tree.c" +#line 2053 "Tree.c" GtkCellRendererText* _tmp15_; SidebarTreeEntryWrapper* _tmp16_; SidebarEntry* _tmp17_; gboolean _tmp18_; -#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = self->priv->text_renderer; -#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = wrapper; -#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp17_ = _tmp16_->entry; -#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _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" +#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_object_set (_tmp15_, "editable", _tmp18_, NULL); -#line 2080 "Tree.c" +#line 2068 "Tree.c" } -#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp20_ = wrapper; -#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp20_ != NULL) { -#line 2086 "Tree.c" +#line 2074 "Tree.c" gboolean _tmp21_; -#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 325 "/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" +#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp19_ = !_tmp21_; -#line 2092 "Tree.c" +#line 2080 "Tree.c" } else { -#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp19_ = FALSE; -#line 2096 "Tree.c" +#line 2084 "Tree.c" } -#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp19_) { -#line 2100 "Tree.c" +#line 2088 "Tree.c" SidebarSelectableEntry* selectable = NULL; SidebarTreeEntryWrapper* _tmp22_; SidebarEntry* _tmp23_; SidebarSelectableEntry* _tmp24_; SidebarSelectableEntry* _tmp25_; -#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp22_ = wrapper; -#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp23_ = _tmp22_->entry; -#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp23_) : NULL); -#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" selectable = _tmp24_; -#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp25_ = selectable; -#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp25_ != NULL) { -#line 2118 "Tree.c" +#line 2106 "Tree.c" gboolean _tmp26_; -#line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 328 "/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" +#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp26_) { -#line 2124 "Tree.c" +#line 2112 "Tree.c" SidebarSelectableEntry* _tmp27_; -#line 330 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp27_ = selectable; -#line 330 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL], 0, _tmp27_); -#line 2130 "Tree.c" +#line 2118 "Tree.c" } else { SidebarTreeEntryWrapper* _tmp28_; SidebarEntry* _tmp29_; -#line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp28_ = old_wrapper; -#line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp29_ = _tmp28_->entry; -#line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_place_cursor (self, _tmp29_, TRUE); -#line 2140 "Tree.c" +#line 2128 "Tree.c" } } -#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (selectable); -#line 2145 "Tree.c" +#line 2133 "Tree.c" } -#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (old_wrapper); -#line 2149 "Tree.c" +#line 2137 "Tree.c" } -#line 338 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 337 "/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" +#line 338 "/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 2155 "Tree.c" +#line 2143 "Tree.c" } -#line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 308 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 308 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 2161 "Tree.c" +#line 2149 "Tree.c" } void sidebar_tree_disable_editing (SidebarTree* self) { gint _tmp0_; -#line 342 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 341 "/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" +#line 342 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = self->priv->editing_disabled; -#line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 342 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->editing_disabled = _tmp0_ + 1; -#line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 342 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp0_ == 0) { -#line 2175 "Tree.c" +#line 2163 "Tree.c" GtkCellRendererText* _tmp1_; -#line 344 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = self->priv->text_renderer; -#line 344 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_object_set (_tmp1_, "editable", FALSE, NULL); -#line 2181 "Tree.c" +#line 2169 "Tree.c" } } @@ -2188,141 +2176,141 @@ void sidebar_tree_enable_editing (SidebarTree* self) { gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; GtkTreePath* _tmp3_; -#line 347 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 346 "/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" +#line 347 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = sidebar_tree_get_selected_path (self); -#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 347 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" path = _tmp0_; -#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = path; -#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp3_ != NULL) { -#line 2202 "Tree.c" +#line 2190 "Tree.c" gint _tmp4_; -#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = self->priv->editing_disabled; -#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = _tmp4_ > 0; -#line 2208 "Tree.c" +#line 2196 "Tree.c" } else { -#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = FALSE; -#line 2212 "Tree.c" +#line 2200 "Tree.c" } -#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp2_) { -#line 2216 "Tree.c" +#line 2204 "Tree.c" gint _tmp5_; gint _tmp6_; -#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = self->priv->editing_disabled; -#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->editing_disabled = _tmp5_ - 1; -#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = self->priv->editing_disabled; -#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = _tmp6_ == 0; -#line 2227 "Tree.c" +#line 2215 "Tree.c" } else { -#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = FALSE; -#line 2231 "Tree.c" +#line 2219 "Tree.c" } -#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp1_) { -#line 2235 "Tree.c" +#line 2223 "Tree.c" SidebarTreeEntryWrapper* wrapper = NULL; GtkTreePath* _tmp7_; SidebarTreeEntryWrapper* _tmp8_; gboolean _tmp9_ = FALSE; SidebarTreeEntryWrapper* _tmp10_; -#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = path; -#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = sidebar_tree_get_wrapper_at_path (self, _tmp7_); -#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp8_; -#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = wrapper; -#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp10_ != NULL) { -#line 2251 "Tree.c" +#line 2239 "Tree.c" SidebarTreeEntryWrapper* _tmp11_; SidebarEntry* _tmp12_; -#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = wrapper; -#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = _tmp11_->entry; -#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, SIDEBAR_TYPE_RENAMEABLE_ENTRY); -#line 2260 "Tree.c" +#line 2248 "Tree.c" } else { -#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = FALSE; -#line 2264 "Tree.c" +#line 2252 "Tree.c" } -#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp9_) { -#line 2268 "Tree.c" +#line 2256 "Tree.c" GtkCellRendererText* _tmp13_; SidebarTreeEntryWrapper* _tmp14_; SidebarEntry* _tmp15_; gboolean _tmp16_; -#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = self->priv->text_renderer; -#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = wrapper; -#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = _tmp14_->entry; -#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _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" +#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_object_set (_tmp13_, "editable", _tmp16_, NULL); -#line 2283 "Tree.c" +#line 2271 "Tree.c" } -#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 2287 "Tree.c" +#line 2275 "Tree.c" } -#line 347 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 346 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 2291 "Tree.c" +#line 2279 "Tree.c" } void sidebar_tree_toggle_branch_expansion (SidebarTree* self, GtkTreePath* path, gboolean expand_all) { GtkTreePath* _tmp0_; gboolean _tmp1_; -#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 356 "/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" +#line 356 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (path != NULL); -#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->expander_called_manually = TRUE; -#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = path; -#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _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" +#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp1_) { -#line 2310 "Tree.c" +#line 2298 "Tree.c" GtkTreePath* _tmp2_; -#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = path; -#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 359 "/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 2316 "Tree.c" +#line 2304 "Tree.c" } else { GtkTreePath* _tmp3_; gboolean _tmp4_; -#line 362 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 361 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = path; -#line 362 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 361 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = expand_all; -#line 362 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 361 "/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 2326 "Tree.c" +#line 2314 "Tree.c" } } @@ -2336,47 +2324,47 @@ gboolean sidebar_tree_expand_to_entry (SidebarTree* self, SidebarEntry* entry) { SidebarTreeEntryWrapper* _tmp3_; GtkTreePath* _tmp4_; GtkTreePath* _tmp5_; -#line 365 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 364 "/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" +#line 364 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE); -#line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 365 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->expander_called_manually = TRUE; -#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = entry; -#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_); -#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp1_; -#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = wrapper; -#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp2_ == NULL) { -#line 369 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 369 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 369 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 2362 "Tree.c" +#line 2350 "Tree.c" } -#line 371 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = wrapper; -#line 371 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_); -#line 371 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = _tmp4_; -#line 371 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_expand_to_path (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp5_); -#line 371 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (_tmp5_); -#line 373 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; -#line 373 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 373 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 2380 "Tree.c" +#line 2368 "Tree.c" } @@ -2390,37 +2378,37 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry) GtkTreePath* _tmp4_; GtkTreeIter iter = {0}; GtkTreePath* _tmp13_; -#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 375 "/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" +#line 375 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); -#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->expander_called_manually = TRUE; -#line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = entry; -#line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_); -#line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp1_; -#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = wrapper; -#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp2_ == NULL) { -#line 380 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 380 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 2414 "Tree.c" +#line 2402 "Tree.c" } -#line 382 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 381 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = wrapper; -#line 382 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 381 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_); -#line 382 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 381 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" path = _tmp4_; -#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" while (TRUE) { -#line 2424 "Tree.c" +#line 2412 "Tree.c" GtkTreeStore* _tmp5_; GtkTreePath* _tmp6_; GtkTreeIter _tmp7_ = {0}; @@ -2429,89 +2417,89 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry) GtkTreeIter _tmp10_; gboolean _tmp11_; GtkTreePath* _tmp12_; -#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = self->priv->store; -#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = path; -#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = gtk_tree_model_get_iter (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_, _tmp6_); -#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" iter = _tmp7_; -#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (!_tmp8_) { -#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" break; -#line 2445 "Tree.c" +#line 2433 "Tree.c" } -#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = self->priv->store; -#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = iter; -#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = gtk_tree_model_iter_has_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp10_); -#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (!_tmp11_) { -#line 387 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" break; -#line 2457 "Tree.c" +#line 2445 "Tree.c" } -#line 389 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 388 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = path; -#line 389 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 388 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_path_down (_tmp12_); -#line 2463 "Tree.c" +#line 2451 "Tree.c" } -#line 392 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 391 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = path; -#line 392 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 391 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_expand_to_path (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp13_); -#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 375 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 375 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 2473 "Tree.c" +#line 2461 "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" +#line 409 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_branch_entry_added ((SidebarTree*) self, _sender, entry); -#line 2480 "Tree.c" +#line 2468 "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" +#line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_branch_entry_removed ((SidebarTree*) self, _sender, entry); -#line 2487 "Tree.c" +#line 2475 "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" +#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_branch_entry_moved ((SidebarTree*) self, _sender, entry); -#line 2494 "Tree.c" +#line 2482 "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" +#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_branch_entry_reparented ((SidebarTree*) self, _sender, entry, old_parent); -#line 2501 "Tree.c" +#line 2489 "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" +#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_branch_children_reordered ((SidebarTree*) self, _sender, entry); -#line 2508 "Tree.c" +#line 2496 "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" +#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_show_branch ((SidebarTree*) self, _sender, show); -#line 2515 "Tree.c" +#line 2503 "Tree.c" } @@ -2532,139 +2520,139 @@ void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position SidebarBranch* _tmp24_; SidebarBranch* _tmp25_; SidebarBranch* _tmp26_; -#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 394 "/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" +#line 394 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (branch)); -#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 394 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = position; -#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 394 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_return_if_fail (_tmp0_ >= 0, "position >= 0"); -#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = self->priv->branches; -#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = branch; -#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_); -#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (!_tmp3_, "!branches.has_key(branch)"); -#line 398 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = self->priv->branches; -#line 398 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = branch; -#line 398 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = position; -#line 398 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, (gpointer) ((gintptr) _tmp6_)); -#line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = branch; -#line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = sidebar_branch_get_show_branch (_tmp7_); -#line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp8_) { -#line 2566 "Tree.c" +#line 2554 "Tree.c" SidebarBranch* _tmp9_; SidebarBranch* _tmp10_; gboolean _tmp11_; SidebarBranch* _tmp15_; gboolean _tmp16_; -#line 401 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = branch; -#line 401 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_associate_branch (self, _tmp9_); -#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 402 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = branch; -#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 402 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = sidebar_branch_is_startup_expand_to_first_child (_tmp10_); -#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 402 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp11_) { -#line 2582 "Tree.c" +#line 2570 "Tree.c" SidebarBranch* _tmp12_; SidebarEntry* _tmp13_; SidebarEntry* _tmp14_; -#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = branch; -#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = sidebar_branch_get_root (_tmp12_); -#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = _tmp13_; -#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_expand_to_first_child (self, _tmp14_); -#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (_tmp14_); -#line 2596 "Tree.c" +#line 2584 "Tree.c" } -#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = branch; -#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = sidebar_branch_is_startup_open_grouping (_tmp15_); -#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp16_) { -#line 2604 "Tree.c" +#line 2592 "Tree.c" SidebarBranch* _tmp17_; SidebarEntry* _tmp18_; SidebarEntry* _tmp19_; -#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp17_ = branch; -#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp18_ = sidebar_branch_get_root (_tmp17_); -#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp19_ = _tmp18_; -#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_expand_to_entry (self, _tmp19_); -#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (_tmp19_); -#line 2618 "Tree.c" +#line 2606 "Tree.c" } } -#line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 409 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp20_ = branch; -#line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 409 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_connect_object (_tmp20_, "entry-added", (GCallback) _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added, self, 0); -#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp21_ = branch; -#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_connect_object (_tmp21_, "entry-removed", (GCallback) _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed, self, 0); -#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp22_ = branch; -#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_connect_object (_tmp22_, "entry-moved", (GCallback) _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved, self, 0); -#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp23_ = branch; -#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_connect_object (_tmp23_, "entry-reparented", (GCallback) _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented, self, 0); -#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp24_ = branch; -#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_connect_object (_tmp24_, "children-reordered", (GCallback) _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered, self, 0); -#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp25_ = branch; -#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_connect_object (_tmp25_, "show-branch", (GCallback) _sidebar_tree_on_show_branch_sidebar_branch_show_branch, self, 0); -#line 417 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 416 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp26_ = branch; -#line 417 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 416 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_ADDED_SIGNAL], 0, _tmp26_); -#line 2649 "Tree.c" +#line 2637 "Tree.c" } static GtkTreeIter* _gtk_tree_iter_dup (GtkTreeIter* self) { GtkTreeIter* dup; -#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" dup = g_new0 (GtkTreeIter, 1); -#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" memcpy (dup, self, sizeof (GtkTreeIter)); -#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return dup; -#line 2661 "Tree.c" +#line 2649 "Tree.c" } static gpointer __gtk_tree_iter_dup0 (gpointer self) { -#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return self ? _gtk_tree_iter_dup (self) : NULL; -#line 2668 "Tree.c" +#line 2656 "Tree.c" } @@ -2703,39 +2691,39 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra SidebarEntry* _tmp46_; GtkTreeIter* _tmp47_; GtkTreeIter _tmp48_; -#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 420 "/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" +#line 420 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (branch)); -#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = self->priv->branches; -#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = branch; -#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (_tmp2_, "branches.has_key(branch)"); -#line 424 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = self->priv->branches; -#line 424 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = branch; -#line 424 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); -#line 424 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" position = (gint) ((gintptr) _tmp5_); -#line 426 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 425 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" insertion_iter = NULL; -#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 429 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = self->priv->store; -#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 429 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = gtk_tree_model_get_iter_first (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_); -#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 429 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" iter = _tmp7_; -#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 429 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" found = _tmp8_; -#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" while (TRUE) { -#line 2739 "Tree.c" +#line 2727 "Tree.c" gboolean _tmp9_; SidebarTreeRootWrapper* root_wrapper = NULL; GtkTreeIter _tmp10_; @@ -2747,154 +2735,154 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra gint _tmp16_; GtkTreeStore* _tmp22_; gboolean _tmp23_; -#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = found; -#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (!_tmp9_) { -#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" break; -#line 2757 "Tree.c" +#line 2745 "Tree.c" } -#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = iter; -#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp10_); -#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER) ? ((SidebarTreeRootWrapper*) _tmp11_) : NULL; -#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp12_ == NULL) { -#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (_tmp11_); -#line 2769 "Tree.c" +#line 2757 "Tree.c" } -#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" root_wrapper = _tmp12_; -#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = root_wrapper; -#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (_tmp13_ != NULL, "root_wrapper != null"); -#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = position; -#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = root_wrapper; -#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = _tmp15_->root_position; -#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp14_ < _tmp16_) { -#line 2785 "Tree.c" +#line 2773 "Tree.c" GtkTreeStore* _tmp17_; GtkTreeIter _tmp18_; GtkTreeIter _tmp19_ = {0}; GtkTreeIter _tmp20_; GtkTreeIter* _tmp21_; -#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp17_ = self->priv->store; -#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp18_ = iter; -#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_store_insert_before (_tmp17_, &_tmp19_, NULL, &_tmp18_); -#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (insertion_iter); -#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp20_ = _tmp19_; -#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp21_ = __gtk_tree_iter_dup0 (&_tmp20_); -#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" insertion_iter = _tmp21_; -#line 438 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (root_wrapper); -#line 438 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" break; -#line 2809 "Tree.c" +#line 2797 "Tree.c" } -#line 441 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 440 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp22_ = self->priv->store; -#line 441 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 440 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp23_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &iter); -#line 441 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 440 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" found = _tmp23_; -#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (root_wrapper); -#line 2819 "Tree.c" +#line 2807 "Tree.c" } -#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 444 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp24_ = insertion_iter; -#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 444 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp24_ == NULL) { -#line 2825 "Tree.c" +#line 2813 "Tree.c" GtkTreeStore* _tmp25_; GtkTreeIter _tmp26_ = {0}; GtkTreeIter _tmp27_; GtkTreeIter* _tmp28_; -#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp25_ = self->priv->store; -#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_store_append (_tmp25_, &_tmp26_, NULL); -#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (insertion_iter); -#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp27_ = _tmp26_; -#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp28_ = __gtk_tree_iter_dup0 (&_tmp27_); -#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" insertion_iter = _tmp28_; -#line 2842 "Tree.c" +#line 2830 "Tree.c" } -#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp29_ = insertion_iter; -#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp30_ = self->priv->store; -#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp31_ = branch; -#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp32_ = sidebar_branch_get_root (_tmp31_); -#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp33_ = _tmp32_; -#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp34_ = self->priv->store; -#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp35_ = insertion_iter; -#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp36_ = *_tmp35_; -#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp37_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp36_); -#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp38_ = _tmp37_; -#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp39_ = position; -#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp40_ = sidebar_tree_root_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GTK_TYPE_TREE_MODEL, GtkTreeModel), _tmp33_, _tmp38_, _tmp39_); -#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp41_ = _tmp40_; -#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp42_ = *_tmp29_; -#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_associate_wrapper (self, &_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, SidebarTreeEntryWrapper)); -#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (_tmp41_); -#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (_tmp38_); -#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (_tmp33_); -#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp43_ = branch; -#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp44_ = branch; -#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp45_ = sidebar_branch_get_root (_tmp44_); -#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp46_ = _tmp45_; -#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp47_ = insertion_iter; -#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp48_ = *_tmp47_; -#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_associate_children (self, _tmp43_, _tmp46_, &_tmp48_); -#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (_tmp46_); -#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 420 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (insertion_iter); -#line 2898 "Tree.c" +#line 2886 "Tree.c" } @@ -2904,31 +2892,31 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b SidebarEntry* _tmp1_; GeeList* _tmp2_; GeeList* _tmp3_; -#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 455 "/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" +#line 455 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (branch)); -#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 455 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (parent)); -#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 455 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (parent_iter != NULL); -#line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = branch; -#line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = parent; -#line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = sidebar_branch_get_children (_tmp0_, _tmp1_); -#line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" children = _tmp2_; -#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = children; -#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp3_ == NULL) { -#line 460 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (children); -#line 460 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 2932 "Tree.c" +#line 2920 "Tree.c" } { GeeList* _child_list = NULL; @@ -2939,25 +2927,25 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b gint _tmp7_; gint _tmp8_; gint _child_index = 0; -#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = children; -#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = _g_object_ref0 (_tmp4_); -#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _child_list = _tmp5_; -#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = _child_list; -#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = _tmp7_; -#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _child_size = _tmp8_; -#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _child_index = -1; -#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" while (TRUE) { -#line 2961 "Tree.c" +#line 2949 "Tree.c" gint _tmp9_; gint _tmp10_; gint _tmp11_; @@ -2974,61 +2962,61 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b SidebarBranch* _tmp20_; SidebarEntry* _tmp21_; GtkTreeIter _tmp22_; -#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = _child_index; -#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _child_index = _tmp9_ + 1; -#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = _child_index; -#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = _child_size; -#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (!(_tmp10_ < _tmp11_)) { -#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" break; -#line 2990 "Tree.c" +#line 2978 "Tree.c" } -#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = _child_list; -#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = _child_index; -#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = gee_list_get (_tmp12_, _tmp13_); -#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" child = (SidebarEntry*) _tmp14_; -#line 464 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = self->priv->store; -#line 464 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = *parent_iter; -#line 464 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_store_append (_tmp15_, &_tmp17_, &_tmp16_); -#line 464 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" append_iter = _tmp17_; -#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp18_ = append_iter; -#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp19_ = child; -#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_associate_entry (self, &_tmp18_, _tmp19_); -#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp20_ = branch; -#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp21_ = child; -#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp22_ = append_iter; -#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_associate_children (self, _tmp20_, _tmp21_, &_tmp22_); -#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (child); -#line 3024 "Tree.c" +#line 3012 "Tree.c" } -#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (_child_list); -#line 3028 "Tree.c" +#line 3016 "Tree.c" } -#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 455 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (children); -#line 3032 "Tree.c" +#line 3020 "Tree.c" } @@ -3042,79 +3030,79 @@ static void sidebar_tree_associate_entry (SidebarTree* self, GtkTreeIter* assoc_ GtkTreePath* _tmp6_; SidebarTreeEntryWrapper* _tmp7_; SidebarTreeEntryWrapper* _tmp8_; -#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 470 "/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" +#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (assoc_iter != NULL); -#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); -#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = *assoc_iter; -#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = self->priv->store; -#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = entry; -#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = self->priv->store; -#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = *assoc_iter; -#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp4_); -#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = _tmp5_; -#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = sidebar_tree_entry_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_TREE_MODEL, GtkTreeModel), _tmp2_, _tmp6_); -#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = _tmp7_; -#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_associate_wrapper (self, &_tmp0_, _tmp8_); -#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (_tmp8_); -#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (_tmp6_); -#line 3076 "Tree.c" +#line 3064 "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" +#line 485 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_sidebar_tooltip_changed ((SidebarTree*) self, _sender, tooltip); -#line 3083 "Tree.c" +#line 3071 "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" +#line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_sidebar_icon_changed ((SidebarTree*) self, _sender, icon); -#line 3090 "Tree.c" +#line 3078 "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" +#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_sidebar_page_created ((SidebarTree*) self, _sender, page); -#line 3097 "Tree.c" +#line 3085 "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" +#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_sidebar_destroying_page ((SidebarTree*) self, _sender, page); -#line 3104 "Tree.c" +#line 3092 "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" +#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_is_emphasized_changed ((SidebarTree*) self, _sender, emphasized); -#line 3111 "Tree.c" +#line 3099 "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" +#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_sidebar_name_changed ((SidebarTree*) self, _sender, name); -#line 3118 "Tree.c" +#line 3106 "Tree.c" } @@ -3160,162 +3148,162 @@ static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* asso SidebarRenameableEntry* _tmp37_; SidebarRenameableEntry* _tmp38_; SidebarEntry* _tmp40_; -#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 474 "/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" +#line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (assoc_iter != NULL); -#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (wrapper)); -#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = wrapper; -#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = _tmp0_->entry; -#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" entry = _tmp2_; -#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = self->priv->entry_map; -#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = entry; -#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_); -#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (!_tmp5_, "!entry_map.has_key(entry)"); -#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = self->priv->entry_map; -#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = entry; -#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = wrapper; -#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_, _tmp8_); -#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = self->priv->store; -#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = *assoc_iter; -#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = entry; -#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = sidebar_tree_get_name_for_entry (self, _tmp11_); -#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = _tmp12_; -#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_store_set (_tmp9_, &_tmp10_, SIDEBAR_TREE_COLUMNS_NAME, _tmp13_, -1); -#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (_tmp13_); -#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = self->priv->store; -#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = *assoc_iter; -#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = entry; -#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp17_ = sidebar_entry_get_sidebar_tooltip (_tmp16_); -#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp18_ = _tmp17_; -#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp19_ = guarded_markup_escape_text (_tmp18_); -#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp20_ = _tmp19_; -#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_store_set (_tmp14_, &_tmp15_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp20_, -1); -#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (_tmp20_); -#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (_tmp18_); -#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp21_ = self->priv->store; -#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp22_ = *assoc_iter; -#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp23_ = wrapper; -#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_store_set (_tmp21_, &_tmp22_, SIDEBAR_TREE_COLUMNS_WRAPPER, _tmp23_, -1); -#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp24_ = *assoc_iter; -#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_load_entry_icons (self, &_tmp24_); -#line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 485 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp25_ = entry; -#line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 485 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_connect_object (_tmp25_, "sidebar-tooltip-changed", (GCallback) _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed, self, 0); -#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp26_ = entry; -#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_connect_object (_tmp26_, "sidebar-icon-changed", (GCallback) _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed, self, 0); -#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 488 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp27_ = entry; -#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 488 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp27_) : NULL); -#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 488 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" pageable = _tmp28_; -#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp29_ = pageable; -#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp29_ != NULL) { -#line 3258 "Tree.c" +#line 3246 "Tree.c" SidebarPageRepresentative* _tmp30_; SidebarPageRepresentative* _tmp31_; -#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp30_ = pageable; -#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_connect_object (_tmp30_, "page-created", (GCallback) _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created, self, 0); -#line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp31_ = pageable; -#line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 491 "/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 3269 "Tree.c" +#line 3257 "Tree.c" } -#line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 494 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp32_ = entry; -#line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 494 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp32_) : NULL); -#line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 494 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" emphasizable = _tmp33_; -#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp34_ = emphasizable; -#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp34_ != NULL) { -#line 3281 "Tree.c" +#line 3269 "Tree.c" SidebarEmphasizableEntry* _tmp35_; -#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp35_ = emphasizable; -#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 496 "/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 3287 "Tree.c" +#line 3275 "Tree.c" } -#line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp36_ = entry; -#line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp36_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp36_) : NULL); -#line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" renameable = _tmp37_; -#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp38_ = renameable; -#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp38_ != NULL) { -#line 3299 "Tree.c" +#line 3287 "Tree.c" SidebarRenameableEntry* _tmp39_; -#line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp39_ = renameable; -#line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 500 "/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 3305 "Tree.c" +#line 3293 "Tree.c" } -#line 503 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 502 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp40_ = entry; -#line 503 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 502 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_entry_grafted (_tmp40_, self); -#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (renameable); -#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (emphasizable); -#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (pageable); -#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (entry); -#line 3319 "Tree.c" +#line 3307 "Tree.c" } @@ -3350,97 +3338,97 @@ static SidebarTreeEntryWrapper* sidebar_tree_reparent_wrapper (SidebarTree* self GtkTreeStore* _tmp23_; GtkTreeIter _tmp24_; GtkTreeIter _tmp25_; -#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 505 "/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" +#line 505 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (new_iter != NULL, NULL); -#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 505 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (current_wrapper), NULL); -#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = current_wrapper; -#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = _tmp0_->entry; -#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" entry = _tmp2_; -#line 509 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = self->priv->entry_map; -#line 509 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, NULL); -#line 509 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" removed = _tmp4_; -#line 510 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 509 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (removed, "removed"); -#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = self->priv->store; -#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = self->priv->store; -#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = *new_iter; -#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_); -#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = _tmp8_; -#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = sidebar_tree_entry_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_TREE_MODEL, GtkTreeModel), entry, _tmp9_); -#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = _tmp10_; -#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (_tmp9_); -#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" new_wrapper = _tmp11_; -#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = self->priv->entry_map; -#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, new_wrapper); -#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = self->priv->store; -#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = *new_iter; -#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = sidebar_tree_get_name_for_entry (self, entry); -#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = _tmp15_; -#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_store_set (_tmp13_, &_tmp14_, SIDEBAR_TREE_COLUMNS_NAME, _tmp16_, -1); -#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (_tmp16_); -#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp17_ = self->priv->store; -#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp18_ = *new_iter; -#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp19_ = sidebar_entry_get_sidebar_tooltip (entry); -#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp20_ = _tmp19_; -#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp21_ = guarded_markup_escape_text (_tmp20_); -#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp22_ = _tmp21_; -#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_store_set (_tmp17_, &_tmp18_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp22_, -1); -#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (_tmp22_); -#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (_tmp20_); -#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp23_ = self->priv->store; -#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp24_ = *new_iter; -#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_store_set (_tmp23_, &_tmp24_, SIDEBAR_TREE_COLUMNS_WRAPPER, new_wrapper, -1); -#line 518 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp25_ = *new_iter; -#line 518 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_load_entry_icons (self, &_tmp25_); -#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 519 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = new_wrapper; -#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 519 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (entry); -#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 519 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 3444 "Tree.c" +#line 3432 "Tree.c" } @@ -3470,91 +3458,91 @@ void sidebar_tree_prune (SidebarTree* self, SidebarBranch* branch) { SidebarBranch* _tmp22_; gboolean _tmp23_; SidebarBranch* _tmp24_; -#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 522 "/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" +#line 522 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (branch)); -#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = self->priv->branches; -#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = branch; -#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (_tmp2_, "branches.has_key(branch)"); -#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = branch; -#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = sidebar_branch_get_root (_tmp3_); -#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = _tmp4_; -#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = sidebar_tree_has_wrapper (self, _tmp5_); -#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = _tmp6_; -#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (_tmp5_); -#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp7_) { -#line 3500 "Tree.c" +#line 3488 "Tree.c" SidebarBranch* _tmp8_; -#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = branch; -#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_disassociate_branch (self, _tmp8_); -#line 3506 "Tree.c" +#line 3494 "Tree.c" } -#line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 528 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = branch; -#line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 528 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_parse_name ("entry-added", SIDEBAR_TYPE_BRANCH, &_tmp10_, NULL, FALSE); -#line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 528 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added, self); -#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = branch; -#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_parse_name ("entry-removed", SIDEBAR_TYPE_BRANCH, &_tmp12_, NULL, FALSE); -#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed, self); -#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = branch; -#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_parse_name ("entry-moved", SIDEBAR_TYPE_BRANCH, &_tmp14_, NULL, FALSE); -#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved, self); -#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = branch; -#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_parse_name ("entry-reparented", SIDEBAR_TYPE_BRANCH, &_tmp16_, NULL, FALSE); -#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented, self); -#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp17_ = branch; -#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_parse_name ("children-reordered", SIDEBAR_TYPE_BRANCH, &_tmp18_, NULL, FALSE); -#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_handlers_disconnect_matched (_tmp17_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered, self); -#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp19_ = branch; -#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_parse_name ("show-branch", SIDEBAR_TYPE_BRANCH, &_tmp20_, NULL, FALSE); -#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_handlers_disconnect_matched (_tmp19_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _sidebar_tree_on_show_branch_sidebar_branch_show_branch, self); -#line 536 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp21_ = self->priv->branches; -#line 536 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp22_ = branch; -#line 536 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp23_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, NULL); -#line 536 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" removed = _tmp23_; -#line 537 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 536 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (removed, "removed"); -#line 539 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 538 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp24_ = branch; -#line 539 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 538 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_REMOVED_SIGNAL], 0, _tmp24_); -#line 3558 "Tree.c" +#line 3546 "Tree.c" } @@ -3566,39 +3554,39 @@ static void sidebar_tree_disassociate_branch (SidebarTree* self, SidebarBranch* SidebarTreeEntryWrapper* _tmp3_; SidebarTreeRootWrapper* _tmp4_; SidebarTreeRootWrapper* _tmp5_; -#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 541 "/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" +#line 541 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (branch)); -#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = branch; -#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_branch_get_root (_tmp0_); -#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = _tmp1_; -#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = sidebar_tree_get_wrapper (self, _tmp2_); -#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER) ? ((SidebarTreeRootWrapper*) _tmp3_) : NULL; -#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp4_ == NULL) { -#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (_tmp3_); -#line 3588 "Tree.c" +#line 3576 "Tree.c" } -#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = _tmp4_; -#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (_tmp2_); -#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" root_wrapper = _tmp5_; -#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (root_wrapper != NULL, "root_wrapper != null"); -#line 546 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 545 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" 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" +#line 541 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (root_wrapper); -#line 3602 "Tree.c" +#line 3590 "Tree.c" } @@ -3610,54 +3598,54 @@ static void sidebar_tree_disassociate_wrapper_and_signal (SidebarTree* self, Sid SidebarTreeEntryWrapper* _tmp3_; gboolean _tmp4_; gboolean _tmp5_; -#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 550 "/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" +#line 550 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (wrapper)); -#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = wrapper; -#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = _tmp0_->entry; -#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = sidebar_tree_is_selected (self, _tmp1_); -#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" selected = _tmp2_; -#line 554 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = wrapper; -#line 554 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = only_children; -#line 554 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_disassociate_wrapper (self, _tmp3_, _tmp4_); -#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 555 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = selected; -#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 555 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp5_) { -#line 3636 "Tree.c" +#line 3624 "Tree.c" SidebarSelectableEntry* selectable = NULL; SidebarTreeEntryWrapper* _tmp6_; SidebarEntry* _tmp7_; SidebarSelectableEntry* _tmp8_; SidebarSelectableEntry* _tmp9_; SidebarSelectableEntry* _tmp10_; -#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = wrapper; -#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = _tmp6_->entry; -#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp7_) : NULL); -#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" selectable = _tmp8_; -#line 558 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = selectable; -#line 558 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (_tmp9_ != NULL, "selectable != null"); -#line 560 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 559 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = selectable; -#line 560 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 559 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" 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" +#line 555 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (selectable); -#line 3661 "Tree.c" +#line 3649 "Tree.c" } } @@ -3705,29 +3693,29 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt SidebarEntry* _tmp58_; gboolean _tmp59_; gboolean _tmp60_; -#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 563 "/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" +#line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (wrapper)); -#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = gee_array_list_new (SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); -#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" children = _tmp0_; -#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = self->priv->store; -#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = wrapper; -#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_entry_wrapper_get_iter (_tmp2_, &_tmp3_); -#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = gtk_tree_model_iter_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp4_, &_tmp3_); -#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" child_iter = _tmp4_; -#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" found = _tmp5_; -#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" while (TRUE) { -#line 3731 "Tree.c" +#line 3719 "Tree.c" gboolean _tmp6_; SidebarTreeEntryWrapper* child_wrapper = NULL; GtkTreeIter _tmp7_; @@ -3737,39 +3725,39 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt SidebarTreeEntryWrapper* _tmp11_; GtkTreeStore* _tmp12_; gboolean _tmp13_; -#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = found; -#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (!_tmp6_) { -#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" break; -#line 3747 "Tree.c" +#line 3735 "Tree.c" } -#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = child_iter; -#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp7_); -#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" child_wrapper = _tmp8_; -#line 571 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = child_wrapper; -#line 571 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (_tmp9_ != NULL, "child_wrapper != null"); -#line 573 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = children; -#line 573 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = child_wrapper; -#line 573 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_); -#line 575 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 574 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = self->priv->store; -#line 575 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 574 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &child_iter); -#line 575 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 574 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" found = _tmp13_; -#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (child_wrapper); -#line 3773 "Tree.c" +#line 3761 "Tree.c" } { GeeArrayList* _child_wrapper_list = NULL; @@ -3780,25 +3768,25 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt gint _tmp17_; gint _tmp18_; gint _child_wrapper_index = 0; -#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = children; -#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = _g_object_ref0 (_tmp14_); -#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _child_wrapper_list = _tmp15_; -#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = _child_wrapper_list; -#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp18_ = _tmp17_; -#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _child_wrapper_size = _tmp18_; -#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _child_wrapper_index = -1; -#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" while (TRUE) { -#line 3802 "Tree.c" +#line 3790 "Tree.c" gint _tmp19_; gint _tmp20_; gint _tmp21_; @@ -3807,188 +3795,188 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt gint _tmp23_; gpointer _tmp24_; SidebarTreeEntryWrapper* _tmp25_; -#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp19_ = _child_wrapper_index; -#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _child_wrapper_index = _tmp19_ + 1; -#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp20_ = _child_wrapper_index; -#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp21_ = _child_wrapper_size; -#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (!(_tmp20_ < _tmp21_)) { -#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" break; -#line 3823 "Tree.c" +#line 3811 "Tree.c" } -#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp22_ = _child_wrapper_list; -#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp23_ = _child_wrapper_index; -#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp24_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp23_); -#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" child_wrapper = (SidebarTreeEntryWrapper*) _tmp24_; -#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp25_ = child_wrapper; -#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_disassociate_wrapper (self, _tmp25_, FALSE); #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + sidebar_tree_disassociate_wrapper (self, _tmp25_, FALSE); +#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (child_wrapper); -#line 3839 "Tree.c" +#line 3827 "Tree.c" } -#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (_child_wrapper_list); -#line 3843 "Tree.c" +#line 3831 "Tree.c" } -#line 581 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 580 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp26_ = only_children; -#line 581 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 580 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp26_) { -#line 582 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 581 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (children); -#line 582 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 581 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 3853 "Tree.c" +#line 3841 "Tree.c" } -#line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 583 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp27_ = wrapper; -#line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 583 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_entry_wrapper_get_iter (_tmp27_, &_tmp28_); -#line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 583 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" iter = _tmp28_; -#line 585 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp29_ = self->priv->store; -#line 585 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_store_remove (_tmp29_, &iter); -#line 587 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp30_ = self->priv->selected_wrapper; -#line 587 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp31_ = wrapper; -#line 587 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp30_ == _tmp31_) { -#line 588 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 587 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->selected_wrapper = NULL; -#line 3873 "Tree.c" +#line 3861 "Tree.c" } -#line 590 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 589 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp32_ = wrapper; -#line 590 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 589 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp33_ = _tmp32_->entry; -#line 590 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 589 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp34_ = _g_object_ref0 (_tmp33_); -#line 590 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 589 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" entry = _tmp34_; -#line 592 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 591 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp35_ = entry; -#line 592 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 591 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_entry_pruned (_tmp35_, self); -#line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 593 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp36_ = entry; -#line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 593 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_parse_name ("sidebar-tooltip-changed", SIDEBAR_TYPE_ENTRY, &_tmp37_, NULL, FALSE); -#line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 593 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_handlers_disconnect_matched (_tmp36_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp37_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed, self); -#line 595 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp38_ = entry; -#line 595 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_parse_name ("sidebar-icon-changed", SIDEBAR_TYPE_ENTRY, &_tmp39_, NULL, FALSE); -#line 595 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_handlers_disconnect_matched (_tmp38_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp39_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed, self); -#line 597 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp40_ = entry; -#line 597 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp40_) : NULL); -#line 597 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" pageable = _tmp41_; -#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 597 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp42_ = pageable; -#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 597 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp42_ != NULL) { -#line 3909 "Tree.c" +#line 3897 "Tree.c" SidebarPageRepresentative* _tmp43_; guint _tmp44_; SidebarPageRepresentative* _tmp45_; guint _tmp46_; -#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp43_ = pageable; -#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_parse_name ("page-created", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, &_tmp44_, NULL, FALSE); -#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_handlers_disconnect_matched (_tmp43_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp44_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created, self); -#line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp45_ = pageable; -#line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_parse_name ("destroying-page", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, &_tmp46_, NULL, FALSE); -#line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 599 "/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 3926 "Tree.c" +#line 3914 "Tree.c" } -#line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 602 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp47_ = entry; -#line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 602 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp47_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp47_) : NULL); -#line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 602 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" renameable = _tmp48_; -#line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp49_ = renameable; -#line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp49_ != NULL) { -#line 3938 "Tree.c" +#line 3926 "Tree.c" SidebarRenameableEntry* _tmp50_; guint _tmp51_; -#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp50_ = renameable; -#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 604 "/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" +#line 604 "/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 3947 "Tree.c" +#line 3935 "Tree.c" } -#line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp52_ = entry; -#line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp53_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp52_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp52_) : NULL); -#line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" emphasizable = _tmp53_; -#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp54_ = emphasizable; -#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp54_ != NULL) { -#line 3959 "Tree.c" +#line 3947 "Tree.c" SidebarEmphasizableEntry* _tmp55_; guint _tmp56_; -#line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp55_ = emphasizable; -#line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 608 "/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" +#line 608 "/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 3968 "Tree.c" +#line 3956 "Tree.c" } -#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp57_ = self->priv->entry_map; -#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp58_ = entry; -#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp59_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp58_, NULL); -#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" removed = _tmp59_; -#line 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp60_ = removed; -#line 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (_tmp60_, "removed"); -#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (emphasizable); -#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (renameable); -#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (pageable); -#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (entry); -#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (children); -#line 3992 "Tree.c" +#line 3980 "Tree.c" } @@ -4015,47 +4003,47 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch GtkTreeIter _tmp27_; SidebarBranch* _tmp28_; gboolean _tmp29_; -#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 614 "/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" +#line 614 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (branch)); -#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 614 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); -#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = branch; -#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = entry; -#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = sidebar_branch_get_parent (_tmp0_, _tmp1_); -#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" parent = _tmp2_; -#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = parent; -#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (_tmp3_ != NULL, "parent != null"); -#line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 618 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = parent; -#line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 618 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = sidebar_tree_get_wrapper (self, _tmp4_); -#line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 618 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" parent_wrapper = _tmp5_; -#line 620 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = parent_wrapper; -#line 620 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (_tmp6_ != NULL, "parent_wrapper != null"); -#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 622 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = branch; -#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 622 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = entry; -#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 622 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = sidebar_branch_get_next_sibling (_tmp7_, _tmp8_); -#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 622 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" next = _tmp9_; -#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = next; -#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp10_ != NULL) { -#line 4059 "Tree.c" +#line 4047 "Tree.c" SidebarTreeEntryWrapper* next_wrapper = NULL; SidebarEntry* _tmp11_; SidebarTreeEntryWrapper* _tmp12_; @@ -4065,81 +4053,81 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch SidebarTreeEntryWrapper* _tmp16_; GtkTreeIter _tmp17_ = {0}; GtkTreeIter _tmp18_ = {0}; -#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = next; -#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = sidebar_tree_get_wrapper (self, _tmp11_); -#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" next_wrapper = _tmp12_; -#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = self->priv->store; -#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = parent_wrapper; -#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_entry_wrapper_get_iter (_tmp14_, &_tmp15_); -#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = next_wrapper; -#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_entry_wrapper_get_iter (_tmp16_, &_tmp17_); -#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_store_insert_before (_tmp13_, &_tmp18_, &_tmp15_, &_tmp17_); -#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" insertion_iter = _tmp18_; -#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (next_wrapper); -#line 4091 "Tree.c" +#line 4079 "Tree.c" } else { GtkTreeStore* _tmp19_; SidebarTreeEntryWrapper* _tmp20_; GtkTreeIter _tmp21_ = {0}; GtkTreeIter _tmp22_ = {0}; -#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 630 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp19_ = self->priv->store; -#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 630 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp20_ = parent_wrapper; -#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 630 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_entry_wrapper_get_iter (_tmp20_, &_tmp21_); -#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 630 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_store_append (_tmp19_, &_tmp22_, &_tmp21_); -#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 630 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" insertion_iter = _tmp22_; -#line 4107 "Tree.c" +#line 4095 "Tree.c" } -#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 633 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp23_ = insertion_iter; -#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 633 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp24_ = entry; -#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 633 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_associate_entry (self, &_tmp23_, _tmp24_); -#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp25_ = branch; -#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp26_ = entry; -#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp27_ = insertion_iter; -#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_associate_children (self, _tmp25_, _tmp26_, &_tmp27_); -#line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp28_ = branch; -#line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp29_ = sidebar_branch_is_auto_open_on_new_child (_tmp28_); -#line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp29_) { -#line 4129 "Tree.c" +#line 4117 "Tree.c" SidebarEntry* _tmp30_; -#line 638 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp30_ = entry; -#line 638 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_expand_to_entry (self, _tmp30_); -#line 4135 "Tree.c" +#line 4123 "Tree.c" } -#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 614 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (next); -#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 614 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (parent_wrapper); -#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 614 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (parent); -#line 4143 "Tree.c" +#line 4131 "Tree.c" } @@ -4147,27 +4135,27 @@ static void sidebar_tree_on_branch_entry_removed (SidebarTree* self, SidebarBran SidebarTreeEntryWrapper* wrapper = NULL; SidebarEntry* _tmp0_; SidebarTreeEntryWrapper* _tmp1_; -#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 640 "/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" +#line 640 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (branch)); -#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 640 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); -#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = entry; -#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_); -#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp1_; -#line 643 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (wrapper != NULL, "wrapper != null"); -#line 644 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 643 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (!G_TYPE_CHECK_INSTANCE_TYPE (wrapper, SIDEBAR_TREE_TYPE_ROOT_WRAPPER), "!(wrapper is RootWrapper)"); -#line 646 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 645 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_disassociate_wrapper_and_signal (self, wrapper, FALSE); -#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 640 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 4171 "Tree.c" +#line 4159 "Tree.c" } @@ -4188,41 +4176,41 @@ static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch GtkTreeIter _tmp15_ = {0}; GtkTreeStore* _tmp16_; GtkTreeIter* _tmp17_; -#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 648 "/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" +#line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (branch)); -#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); -#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = entry; -#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_); -#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp1_; -#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = wrapper; -#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (_tmp2_ != NULL, "wrapper != null"); -#line 652 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = wrapper; -#line 652 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER), "!(wrapper is RootWrapper)"); -#line 655 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 654 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" prev_iter = NULL; -#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 655 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = branch; -#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 655 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = entry; -#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 655 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = sidebar_branch_get_previous_sibling (_tmp4_, _tmp5_); -#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 655 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" prev = _tmp6_; -#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = prev; -#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp7_ != NULL) { -#line 4226 "Tree.c" +#line 4214 "Tree.c" SidebarTreeEntryWrapper* prev_wrapper = NULL; SidebarEntry* _tmp8_; SidebarTreeEntryWrapper* _tmp9_; @@ -4230,49 +4218,49 @@ static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch SidebarTreeEntryWrapper* _tmp11_; GtkTreeIter _tmp12_ = {0}; GtkTreeIter* _tmp13_; -#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = prev; -#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = sidebar_tree_get_wrapper (self, _tmp8_); -#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" prev_wrapper = _tmp9_; -#line 659 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = prev_wrapper; -#line 659 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (_tmp10_ != NULL, "prev_wrapper != null"); -#line 661 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = prev_wrapper; -#line 661 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_entry_wrapper_get_iter (_tmp11_, &_tmp12_); -#line 661 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = __gtk_tree_iter_dup0 (&_tmp12_); -#line 661 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (prev_iter); -#line 661 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" prev_iter = _tmp13_; -#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (prev_wrapper); -#line 4256 "Tree.c" +#line 4244 "Tree.c" } -#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 663 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = wrapper; -#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 663 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_entry_wrapper_get_iter (_tmp14_, &_tmp15_); -#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 663 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" entry_iter = _tmp15_; -#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = self->priv->store; -#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp17_ = prev_iter; -#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_store_move_after (_tmp16_, &entry_iter, _tmp17_); -#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (prev); -#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (prev_iter); -#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 4276 "Tree.c" +#line 4264 "Tree.c" } @@ -4320,95 +4308,95 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB SidebarTreeEntryWrapper* _tmp37_; SidebarTreeEntryWrapper* _tmp38_; gboolean _tmp39_; -#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 667 "/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" +#line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (branch)); -#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); -#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (old_parent)); -#line 670 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = entry; -#line 670 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_); -#line 670 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp1_; -#line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 670 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = wrapper; -#line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 670 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (_tmp2_ != NULL, "wrapper != null"); -#line 672 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = wrapper; -#line 672 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER), "!(wrapper is RootWrapper)"); -#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = sidebar_tree_get_current_path (self); -#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = _tmp4_; -#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = wrapper; -#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = sidebar_tree_entry_wrapper_get_path (_tmp6_); -#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = _tmp7_; -#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = gtk_tree_path_compare (_tmp5_, _tmp8_); -#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = _tmp9_ == 0; -#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (_tmp8_); -#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (_tmp5_); -#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" selected = _tmp10_; -#line 677 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = wrapper; -#line 677 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_entry_wrapper_get_iter (_tmp11_, &_tmp12_); -#line 677 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" iter = _tmp12_; -#line 678 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 677 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = self->priv->store; -#line 678 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 677 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_store_remove (_tmp13_, &iter); -#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = branch; -#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = entry; -#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = sidebar_branch_get_parent (_tmp14_, _tmp15_); -#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" parent = _tmp16_; -#line 681 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp17_ = parent; -#line 681 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (_tmp17_ != NULL, "parent != null"); -#line 683 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp18_ = parent; -#line 683 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp19_ = sidebar_tree_get_wrapper (self, _tmp18_); -#line 683 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" parent_wrapper = _tmp19_; -#line 684 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 683 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp20_ = parent_wrapper; -#line 684 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 683 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (_tmp20_ != NULL, "parent_wrapper != null"); -#line 687 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 686 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" prev_iter = NULL; -#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 687 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp21_ = branch; -#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 687 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp22_ = entry; -#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 687 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp23_ = sidebar_branch_get_previous_sibling (_tmp21_, _tmp22_); -#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 687 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" prev = _tmp23_; -#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp24_ = prev; -#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp24_ != NULL) { -#line 4412 "Tree.c" +#line 4400 "Tree.c" SidebarTreeEntryWrapper* prev_wrapper = NULL; SidebarEntry* _tmp25_; SidebarTreeEntryWrapper* _tmp26_; @@ -4416,86 +4404,86 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB SidebarTreeEntryWrapper* _tmp28_; GtkTreeIter _tmp29_ = {0}; GtkTreeIter* _tmp30_; -#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp25_ = prev; -#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp26_ = sidebar_tree_get_wrapper (self, _tmp25_); -#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" prev_wrapper = _tmp26_; -#line 691 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp27_ = prev_wrapper; -#line 691 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (_tmp27_ != NULL, "prev_wrapper != null"); -#line 693 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp28_ = prev_wrapper; -#line 693 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_entry_wrapper_get_iter (_tmp28_, &_tmp29_); -#line 693 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp30_ = __gtk_tree_iter_dup0 (&_tmp29_); -#line 693 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (prev_iter); -#line 693 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" prev_iter = _tmp30_; -#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (prev_wrapper); -#line 4442 "Tree.c" +#line 4430 "Tree.c" } -#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp31_ = self->priv->store; -#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp32_ = parent_wrapper; -#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_entry_wrapper_get_iter (_tmp32_, &_tmp33_); -#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp34_ = prev_iter; -#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_store_insert_after (_tmp31_, &_tmp35_, &_tmp33_, _tmp34_); -#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" new_iter = _tmp35_; -#line 699 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp36_ = new_iter; -#line 699 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp37_ = wrapper; -#line 699 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp38_ = sidebar_tree_reparent_wrapper (self, &_tmp36_, _tmp37_); -#line 699 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" new_wrapper = _tmp38_; -#line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 700 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp39_ = selected; -#line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 700 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp39_) { -#line 4468 "Tree.c" +#line 4456 "Tree.c" SidebarTreeEntryWrapper* _tmp40_; SidebarEntry* _tmp41_; SidebarTreeEntryWrapper* _tmp42_; SidebarEntry* _tmp43_; -#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp40_ = new_wrapper; -#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp41_ = _tmp40_->entry; -#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_expand_to_entry (self, _tmp41_); -#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp42_ = new_wrapper; -#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp43_ = _tmp42_->entry; -#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_place_cursor (self, _tmp43_, FALSE); -#line 4485 "Tree.c" +#line 4473 "Tree.c" } -#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (new_wrapper); -#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (prev); -#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (prev_iter); -#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (parent_wrapper); -#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (parent); -#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 4499 "Tree.c" +#line 4487 "Tree.c" } @@ -4505,29 +4493,29 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba SidebarEntry* _tmp1_; GeeList* _tmp2_; GeeList* _tmp3_; -#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 706 "/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" +#line 706 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (branch)); -#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 706 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); -#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = branch; -#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = entry; -#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = sidebar_branch_get_children (_tmp0_, _tmp1_); -#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" children = _tmp2_; -#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = children; -#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp3_ == NULL) { -#line 710 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (children); -#line 710 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 4531 "Tree.c" +#line 4519 "Tree.c" } { GeeList* _child_list = NULL; @@ -4538,25 +4526,25 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba gint _tmp7_; gint _tmp8_; gint _child_index = 0; -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = children; -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = _g_object_ref0 (_tmp4_); -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _child_list = _tmp5_; -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = _child_list; -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = _tmp7_; -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _child_size = _tmp8_; -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _child_index = -1; -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" while (TRUE) { -#line 4560 "Tree.c" +#line 4548 "Tree.c" gint _tmp9_; gint _tmp10_; gint _tmp11_; @@ -4572,61 +4560,61 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba SidebarTreeEntryWrapper* _tmp18_; GtkTreeIter _tmp19_ = {0}; GtkTreeStore* _tmp20_; -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = _child_index; -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _child_index = _tmp9_ + 1; -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = _child_index; -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = _child_size; -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (!(_tmp10_ < _tmp11_)) { -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" break; -#line 4588 "Tree.c" +#line 4576 "Tree.c" } -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = _child_list; -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = _child_index; -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = gee_list_get (_tmp12_, _tmp13_); -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" child = (SidebarEntry*) _tmp14_; -#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = child; -#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = sidebar_tree_get_wrapper (self, _tmp15_); -#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" child_wrapper = _tmp16_; -#line 716 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp17_ = child_wrapper; -#line 716 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (_tmp17_ != NULL, "child_wrapper != null"); -#line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 717 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp18_ = child_wrapper; -#line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 717 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_entry_wrapper_get_iter (_tmp18_, &_tmp19_); -#line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 717 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" child_iter = _tmp19_; -#line 719 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp20_ = self->priv->store; -#line 719 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_store_move_before (_tmp20_, &child_iter, NULL); -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (child_wrapper); -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (child); -#line 4622 "Tree.c" +#line 4610 "Tree.c" } -#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (_child_list); -#line 4626 "Tree.c" +#line 4614 "Tree.c" } -#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 706 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (children); -#line 4630 "Tree.c" +#line 4618 "Tree.c" } @@ -4634,36 +4622,36 @@ static void sidebar_tree_on_show_branch (SidebarTree* self, SidebarBranch* branc gboolean _tmp0_; SidebarBranch* _tmp3_; gboolean _tmp4_; -#line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 722 "/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" +#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_BRANCH (branch)); -#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = shown; -#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp0_) { -#line 4646 "Tree.c" +#line 4634 "Tree.c" SidebarBranch* _tmp1_; -#line 725 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = branch; -#line 725 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_associate_branch (self, _tmp1_); -#line 4652 "Tree.c" +#line 4640 "Tree.c" } else { SidebarBranch* _tmp2_; -#line 727 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 726 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = branch; -#line 727 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 726 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_disassociate_branch (self, _tmp2_); -#line 4659 "Tree.c" +#line 4647 "Tree.c" } -#line 729 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 728 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = branch; -#line 729 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 728 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = shown; -#line 729 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 728 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_SHOWN_SIGNAL], 0, _tmp3_, _tmp4_); -#line 4667 "Tree.c" +#line 4655 "Tree.c" } @@ -4676,68 +4664,143 @@ static void sidebar_tree_on_sidebar_tooltip_changed (SidebarTree* self, SidebarE const gchar* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; -#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 731 "/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" +#line 731 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); -#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = entry; -#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_); -#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp1_; -#line 734 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (wrapper != NULL, "wrapper != null"); -#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = self->priv->store; -#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp3_); -#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = tooltip; -#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = guarded_markup_escape_text (_tmp4_); -#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = _tmp5_; -#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_store_set (_tmp2_, &_tmp3_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp6_, -1); -#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (_tmp6_); -#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 731 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 4708 "Tree.c" +#line 4696 "Tree.c" } -static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntry* entry, const gchar* icon) { +static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntry* entry, const gchar* icon_name) { SidebarTreeEntryWrapper* wrapper = NULL; SidebarEntry* _tmp0_; SidebarTreeEntryWrapper* _tmp1_; - GtkTreeStore* _tmp2_; - GtkTreeIter _tmp3_ = {0}; - const gchar* _tmp4_; -#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + SidebarTreeEntryWrapper* _tmp2_; + GIcon* icon = NULL; + GtkTreeStore* _tmp8_; + SidebarTreeEntryWrapper* _tmp9_; + GtkTreeIter _tmp10_ = {0}; + GIcon* _tmp11_; + GError * _inner_error_ = NULL; +#line 738 "/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" +#line 738 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); -#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = entry; -#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_); -#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp1_; +#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp2_ = wrapper; +#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _vala_assert (_tmp2_ != NULL, "wrapper != null"); #line 741 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _vala_assert (wrapper != NULL, "wrapper != null"); + icon = NULL; +#line 4727 "Tree.c" + { + const gchar* _tmp3_; +#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp3_ = icon_name; +#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + if (_tmp3_ != NULL) { +#line 4734 "Tree.c" + GIcon* _tmp4_ = NULL; + const gchar* _tmp5_; + GIcon* _tmp6_; + GIcon* _tmp7_; +#line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp5_ = icon_name; +#line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp6_ = g_icon_new_for_string (_tmp5_, &_inner_error_); +#line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp4_ = _tmp6_; +#line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 4747 "Tree.c" + goto __catch56_g_error; + } +#line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp7_ = _tmp4_; +#line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp4_ = NULL; +#line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _g_object_unref0 (icon); +#line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + icon = _tmp7_; +#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _g_object_unref0 (_tmp4_); +#line 4760 "Tree.c" + } + } + goto __finally56; + __catch56_g_error: + { + GError* e = NULL; #line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp2_ = self->priv->store; + e = _inner_error_; #line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp3_); + _inner_error_ = NULL; #line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = icon; + _g_error_free0 (e); +#line 4773 "Tree.c" + } + __finally56: #line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_store_set (_tmp2_, &_tmp3_, SIDEBAR_TREE_COLUMNS_ICON, _tmp4_, -1); -#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _g_object_unref0 (icon); +#line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _g_object_unref0 (wrapper); +#line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); +#line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + g_clear_error (&_inner_error_); +#line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + return; +#line 4788 "Tree.c" + } +#line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp8_ = self->priv->store; +#line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp9_ = wrapper; +#line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + sidebar_tree_entry_wrapper_get_iter (_tmp9_, &_tmp10_); +#line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp11_ = icon; +#line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + gtk_tree_store_set (_tmp8_, &_tmp10_, SIDEBAR_TREE_COLUMNS_ICON, _tmp11_, -1); +#line 738 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _g_object_unref0 (icon); +#line 738 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 4741 "Tree.c" +#line 4804 "Tree.c" } @@ -4750,103 +4813,103 @@ static void sidebar_tree_rename_entry (SidebarTree* self, SidebarEntry* entry) { SidebarEntry* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; -#line 746 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 752 "/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" +#line 752 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); -#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = entry; -#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_); -#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp1_; -#line 748 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (wrapper != NULL, "wrapper != null"); -#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = self->priv->store; -#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp3_); -#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = entry; -#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = sidebar_tree_get_name_for_entry (self, _tmp4_); -#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = _tmp5_; -#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_store_set (_tmp2_, &_tmp3_, SIDEBAR_TREE_COLUMNS_NAME, _tmp6_, -1); -#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (_tmp6_); -#line 746 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 752 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 4782 "Tree.c" +#line 4845 "Tree.c" } static void sidebar_tree_on_sidebar_name_changed (SidebarTree* self, SidebarEntry* entry, const gchar* name) { SidebarEntry* _tmp0_; -#line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 759 "/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" +#line 759 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_ENTRY (entry)); -#line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 759 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (name != NULL); -#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 760 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = entry; -#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 760 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_rename_entry (self, _tmp0_); -#line 4798 "Tree.c" +#line 4861 "Tree.c" } static void sidebar_tree_on_sidebar_page_created (SidebarTree* self, SidebarPageRepresentative* entry, Page* page) { SidebarPageRepresentative* _tmp0_; Page* _tmp1_; -#line 757 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 763 "/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" +#line 763 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry)); -#line 757 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 763 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (IS_PAGE (page)); -#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 764 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = entry; -#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 764 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = page; -#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 764 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_PAGE_CREATED_SIGNAL], 0, _tmp0_, _tmp1_); -#line 4817 "Tree.c" +#line 4880 "Tree.c" } static void sidebar_tree_on_is_emphasized_changed (SidebarTree* self, SidebarEmphasizableEntry* entry, gboolean is_emphasized) { SidebarEmphasizableEntry* _tmp0_; -#line 761 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 767 "/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" +#line 767 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_EMPHASIZABLE_ENTRY (entry)); -#line 762 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 768 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = entry; -#line 762 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 768 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_rename_entry (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 4831 "Tree.c" +#line 4894 "Tree.c" } static void sidebar_tree_on_sidebar_destroying_page (SidebarTree* self, SidebarPageRepresentative* entry, Page* page) { SidebarPageRepresentative* _tmp0_; Page* _tmp1_; -#line 765 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 771 "/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" +#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry)); -#line 765 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (IS_PAGE (page)); -#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = entry; -#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = page; -#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_DESTROYING_PAGE_SIGNAL], 0, _tmp0_, _tmp1_); -#line 4850 "Tree.c" +#line 4913 "Tree.c" } @@ -4854,55 +4917,128 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter) SidebarTreeEntryWrapper* wrapper = NULL; GtkTreeIter _tmp0_; SidebarTreeEntryWrapper* _tmp1_; + GIcon* icon = NULL; SidebarTreeEntryWrapper* _tmp2_; - gchar* icon = NULL; - SidebarTreeEntryWrapper* _tmp3_; - SidebarEntry* _tmp4_; - gchar* _tmp5_; - GtkTreeStore* _tmp6_; - GtkTreeIter _tmp7_; - const gchar* _tmp8_; -#line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + GtkTreeStore* _tmp11_; + GtkTreeIter _tmp12_; + GIcon* _tmp13_; + GError * _inner_error_ = NULL; +#line 775 "/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" +#line 775 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (iter != NULL); -#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 776 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = *iter; -#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 776 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp0_); -#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 776 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp1_; -#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 777 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + icon = NULL; +#line 778 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = wrapper; -#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 778 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp2_ == NULL) { -#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 779 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _g_object_unref0 (icon); +#line 779 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 779 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 4884 "Tree.c" +#line 4949 "Tree.c" } -#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp3_ = wrapper; -#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp4_ = _tmp3_->entry; -#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp5_ = sidebar_entry_get_sidebar_icon (_tmp4_); -#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - icon = _tmp5_; -#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp6_ = self->priv->store; -#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp7_ = *iter; -#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _tmp8_ = icon; -#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - gtk_tree_store_set (_tmp6_, &_tmp7_, SIDEBAR_TREE_COLUMNS_ICON, _tmp8_, -1); -#line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _g_free0 (icon); -#line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + { + gchar* name = NULL; + SidebarTreeEntryWrapper* _tmp3_; + SidebarEntry* _tmp4_; + gchar* _tmp5_; + const gchar* _tmp6_; +#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp3_ = wrapper; +#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp4_ = _tmp3_->entry; +#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp5_ = sidebar_entry_get_sidebar_icon (_tmp4_); +#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + name = _tmp5_; +#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp6_ = name; +#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + if (_tmp6_ != NULL) { +#line 4969 "Tree.c" + GIcon* _tmp7_ = NULL; + const gchar* _tmp8_; + GIcon* _tmp9_; + GIcon* _tmp10_; +#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp8_ = name; +#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp9_ = g_icon_new_for_string (_tmp8_, &_inner_error_); +#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp7_ = _tmp9_; +#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _g_free0 (name); +#line 4984 "Tree.c" + goto __catch57_g_error; + } +#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp10_ = _tmp7_; +#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp7_ = NULL; +#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _g_object_unref0 (icon); +#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + icon = _tmp10_; +#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _g_object_unref0 (_tmp7_); +#line 4997 "Tree.c" + } +#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _g_free0 (name); +#line 5001 "Tree.c" + } + goto __finally57; + __catch57_g_error: + { + GError* e = NULL; +#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + e = _inner_error_; +#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _inner_error_ = NULL; +#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _g_error_free0 (e); +#line 5013 "Tree.c" + } + __finally57: +#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _g_object_unref0 (icon); +#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _g_object_unref0 (wrapper); +#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); +#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + g_clear_error (&_inner_error_); +#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + return; +#line 5028 "Tree.c" + } +#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp11_ = self->priv->store; +#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp12_ = *iter; +#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _tmp13_ = icon; +#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + gtk_tree_store_set (_tmp11_, &_tmp12_, SIDEBAR_TREE_COLUMNS_ICON, _tmp13_, -1); +#line 775 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _g_object_unref0 (icon); +#line 775 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 4906 "Tree.c" +#line 5042 "Tree.c" } @@ -4913,56 +5049,56 @@ static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter GtkTreeIter _tmp2_; GtkTreeIter _tmp3_ = {0}; gboolean _tmp4_; -#line 777 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 792 "/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" +#line 792 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (iter != NULL); -#line 778 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = *iter; -#line 778 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_load_entry_icons (self, &_tmp0_); -#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = self->priv->store; -#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = *iter; -#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = gtk_tree_model_iter_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp3_, &_tmp2_); -#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" child_iter = _tmp3_; -#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp4_) { -#line 4935 "Tree.c" +#line 5071 "Tree.c" { gboolean _tmp5_ = FALSE; -#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = TRUE; -#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" while (TRUE) { -#line 4942 "Tree.c" +#line 5078 "Tree.c" GtkTreeIter _tmp8_; -#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (!_tmp5_) { -#line 4946 "Tree.c" +#line 5082 "Tree.c" GtkTreeStore* _tmp6_; gboolean _tmp7_; -#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = self->priv->store; -#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &child_iter); -#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (!_tmp7_) { -#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" break; -#line 4957 "Tree.c" +#line 5093 "Tree.c" } } -#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = FALSE; -#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 798 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = child_iter; -#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 798 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_load_branch_icons (self, &_tmp8_); -#line 4966 "Tree.c" +#line 5102 "Tree.c" } } } @@ -4976,46 +5112,46 @@ static gboolean sidebar_tree_on_selection (SidebarTree* self, GtkTreeSelection* SidebarTreeEntryWrapper* _tmp1_; gboolean _tmp2_ = FALSE; SidebarTreeEntryWrapper* _tmp3_; -#line 788 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 803 "/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" +#line 803 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), FALSE); -#line 788 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 803 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE); -#line 788 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 803 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (path != NULL, FALSE); -#line 791 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 806 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = path; -#line 791 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 806 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_); -#line 791 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 806 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp1_; -#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = wrapper; -#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp3_ != NULL) { -#line 4998 "Tree.c" +#line 5134 "Tree.c" SidebarTreeEntryWrapper* _tmp4_; SidebarEntry* _tmp5_; -#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = wrapper; -#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = _tmp4_->entry; -#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_SELECTABLE_ENTRY); -#line 5007 "Tree.c" +#line 5143 "Tree.c" } else { -#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = FALSE; -#line 5011 "Tree.c" +#line 5147 "Tree.c" } -#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = _tmp2_; -#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5019 "Tree.c" +#line 5155 "Tree.c" } @@ -5043,65 +5179,65 @@ static GtkTreePath* sidebar_tree_get_path_from_event (SidebarTree* self, GdkEven gint _tmp13_ = 0; gboolean _tmp14_; GtkTreePath* _tmp16_; -#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 811 "/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" +#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (event != NULL, NULL); -#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = event; -#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = _tmp0_->window; -#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = gdk_display_get_default (); -#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = gdk_display_get_device_manager (_tmp2_); -#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = gdk_device_manager_get_client_pointer (_tmp3_); -#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gdk_window_get_device_position (_tmp1_, _tmp4_, &_tmp5_, &_tmp6_, &_tmp7_); -#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" x = _tmp5_; -#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" y = _tmp6_; -#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" mask = _tmp7_; -#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = x; -#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = y; -#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = gtk_tree_view_get_path_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp9_, _tmp10_, &_tmp11_, NULL, &_tmp12_, &_tmp13_); -#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" path = _tmp11_; -#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" cell_x = _tmp12_; -#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" cell_y = _tmp13_; -#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp14_) { -#line 5085 "Tree.c" +#line 5221 "Tree.c" GtkTreePath* _tmp15_; -#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = path; -#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = _tmp15_; -#line 5091 "Tree.c" +#line 5227 "Tree.c" } else { -#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = NULL; -#line 5095 "Tree.c" +#line 5231 "Tree.c" } -#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = _gtk_tree_path_copy0 (_tmp8_); -#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = _tmp16_; -#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5105 "Tree.c" +#line 5241 "Tree.c" } @@ -5120,74 +5256,74 @@ static GtkTreePath* sidebar_tree_get_current_path (SidebarTree* self) { GList* _tmp10_; guint _tmp11_; GtkTreePath* _tmp14_; -#line 807 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 822 "/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" +#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView)); -#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = gtk_tree_selection_get_selected_rows (_tmp0_, &_tmp1_); -#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (model); -#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = _g_object_ref0 (_tmp1_); -#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" model = _tmp3_; -#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" rows = _tmp2_; -#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = rows; -#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = g_list_length (_tmp5_); -#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp6_ == ((guint) 0)) { -#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = TRUE; -#line 5146 "Tree.c" +#line 5282 "Tree.c" } else { GList* _tmp7_; guint _tmp8_; -#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = rows; -#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = g_list_length (_tmp7_); -#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = _tmp8_ == ((guint) 1); -#line 5156 "Tree.c" +#line 5292 "Tree.c" } -#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _vala_assert (_tmp4_, "rows.length() == 0 || rows.length() == 1"); -#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = rows; -#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = g_list_length (_tmp10_); -#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp11_ != ((guint) 0)) { -#line 5166 "Tree.c" +#line 5302 "Tree.c" GList* _tmp12_; gconstpointer _tmp13_; -#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = rows; -#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 827 "/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" +#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = (GtkTreePath*) _tmp13_; -#line 5175 "Tree.c" +#line 5311 "Tree.c" } else { -#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = NULL; -#line 5179 "Tree.c" +#line 5315 "Tree.c" } -#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = _gtk_tree_path_copy0 (_tmp9_); -#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = _tmp14_; -#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" __g_list_free__gtk_tree_path_free0_0 (rows); -#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (model); -#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5191 "Tree.c" +#line 5327 "Tree.c" } @@ -5205,65 +5341,65 @@ static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) { GtkTreePath* _tmp7_; GtkTreePath* _tmp8_; gboolean _tmp9_; -#line 815 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 830 "/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" +#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView)); -#line 816 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = gtk_tree_selection_get_selected_rows (_tmp0_, NULL); -#line 816 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" rows = _tmp1_; -#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = rows; -#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp2_ == NULL) { -#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" __g_list_free__gtk_tree_path_free0_0 (rows); -#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5227 "Tree.c" +#line 5363 "Tree.c" } -#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = rows; -#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = _tmp3_->data; -#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = _gtk_tree_path_copy0 ((GtkTreePath*) _tmp4_); -#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" path = _tmp5_; -#line 821 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = path; -#line 821 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp6_ == NULL) { -#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" __g_list_free__gtk_tree_path_free0_0 (rows); -#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5249 "Tree.c" +#line 5385 "Tree.c" } -#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = path; -#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_scroll_to_cell (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp7_, NULL, FALSE, (gfloat) 0, (gfloat) 0); -#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = path; -#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = sidebar_tree_popup_context_menu (self, _tmp8_, NULL); -#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = _tmp9_; -#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" __g_list_free__gtk_tree_path_free0_0 (rows); -#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5267 "Tree.c" +#line 5403 "Tree.c" } @@ -5291,157 +5427,157 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath* GtkMenu* _tmp16_; GtkWidget* _tmp17_; GdkEventButton* _tmp19_; -#line 829 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 844 "/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" +#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (path != NULL, FALSE); -#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = path; -#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_); -#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp1_; -#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = wrapper; -#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp2_ == NULL) { -#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5315 "Tree.c" +#line 5451 "Tree.c" } -#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = wrapper; -#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = _tmp3_->entry; -#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, SIDEBAR_TYPE_CONTEXTABLE) ? ((SidebarContextable*) _tmp4_) : NULL); -#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" contextable = _tmp5_; -#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 850 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = contextable; -#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 850 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp6_ == NULL) { -#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (contextable); -#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5337 "Tree.c" +#line 5473 "Tree.c" } -#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = wrapper; -#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = _tmp7_->entry; -#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp8_) : NULL); -#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" selectable = _tmp9_; -#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = selectable; -#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp10_ != NULL) { -#line 5351 "Tree.c" +#line 5487 "Tree.c" SidebarSelectableEntry* _tmp11_; -#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = selectable; -#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL], 0, _tmp11_); -#line 5357 "Tree.c" +#line 5493 "Tree.c" } -#line 843 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = contextable; -#line 843 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = event; -#line 843 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = sidebar_contextable_get_sidebar_context_menu (_tmp12_, _tmp13_); -#line 843 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" context_menu = _tmp14_; -#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = context_menu; -#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp15_ == NULL) { -#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (context_menu); -#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (selectable); -#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (contextable); -#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5383 "Tree.c" +#line 5519 "Tree.c" } -#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 862 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = context_menu; -#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 862 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp17_ = gtk_menu_get_attach_widget (_tmp16_); -#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 862 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp17_ == NULL) { -#line 5391 "Tree.c" +#line 5527 "Tree.c" GtkMenu* _tmp18_; -#line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 863 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp18_ = context_menu; -#line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 863 "/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 5397 "Tree.c" +#line 5533 "Tree.c" } -#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp19_ = event; -#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp19_ != NULL) { -#line 5403 "Tree.c" +#line 5539 "Tree.c" GtkMenu* _tmp20_; GdkEventButton* _tmp21_; guint _tmp22_; GdkEventButton* _tmp23_; guint32 _tmp24_; -#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp20_ = context_menu; -#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp21_ = event; -#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp22_ = _tmp21_->button; -#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp23_ = event; -#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp24_ = _tmp23_->time; -#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_menu_popup (_tmp20_, NULL, NULL, NULL, NULL, _tmp22_, _tmp24_); -#line 5421 "Tree.c" +#line 5557 "Tree.c" } else { GtkMenu* _tmp25_; guint32 _tmp26_; -#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 869 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp25_ = context_menu; -#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 869 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp26_ = gtk_get_current_event_time (); -#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 869 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_menu_popup (_tmp25_, NULL, NULL, NULL, NULL, (guint) 0, _tmp26_); -#line 5431 "Tree.c" +#line 5567 "Tree.c" } -#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; -#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (context_menu); -#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (selectable); -#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (contextable); -#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5445 "Tree.c" +#line 5581 "Tree.c" } @@ -5452,27 +5588,27 @@ static gboolean sidebar_tree_popup_default_context_menu (SidebarTree* self, GdkE guint _tmp2_; GdkEventButton* _tmp3_; guint32 _tmp4_; -#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 874 "/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" +#line 874 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = self->priv->default_context_menu; -#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = event; -#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = _tmp1_->button; -#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = event; -#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = _tmp3_->time; -#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, _tmp2_, _tmp4_); -#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 876 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; -#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 876 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5476 "Tree.c" +#line 5612 "Tree.c" } @@ -5489,129 +5625,129 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr GtkTreePath* _tmp6_; gboolean _tmp7_; gboolean _tmp16_; -#line 864 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 879 "/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" +#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (iter != NULL, FALSE); -#line 864 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (path != NULL, FALSE); -#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 881 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = *iter; -#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 881 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp0_); -#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 881 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp1_; -#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = wrapper; -#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp2_ == NULL) { -#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5515 "Tree.c" +#line 5651 "Tree.c" } -#line 872 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 887 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = self->priv->expander_called_manually; -#line 872 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 887 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" should_allow_toggle = _tmp3_; -#line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 890 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->expander_called_manually = FALSE; -#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = path; -#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _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" +#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp7_) { -#line 5529 "Tree.c" +#line 5665 "Tree.c" GtkTreeStore* _tmp8_; GtkTreeIter _tmp9_; gboolean _tmp10_; -#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = self->priv->store; -#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = *iter; -#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _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" +#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = _tmp10_; -#line 5541 "Tree.c" +#line 5677 "Tree.c" } else { -#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = FALSE; -#line 5545 "Tree.c" +#line 5681 "Tree.c" } -#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp5_) { -#line 5549 "Tree.c" +#line 5685 "Tree.c" SidebarTreeEntryWrapper* _tmp11_; SidebarEntry* _tmp12_; -#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = wrapper; -#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = _tmp11_->entry; -#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, SIDEBAR_TYPE_SELECTABLE_ENTRY); -#line 5558 "Tree.c" +#line 5694 "Tree.c" } else { -#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = FALSE; -#line 5562 "Tree.c" +#line 5698 "Tree.c" } -#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp4_) { -#line 5566 "Tree.c" +#line 5702 "Tree.c" gint _tmp13_; gint _tmp14_; -#line 880 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 895 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = self->priv->expander_special_count; -#line 880 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 895 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->expander_special_count = _tmp13_ + 1; -#line 881 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 896 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = self->priv->expander_special_count; -#line 881 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 896 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp14_ == 1) { -#line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; -#line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5583 "Tree.c" +#line 5719 "Tree.c" } else { gboolean _tmp15_; -#line 886 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = should_allow_toggle; -#line 886 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" should_allow_toggle = !_tmp15_; -#line 5590 "Tree.c" +#line 5726 "Tree.c" } } else { -#line 890 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->expander_special_count = 0; -#line 5595 "Tree.c" +#line 5731 "Tree.c" } -#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = should_allow_toggle; -#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp16_) { -#line 894 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 894 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 894 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5607 "Tree.c" +#line 5743 "Tree.c" } -#line 897 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; -#line 897 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 897 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5615 "Tree.c" +#line 5751 "Tree.c" } @@ -5628,120 +5764,120 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB guint _tmp8_; GdkEventButton* _tmp58_; gboolean _tmp59_; -#line 900 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 915 "/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" +#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = event; -#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_tree_get_path_from_event (self, _tmp0_); -#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" path = _tmp1_; -#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = path; -#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp3_ == NULL) { -#line 5646 "Tree.c" +#line 5782 "Tree.c" GdkEventButton* _tmp4_; guint _tmp5_; -#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = event; -#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = _tmp4_->button; -#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = _tmp5_ != ((guint) 3); -#line 5655 "Tree.c" +#line 5791 "Tree.c" } else { -#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = FALSE; -#line 5659 "Tree.c" +#line 5795 "Tree.c" } -#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp2_) { -#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; -#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5669 "Tree.c" +#line 5805 "Tree.c" } -#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = event; -#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = _tmp7_->button; -#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp8_ == ((guint) 3)) { -#line 5677 "Tree.c" +#line 5813 "Tree.c" GdkEventButton* _tmp9_; GdkEventType _tmp10_; -#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = event; -#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = _tmp9_->type; -#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = _tmp10_ == GDK_BUTTON_PRESS; -#line 5686 "Tree.c" +#line 5822 "Tree.c" } else { -#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = FALSE; -#line 5690 "Tree.c" +#line 5826 "Tree.c" } -#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp6_) { -#line 5694 "Tree.c" +#line 5830 "Tree.c" GtkTreePath* _tmp11_; -#line 910 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = path; -#line 910 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp11_ != NULL) { -#line 5700 "Tree.c" +#line 5836 "Tree.c" GtkTreePath* _tmp12_; GdkEventButton* _tmp13_; -#line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 926 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = path; -#line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 926 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = event; -#line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 926 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_popup_context_menu (self, _tmp12_, _tmp13_); -#line 5709 "Tree.c" +#line 5845 "Tree.c" } else { GdkEventButton* _tmp14_; -#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = event; -#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_popup_default_context_menu (self, _tmp14_); -#line 5716 "Tree.c" +#line 5852 "Tree.c" } } else { gboolean _tmp15_ = FALSE; GdkEventButton* _tmp16_; guint _tmp17_; -#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = event; -#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp17_ = _tmp16_->button; -#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp17_ == ((guint) 1)) { -#line 5728 "Tree.c" +#line 5864 "Tree.c" GdkEventButton* _tmp18_; GdkEventType _tmp19_; -#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp18_ = event; -#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp19_ = _tmp18_->type; -#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = _tmp19_ == GDK_BUTTON_PRESS; -#line 5737 "Tree.c" +#line 5873 "Tree.c" } else { -#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = FALSE; -#line 5741 "Tree.c" +#line 5877 "Tree.c" } -#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp15_) { -#line 5745 "Tree.c" +#line 5881 "Tree.c" GtkTreePath* _tmp20_; SidebarTreeEntryWrapper* wrapper = NULL; GtkTreePath* _tmp23_; @@ -5759,226 +5895,226 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB GtkTreeStore* _tmp55_; GtkTreePath* _tmp56_; GtkTreeRowReference* _tmp57_; -#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 930 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp20_ = path; -#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 930 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp20_ == NULL) { -#line 5767 "Tree.c" +#line 5903 "Tree.c" GdkEventButton* _tmp21_; gboolean _tmp22_; -#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 931 "/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" +#line 931 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->old_path_ref = NULL; -#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp21_ = event; -#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp22_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp21_); -#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = _tmp22_; -#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5784 "Tree.c" +#line 5920 "Tree.c" } -#line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp23_ = path; -#line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp24_ = sidebar_tree_get_wrapper_at_path (self, _tmp23_); -#line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp24_; -#line 922 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp25_ = wrapper; -#line 922 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp25_ == NULL) { -#line 5796 "Tree.c" +#line 5932 "Tree.c" GdkEventButton* _tmp26_; gboolean _tmp27_; -#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 938 "/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" +#line 938 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->old_path_ref = NULL; -#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp26_ = event; -#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp27_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp26_); -#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = _tmp27_; -#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5815 "Tree.c" +#line 5951 "Tree.c" } -#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp29_ = wrapper; -#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp30_ = _tmp29_->entry; -#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, SIDEBAR_TYPE_EXPANDABLE_ENTRY)) { -#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp28_ = TRUE; -#line 5825 "Tree.c" +#line 5961 "Tree.c" } else { SidebarTreeEntryWrapper* _tmp31_; SidebarEntry* _tmp32_; -#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp31_ = wrapper; -#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp32_ = _tmp31_->entry; -#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp28_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY); -#line 5835 "Tree.c" +#line 5971 "Tree.c" } -#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp28_) { -#line 5839 "Tree.c" +#line 5975 "Tree.c" GtkTreePath* _tmp33_; -#line 931 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp33_ = path; -#line 931 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_toggle_branch_expansion (self, _tmp33_, FALSE); -#line 5845 "Tree.c" +#line 5981 "Tree.c" } -#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp36_ = self->priv->old_path_ref; -#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp36_ != NULL) { -#line 5851 "Tree.c" +#line 5987 "Tree.c" const GtkTreeRowReference* _tmp37_; GtkTreePath* _tmp38_; GtkTreePath* _tmp39_; -#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp37_ = self->priv->old_path_ref; -#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp38_ = gtk_tree_row_reference_get_path (_tmp37_); -#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp39_ = _tmp38_; -#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp35_ = _tmp39_ != NULL; -#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (_tmp39_); -#line 5865 "Tree.c" +#line 6001 "Tree.c" } else { -#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp35_ = FALSE; -#line 5869 "Tree.c" +#line 6005 "Tree.c" } -#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp35_) { -#line 5873 "Tree.c" +#line 6009 "Tree.c" const GtkTreeRowReference* _tmp40_; GtkTreePath* _tmp41_; GtkTreePath* _tmp42_; GtkTreePath* _tmp43_; gint _tmp44_; -#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp40_ = self->priv->old_path_ref; -#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp41_ = gtk_tree_row_reference_get_path (_tmp40_); -#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp42_ = _tmp41_; -#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp43_ = path; -#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp44_ = gtk_tree_path_compare (_tmp42_, _tmp43_); -#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp34_ = _tmp44_ == 0; -#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (_tmp42_); -#line 5893 "Tree.c" +#line 6029 "Tree.c" } else { -#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp34_ = FALSE; -#line 5897 "Tree.c" +#line 6033 "Tree.c" } -#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp34_) { -#line 5901 "Tree.c" +#line 6037 "Tree.c" GtkCellRendererText* _tmp45_; GdkEventButton* _tmp46_; gboolean _tmp47_; -#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp45_ = self->priv->text_renderer; -#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_object_set (_tmp45_, "editable", FALSE, NULL); -#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp46_ = event; -#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp47_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp46_); -#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = _tmp47_; -#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5921 "Tree.c" +#line 6057 "Tree.c" } -#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 960 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp49_ = wrapper; -#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 960 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp50_ = _tmp49_->entry; -#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 960 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp50_, SIDEBAR_TYPE_RENAMEABLE_ENTRY)) { -#line 5929 "Tree.c" +#line 6065 "Tree.c" SidebarTreeEntryWrapper* _tmp51_; SidebarEntry* _tmp52_; gboolean _tmp53_; -#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 961 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp51_ = wrapper; -#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 961 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp52_ = _tmp51_->entry; -#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 961 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _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" +#line 961 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp48_ = _tmp53_; -#line 5941 "Tree.c" +#line 6077 "Tree.c" } else { -#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 960 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp48_ = FALSE; -#line 5945 "Tree.c" +#line 6081 "Tree.c" } -#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 960 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp48_) { -#line 5949 "Tree.c" +#line 6085 "Tree.c" GtkCellRendererText* _tmp54_; -#line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp54_ = self->priv->text_renderer; -#line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_object_set (_tmp54_, "editable", TRUE, NULL); -#line 5955 "Tree.c" +#line 6091 "Tree.c" } -#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp55_ = self->priv->store; -#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp56_ = path; -#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp57_ = gtk_tree_row_reference_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GTK_TYPE_TREE_MODEL, GtkTreeModel), _tmp56_); -#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_row_reference_free0 (self->priv->old_path_ref); -#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->old_path_ref = _tmp57_; -#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 5969 "Tree.c" +#line 6105 "Tree.c" } } -#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp58_ = event; -#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp59_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp58_); -#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = _tmp59_; -#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 5982 "Tree.c" +#line 6118 "Tree.c" } @@ -5989,53 +6125,53 @@ gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self, GdkEventKey* e const gchar* _tmp2_; const gchar* _tmp3_; GQuark _tmp5_ = 0U; -#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" static GQuark _tmp4_label0 = 0; -#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" static GQuark _tmp4_label1 = 0; -#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" static GQuark _tmp4_label2 = 0; -#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" static GQuark _tmp4_label3 = 0; -#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE); -#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = event; -#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = _tmp0_->keyval; -#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = gdk_keyval_name (_tmp1_); -#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = _tmp2_; -#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_); -#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" 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" +#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" switch (0) { -#line 6019 "Tree.c" +#line 6155 "Tree.c" default: { -#line 963 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; -#line 963 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6026 "Tree.c" +#line 6162 "Tree.c" } } } else { -#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" switch (0) { -#line 6032 "Tree.c" +#line 6168 "Tree.c" default: { -#line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6039 "Tree.c" +#line 6175 "Tree.c" } } } @@ -6050,134 +6186,134 @@ static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey* const gchar* _tmp2_; const gchar* _tmp3_; GQuark _tmp5_ = 0U; -#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" static GQuark _tmp4_label0 = 0; -#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" static GQuark _tmp4_label1 = 0; -#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" static GQuark _tmp4_label2 = 0; -#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" static GQuark _tmp4_label3 = 0; -#line 6062 "Tree.c" +#line 6198 "Tree.c" GdkEventKey* _tmp15_; gboolean _tmp16_; -#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 985 "/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" +#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = event; -#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = _tmp0_->keyval; -#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = gdk_keyval_name (_tmp1_); -#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = _tmp2_; -#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_); -#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" 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" +#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" switch (0) { -#line 6083 "Tree.c" +#line 6219 "Tree.c" default: { GtkTreePath* path = NULL; GtkTreePath* _tmp6_; GtkTreePath* _tmp7_; -#line 974 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 989 "/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" +#line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" path = _tmp6_; -#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = path; -#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp7_ != NULL) { -#line 6097 "Tree.c" +#line 6233 "Tree.c" GtkTreePath* _tmp8_; -#line 976 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 991 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = path; -#line 976 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 991 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_toggle_branch_expansion (self, _tmp8_, FALSE); -#line 6103 "Tree.c" +#line 6239 "Tree.c" } -#line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; -#line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6111 "Tree.c" +#line 6247 "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" +#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" switch (0) { -#line 6117 "Tree.c" +#line 6253 "Tree.c" default: { gboolean _tmp9_; -#line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 996 "/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" +#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = _tmp9_; -#line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6127 "Tree.c" +#line 6263 "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" +#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" switch (0) { -#line 6133 "Tree.c" +#line 6269 "Tree.c" default: { GtkTreePath* path = NULL; GtkTreePath* _tmp10_; gboolean _tmp11_ = FALSE; GtkTreePath* _tmp12_; -#line 984 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 999 "/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" +#line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" path = _tmp10_; -#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = path; -#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp12_ != NULL) { -#line 6148 "Tree.c" +#line 6284 "Tree.c" GtkTreePath* _tmp13_; gboolean _tmp14_; -#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = path; -#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1001 "/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" +#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = _tmp14_; -#line 6157 "Tree.c" +#line 6293 "Tree.c" } else { -#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = FALSE; -#line 6161 "Tree.c" +#line 6297 "Tree.c" } -#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = _tmp11_; -#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6169 "Tree.c" +#line 6305 "Tree.c" } } } -#line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = event; -#line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp15_); -#line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = _tmp16_; -#line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6181 "Tree.c" +#line 6317 "Tree.c" } @@ -6188,41 +6324,41 @@ gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, SidebarEntry* en SidebarEntry* _tmp2_; gboolean _tmp3_; gboolean _tmp4_; -#line 992 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1007 "/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" +#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE); -#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = entry; -#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_tree_expand_to_entry (self, _tmp0_); -#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (!_tmp1_) { -#line 994 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 994 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6206 "Tree.c" +#line 6342 "Tree.c" } -#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = entry; -#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = sidebar_tree_place_cursor (self, _tmp2_, FALSE); -#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (!_tmp3_) { -#line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1012 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1012 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6218 "Tree.c" +#line 6354 "Tree.c" } -#line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = sidebar_tree_rename_in_place (self); -#line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = _tmp4_; -#line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6226 "Tree.c" +#line 6362 "Tree.c" } @@ -6235,57 +6371,57 @@ static gboolean sidebar_tree_rename_in_place (SidebarTree* self) { GtkTreeViewColumn* _tmp2_; GtkTreePath* _tmp3_; gboolean _tmp4_; -#line 1002 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1017 "/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" +#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_get_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), &_tmp0_, &_tmp1_); -#line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (cursor_path); -#line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" cursor_path = _tmp0_; -#line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (cursor_column); -#line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" cursor_column = _tmp2_; -#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = cursor_path; -#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = sidebar_tree_can_rename_path (self, _tmp3_); -#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp4_) { -#line 6259 "Tree.c" +#line 6395 "Tree.c" GtkTreePath* _tmp5_; GtkTreeViewColumn* _tmp6_; GtkCellRendererText* _tmp7_; -#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = cursor_path; -#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = cursor_column; -#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = self->priv->text_renderer; -#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_set_cursor_on_cell (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp5_, _tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); -#line 1010 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; -#line 1010 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (cursor_column); -#line 1010 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (cursor_path); -#line 1010 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6279 "Tree.c" +#line 6415 "Tree.c" } -#line 1013 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1028 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 1013 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1028 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (cursor_column); -#line 1013 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1028 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (cursor_path); -#line 1013 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1028 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6289 "Tree.c" +#line 6425 "Tree.c" } @@ -6298,45 +6434,45 @@ gboolean sidebar_tree_scroll_to_entry (SidebarTree* self, SidebarEntry* entry) { SidebarTreeEntryWrapper* _tmp3_; GtkTreePath* _tmp4_; GtkTreePath* _tmp5_; -#line 1016 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1031 "/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" +#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE); -#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = entry; -#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_); -#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp1_; -#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = wrapper; -#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp2_ == NULL) { -#line 1019 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 1019 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 1019 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6322 "Tree.c" +#line 6458 "Tree.c" } -#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1036 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = wrapper; -#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1036 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_); -#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1036 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = _tmp4_; -#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1036 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_view_scroll_to_cell (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp5_, NULL, FALSE, (gfloat) 0, (gfloat) 0); -#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1036 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (_tmp5_); -#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; -#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6340 "Tree.c" +#line 6476 "Tree.c" } @@ -6347,55 +6483,55 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co SidebarInternalDragSourceEntry* _tmp6_; SidebarInternalDragSourceEntry* _tmp16_; GtkSelectionData* _tmp17_; -#line 1026 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1041 "/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" +#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (GDK_IS_DRAG_CONTEXT (context)); -#line 1026 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (selection_data != NULL); -#line 1028 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" drag_source = NULL; -#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = self->priv->internal_drag_source_entry; -#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp0_ != NULL) { -#line 6363 "Tree.c" +#line 6499 "Tree.c" SidebarSelectableEntry* selectable = NULL; SidebarEntry* _tmp1_; SidebarSelectableEntry* _tmp2_; SidebarSelectableEntry* _tmp3_; -#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1046 "/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" +#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp1_) : NULL); -#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" selectable = _tmp2_; -#line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = selectable; -#line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp3_ == NULL) { -#line 6378 "Tree.c" +#line 6514 "Tree.c" SidebarEntry* _tmp4_; SidebarInternalDragSourceEntry* _tmp5_; -#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1049 "/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" +#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, SIDEBAR_TYPE_INTERNAL_DRAG_SOURCE_ENTRY) ? ((SidebarInternalDragSourceEntry*) _tmp4_) : NULL); -#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (drag_source); -#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" drag_source = _tmp5_; -#line 6389 "Tree.c" +#line 6525 "Tree.c" } -#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (selectable); -#line 6393 "Tree.c" +#line 6529 "Tree.c" } -#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = drag_source; -#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp6_ == NULL) { -#line 6399 "Tree.c" +#line 6535 "Tree.c" GtkTreePath* selected_path = NULL; GtkTreePath* _tmp7_; GtkTreePath* _tmp8_; @@ -6407,81 +6543,81 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co SidebarEntry* _tmp13_; SidebarInternalDragSourceEntry* _tmp14_; SidebarInternalDragSourceEntry* _tmp15_; -#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1054 "/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" +#line 1054 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" selected_path = _tmp7_; -#line 1040 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = selected_path; -#line 1040 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp8_ == NULL) { -#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (selected_path); -#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (drag_source); -#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 6425 "Tree.c" +#line 6561 "Tree.c" } -#line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1058 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = selected_path; -#line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1058 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = sidebar_tree_get_wrapper_at_path (self, _tmp9_); -#line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1058 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp10_; -#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = wrapper; -#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp11_ == NULL) { -#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (selected_path); -#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (drag_source); -#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 6445 "Tree.c" +#line 6581 "Tree.c" } -#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = wrapper; -#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = _tmp12_->entry; -#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, SIDEBAR_TYPE_INTERNAL_DRAG_SOURCE_ENTRY) ? ((SidebarInternalDragSourceEntry*) _tmp13_) : NULL); -#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (drag_source); -#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" drag_source = _tmp14_; -#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = drag_source; -#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp15_ == NULL) { -#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (selected_path); -#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (drag_source); -#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 6469 "Tree.c" +#line 6605 "Tree.c" } -#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (selected_path); -#line 6475 "Tree.c" +#line 6611 "Tree.c" } -#line 1052 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = drag_source; -#line 1052 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp17_ = selection_data; -#line 1052 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_internal_drag_source_entry_prepare_selection_data (_tmp16_, _tmp17_); -#line 1026 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (drag_source); -#line 6485 "Tree.c" +#line 6621 "Tree.c" } @@ -6514,87 +6650,87 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex GdkDragContext* _tmp57_; gboolean _tmp58_; guint _tmp59_; -#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1070 "/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" +#line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (GDK_IS_DRAG_CONTEXT (context)); -#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (selection_data != NULL); -#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = x; -#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = y; -#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = gtk_tree_view_get_dest_row_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp0_, _tmp1_, &_tmp2_, &_tmp3_); -#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" path = _tmp2_; -#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" pos = _tmp3_; -#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (!_tmp4_) { -#line 6538 "Tree.c" +#line 6674 "Tree.c" GdkDragContext* _tmp5_; GtkWidget* _tmp6_; -#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1077 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = context; -#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1077 "/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" +#line 1077 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp6_ == NULL) { -#line 6547 "Tree.c" +#line 6683 "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" +#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = self->priv->drop_handler; -#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7__target = self->priv->drop_handler_target; -#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = context; -#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = selection_data; -#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = info; -#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = time; -#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ (_tmp8_, NULL, _tmp9_, _tmp10_, _tmp11_, _tmp7__target); -#line 6568 "Tree.c" +#line 6704 "Tree.c" } else { GdkDragContext* _tmp12_; guint _tmp13_; -#line 1065 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1080 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = context; -#line 1065 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1080 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = time; -#line 1065 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1080 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_drag_finish (_tmp12_, FALSE, FALSE, (guint32) _tmp13_); -#line 6578 "Tree.c" +#line 6714 "Tree.c" } -#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 6584 "Tree.c" +#line 6720 "Tree.c" } -#line 1071 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = path; -#line 1071 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = sidebar_tree_get_wrapper_at_path (self, _tmp14_); -#line 1071 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp15_; -#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = context; -#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp17_ = gtk_drag_get_source_widget (_tmp16_); -#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp17_ == NULL) { -#line 6598 "Tree.c" +#line 6734 "Tree.c" SidebarEntry* _tmp18_ = NULL; SidebarTreeEntryWrapper* _tmp19_; SidebarTreeExternalDropHandler _tmp22_; @@ -6603,128 +6739,128 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex GtkSelectionData* _tmp24_; guint _tmp25_; guint _tmp26_; -#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp19_ = wrapper; -#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp19_ != NULL) { -#line 6611 "Tree.c" +#line 6747 "Tree.c" SidebarTreeEntryWrapper* _tmp20_; SidebarEntry* _tmp21_; -#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp20_ = wrapper; -#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp21_ = _tmp20_->entry; -#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp18_ = _tmp21_; -#line 6620 "Tree.c" +#line 6756 "Tree.c" } else { -#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp18_ = NULL; -#line 6624 "Tree.c" +#line 6760 "Tree.c" } -#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp22_ = self->priv->drop_handler; -#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp22__target = self->priv->drop_handler_target; -#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp23_ = context; -#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp24_ = selection_data; -#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp25_ = info; -#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp26_ = time; -#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp22_ (_tmp23_, _tmp18_, _tmp24_, _tmp25_, _tmp26_, _tmp22__target); -#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 6646 "Tree.c" +#line 6782 "Tree.c" } -#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp27_ = wrapper; -#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp27_ == NULL) { -#line 6652 "Tree.c" +#line 6788 "Tree.c" GdkDragContext* _tmp28_; guint _tmp29_; -#line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp28_ = context; -#line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp29_ = time; -#line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_drag_finish (_tmp28_, FALSE, FALSE, (guint32) _tmp29_); -#line 1085 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 1085 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 1085 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 6667 "Tree.c" +#line 6803 "Tree.c" } -#line 1088 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp30_ = wrapper; -#line 1088 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp31_ = _tmp30_->entry; -#line 1088 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp31_, SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY) ? ((SidebarInternalDropTargetEntry*) _tmp31_) : NULL); -#line 1088 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" targetable = _tmp32_; -#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp33_ = targetable; -#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp33_ == NULL) { -#line 6681 "Tree.c" +#line 6817 "Tree.c" GdkDragContext* _tmp34_; guint _tmp35_; -#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp34_ = context; -#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp35_ = time; -#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_drag_finish (_tmp34_, FALSE, FALSE, (guint32) _tmp35_); -#line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (targetable); -#line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return; -#line 6698 "Tree.c" +#line 6834 "Tree.c" } -#line 1095 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" success = FALSE; -#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp36_ = selection_data; -#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp37_ = gtk_selection_data_get_data_type (_tmp36_); -#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp38_ = gdk_atom_name (_tmp37_); -#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp39_ = _tmp38_; -#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp40_ = g_strcmp0 (_tmp39_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0; -#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_free0 (_tmp39_); -#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp40_) { -#line 6716 "Tree.c" +#line 6852 "Tree.c" SidebarInternalDropTargetEntry* _tmp41_; GtkSelectionData* _tmp42_; gboolean _tmp43_; -#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp41_ = targetable; -#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp42_ = selection_data; -#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp43_ = sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (_tmp41_, _tmp42_); -#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" success = _tmp43_; -#line 6728 "Tree.c" +#line 6864 "Tree.c" } else { GeeList* media = NULL; GtkSelectionData* _tmp44_; @@ -6734,75 +6870,75 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex GeeList* _tmp48_; gboolean _tmp49_ = FALSE; GeeList* _tmp50_; -#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp44_ = selection_data; -#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp45_ = gtk_selection_data_get_data (_tmp44_); -#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp46_ = selection_data; -#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp47_ = gtk_selection_data_get_length (_tmp46_); -#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp48_ = unserialize_media_sources (_tmp45_, _tmp47_); -#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" media = _tmp48_; -#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp50_ = media; -#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp50_ != NULL) { -#line 6754 "Tree.c" +#line 6890 "Tree.c" GeeList* _tmp51_; gint _tmp52_; gint _tmp53_; -#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp51_ = media; -#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp52_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp53_ = _tmp52_; -#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp49_ = _tmp53_ > 0; -#line 6766 "Tree.c" +#line 6902 "Tree.c" } else { -#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp49_ = FALSE; -#line 6770 "Tree.c" +#line 6906 "Tree.c" } -#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp49_) { -#line 6774 "Tree.c" +#line 6910 "Tree.c" SidebarInternalDropTargetEntry* _tmp54_; GeeList* _tmp55_; gboolean _tmp56_; -#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp54_ = targetable; -#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp55_ = media; -#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp56_ = sidebar_internal_drop_target_entry_internal_drop_received (_tmp54_, _tmp55_); -#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" success = _tmp56_; -#line 6786 "Tree.c" +#line 6922 "Tree.c" } -#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (media); -#line 6790 "Tree.c" +#line 6926 "Tree.c" } -#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp57_ = context; -#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp58_ = success; -#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp59_ = time; -#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_drag_finish (_tmp57_, _tmp58_, FALSE, (guint32) _tmp59_); -#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (targetable); -#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 6806 "Tree.c" +#line 6942 "Tree.c" } @@ -6827,90 +6963,90 @@ static gboolean sidebar_tree_real_drag_motion (GtkWidget* base, GdkDragContext* GdkDragContext* _tmp16_; GdkDragAction _tmp17_; guint _tmp18_; -#line 1109 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1124 "/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" +#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE); -#line 1111 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = context; -#line 1111 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = x; -#line 1111 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = y; -#line 1111 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = time; -#line 1111 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" GTK_WIDGET_CLASS (sidebar_tree_parent_class)->drag_motion (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = x; -#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = y; -#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = gtk_tree_view_get_dest_row_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp4_, _tmp5_, &_tmp6_, &_tmp7_); -#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" path = _tmp6_; -#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" pos = _tmp7_; -#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" has_dest = _tmp8_; -#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = has_dest; -#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (!_tmp10_) { -#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = TRUE; -#line 6865 "Tree.c" +#line 7001 "Tree.c" } else { GtkTreeViewDropPosition _tmp11_; -#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = pos; -#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = _tmp11_ == GTK_TREE_VIEW_DROP_BEFORE; -#line 6872 "Tree.c" +#line 7008 "Tree.c" } -#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp9_) { -#line 6876 "Tree.c" +#line 7012 "Tree.c" GtkTreePath* _tmp12_; -#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = path; -#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1134 "/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 6882 "Tree.c" +#line 7018 "Tree.c" } else { GtkTreeViewDropPosition _tmp13_; -#line 1120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = pos; -#line 1120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp13_ == GTK_TREE_VIEW_DROP_AFTER) { -#line 6889 "Tree.c" +#line 7025 "Tree.c" GtkTreePath* _tmp14_; -#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp14_ = path; -#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1136 "/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 6895 "Tree.c" +#line 7031 "Tree.c" } } -#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = context; -#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp16_ = context; -#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp17_ = gdk_drag_context_get_suggested_action (_tmp16_); -#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp18_ = time; -#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gdk_drag_status (_tmp15_, _tmp17_, (guint32) _tmp18_); -#line 1125 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = has_dest; -#line 1125 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (path); -#line 1125 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6914 "Tree.c" +#line 7050 "Tree.c" } @@ -6930,91 +7066,91 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa SidebarEntry* _tmp9_; GtkTreeSelection* _tmp10_; GtkTreePath* _tmp11_; -#line 1129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1144 "/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" +#line 1144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (path != NULL, FALSE); -#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = self->priv->editing_disabled; -#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp0_ > 0) { -#line 1131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 1131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6946 "Tree.c" +#line 7082 "Tree.c" } -#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = path; -#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = sidebar_tree_get_wrapper_at_path (self, _tmp1_); -#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp2_; -#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = wrapper; -#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp3_ == NULL) { -#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6964 "Tree.c" +#line 7100 "Tree.c" } -#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = wrapper; -#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = _tmp4_->entry; -#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp5_) : NULL); -#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" renameable = _tmp6_; -#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = renameable; -#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp7_ == NULL) { -#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (renameable); -#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 6986 "Tree.c" +#line 7122 "Tree.c" } -#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = wrapper; -#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = _tmp8_->entry; -#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, SIDEBAR_TYPE_HEADER)) { -#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (renameable); -#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 7002 "Tree.c" +#line 7138 "Tree.c" } -#line 1144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1159 "/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)); -#line 1144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = path; -#line 1144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" gtk_tree_selection_select_path (_tmp10_, _tmp11_); -#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; -#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (renameable); -#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 7018 "Tree.c" +#line 7154 "Tree.c" } @@ -7030,121 +7166,121 @@ static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path) SidebarDestroyableEntry* _tmp5_; SidebarDestroyableEntry* _tmp6_; SidebarDestroyableEntry* _tmp7_; -#line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1164 "/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" +#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (path != NULL, FALSE); -#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = path; -#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_); -#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp1_; -#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = wrapper; -#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp2_ == NULL) { -#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 7054 "Tree.c" +#line 7190 "Tree.c" } -#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = wrapper; -#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = _tmp3_->entry; -#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, SIDEBAR_TYPE_DESTROYABLE_ENTRY) ? ((SidebarDestroyableEntry*) _tmp4_) : NULL); -#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" destroyable = _tmp5_; -#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1170 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = destroyable; -#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1170 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp6_ == NULL) { -#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (destroyable); -#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 7076 "Tree.c" +#line 7212 "Tree.c" } -#line 1158 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = destroyable; -#line 1158 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_destroyable_entry_destroy_source (_tmp7_); -#line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = TRUE; -#line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (destroyable); -#line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 7090 "Tree.c" +#line 7226 "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" +#line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_tree_on_editing_done ((SidebarTree*) self); -#line 7097 "Tree.c" +#line 7233 "Tree.c" } static gboolean _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) { gboolean result; result = sidebar_tree_on_editing_focus_out ((SidebarTree*) self, event); -#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 7106 "Tree.c" +#line 7242 "Tree.c" } static void sidebar_tree_on_editing_started (SidebarTree* self, GtkCellEditable* editable, const gchar* path) { GtkCellEditable* _tmp0_; -#line 1163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1178 "/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" +#line 1178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (GTK_IS_CELL_EDITABLE (editable)); -#line 1163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_if_fail (path != NULL); -#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = editable; -#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_entry_get_type ())) { -#line 7122 "Tree.c" +#line 7258 "Tree.c" GtkCellEditable* _tmp1_; GtkEntry* _tmp2_; GtkEntry* _tmp3_; GtkEntry* _tmp4_; GtkEntry* _tmp5_; -#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = editable; -#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_entry_get_type (), GtkEntry)); -#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (self->priv->text_entry); -#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->text_entry = _tmp2_; -#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = self->priv->text_entry; -#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_CELL_EDITABLE, GtkCellEditable), "editing-done", (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self, 0); -#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = self->priv->text_entry; -#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event, self, 0); -#line 1168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = self->priv->text_entry; -#line 1168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_object_set (_tmp5_, "editable", TRUE, NULL); -#line 7148 "Tree.c" +#line 7284 "Tree.c" } } @@ -7155,25 +7291,25 @@ static void sidebar_tree_on_editing_canceled (SidebarTree* self) { guint _tmp2_; GtkEntry* _tmp3_; guint _tmp4_; -#line 1172 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1187 "/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" +#line 1188 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = self->priv->text_entry; -#line 1173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1188 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_object_set (_tmp0_, "editable", FALSE, NULL); -#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = self->priv->text_entry; -#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_parse_name ("editing-done", GTK_TYPE_CELL_EDITABLE, &_tmp2_, NULL, FALSE); -#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_CELL_EDITABLE, GtkCellEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self); -#line 1176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1191 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = self->priv->text_entry; -#line 1176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1191 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp4_, NULL, FALSE); -#line 1176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1191 "/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 7177 "Tree.c" +#line 7313 "Tree.c" } @@ -7189,110 +7325,112 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) { guint _tmp14_; GtkEntry* _tmp15_; guint _tmp16_; -#line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1194 "/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" +#line 1195 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = self->priv->text_entry; -#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1195 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_object_set (_tmp0_, "editable", FALSE, NULL); -#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = sidebar_tree_get_current_path (self); -#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = _tmp1_; -#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = sidebar_tree_get_wrapper_at_path (self, _tmp2_); -#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = _tmp3_; -#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _gtk_tree_path_free0 (_tmp2_); -#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" wrapper = _tmp4_; -#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = wrapper; -#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp5_ != NULL) { -#line 7215 "Tree.c" +#line 7351 "Tree.c" SidebarRenameableEntry* renameable = NULL; SidebarTreeEntryWrapper* _tmp6_; SidebarEntry* _tmp7_; SidebarRenameableEntry* _tmp8_; SidebarRenameableEntry* _tmp9_; -#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = wrapper; -#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp7_ = _tmp6_->entry; -#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp7_) : NULL); -#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" renameable = _tmp8_; -#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp9_ = renameable; -#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" if (_tmp9_ != NULL) { -#line 7233 "Tree.c" +#line 7369 "Tree.c" SidebarRenameableEntry* _tmp10_; GtkEntry* _tmp11_; const gchar* _tmp12_; -#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp10_ = renameable; -#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp11_ = self->priv->text_entry; -#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp12_ = gtk_entry_get_text (_tmp11_); -#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" sidebar_renameable_entry_rename (_tmp10_, _tmp12_); -#line 7245 "Tree.c" +#line 7381 "Tree.c" } -#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (renameable); -#line 7249 "Tree.c" +#line 7385 "Tree.c" } -#line 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp13_ = self->priv->text_entry; -#line 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_parse_name ("editing-done", GTK_TYPE_CELL_EDITABLE, &_tmp14_, NULL, FALSE); -#line 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_CELL_EDITABLE, GtkCellEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self); -#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp15_ = self->priv->text_entry; -#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp16_, NULL, FALSE); -#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" 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" +#line 1194 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (wrapper); -#line 7265 "Tree.c" +#line 7401 "Tree.c" } static gboolean sidebar_tree_on_editing_focus_out (SidebarTree* self, GdkEventFocus* event) { gboolean result = FALSE; -#line 1193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE); -#line 1193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1212 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" result = FALSE; -#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1212 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 7279 "Tree.c" +#line 7415 "Tree.c" } static void sidebar_tree_on_new_search (SidebarTree* self) { SavedSearchDialog* _tmp0_; SavedSearchDialog* _tmp1_; -#line 1200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1215 "/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" +#line 1216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = saved_search_dialog_new (); -#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + g_object_ref_sink (_tmp0_); +#line 1216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = _tmp0_; -#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" saved_search_dialog_show (_tmp1_); -#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" - _saved_search_dialog_unref0 (_tmp1_); -#line 7296 "Tree.c" +#line 1216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" + _g_object_unref0 (_tmp1_); +#line 7434 "Tree.c" } @@ -7305,37 +7443,37 @@ static void sidebar_tree_on_new_tag (SidebarTree* self) { LibraryWindow* _tmp4_; Tag* _tmp5_; Tag* _tmp6_; -#line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1219 "/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" +#line 1220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = new_root_tag_command_new (); -#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" creation_command = _tmp0_; -#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp1_ = app_window_get_command_manager (); -#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = _tmp1_; -#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" command_manager_execute (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (creation_command, TYPE_COMMAND, Command)); -#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _command_manager_unref0 (_tmp2_); -#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp3_ = library_window_get_app (); -#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp4_ = _tmp3_; -#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp5_ = new_root_tag_command_get_created_tag (creation_command); -#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp6_ = _tmp5_; -#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" library_window_rename_tag_in_sidebar (_tmp4_, _tmp6_); -#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (_tmp6_); -#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (_tmp4_); -#line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 1219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (creation_command); -#line 7339 "Tree.c" +#line 7477 "Tree.c" } @@ -7354,19 +7492,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 7358 "Tree.c" +#line 7496 "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 7364 "Tree.c" +#line 7502 "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 7370 "Tree.c" +#line 7508 "Tree.c" } @@ -7385,19 +7523,19 @@ 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 7389 "Tree.c" +#line 7527 "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 7395 "Tree.c" +#line 7533 "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 7401 "Tree.c" +#line 7539 "Tree.c" } @@ -7436,14 +7574,14 @@ 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 7440 "Tree.c" +#line 7578 "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 7447 "Tree.c" +#line 7585 "Tree.c" } @@ -7461,7 +7599,7 @@ static GtkTreePath* sidebar_tree_entry_wrapper_get_path (SidebarTreeEntryWrapper result = _tmp1_; #line 25 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" return result; -#line 7465 "Tree.c" +#line 7603 "Tree.c" } @@ -7501,7 +7639,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 7505 "Tree.c" +#line 7643 "Tree.c" } @@ -7510,7 +7648,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 7514 "Tree.c" +#line 7652 "Tree.c" } @@ -7528,7 +7666,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 7532 "Tree.c" +#line 7670 "Tree.c" } @@ -7570,14 +7708,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 7574 "Tree.c" +#line 7712 "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 7581 "Tree.c" +#line 7719 "Tree.c" } @@ -7586,7 +7724,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 7590 "Tree.c" +#line 7728 "Tree.c" } @@ -7600,7 +7738,7 @@ static void sidebar_tree_root_wrapper_finalize (GObject * obj) { 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 7604 "Tree.c" +#line 7742 "Tree.c" } @@ -7651,7 +7789,7 @@ static void sidebar_tree_class_init (SidebarTreeClass * klass) { 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" 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" +#line 7793 "Tree.c" } @@ -7663,7 +7801,7 @@ static void sidebar_tree_instance_init (SidebarTree * self) { #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" - _tmp0_ = gtk_tree_store_new ((gint) SIDEBAR_TREE_COLUMNS_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, G_TYPE_STRING); + _tmp0_ = gtk_tree_store_new ((gint) SIDEBAR_TREE_COLUMNS_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, g_icon_get_type ()); #line 55 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" self->priv->store = _tmp0_; #line 62 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" @@ -7698,7 +7836,7 @@ 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 7702 "Tree.c" +#line 7840 "Tree.c" } @@ -7710,17 +7848,17 @@ static void sidebar_tree_finalize (GObject * obj) { 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" +#line 155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp0_ = self->priv->text_renderer; -#line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_parse_name ("editing-canceled", gtk_cell_renderer_get_type (), &_tmp1_, NULL, FALSE); -#line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_cell_renderer_get_type (), GtkCellRenderer), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _sidebar_tree_on_editing_canceled_gtk_cell_renderer_editing_canceled, self); -#line 157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _tmp2_ = self->priv->text_renderer; -#line 157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_parse_name ("editing-started", gtk_cell_renderer_get_type (), &_tmp3_, NULL, FALSE); -#line 157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" +#line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_cell_renderer_get_type (), GtkCellRenderer), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _sidebar_tree_on_editing_started_gtk_cell_renderer_editing_started, self); #line 55 "/home/jens/Source/shotwell/src/sidebar/Tree.vala" _g_object_unref0 (self->priv->store); @@ -7742,7 +7880,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 7746 "Tree.c" +#line 7884 "Tree.c" } diff --git a/src/sidebar/Tree.vala b/src/sidebar/Tree.vala index a3fc8bf..c707c63 100644 --- a/src/sidebar/Tree.vala +++ b/src/sidebar/Tree.vala @@ -56,7 +56,7 @@ public class Sidebar.Tree : Gtk.TreeView { typeof (string), // NAME typeof (string?), // TOOLTIP typeof (EntryWrapper), // WRAPPER - typeof (string?) // ICON + typeof (Icon?) // ICON ); private Gtk.Builder builder = new Gtk.Builder (); @@ -93,14 +93,13 @@ public class Sidebar.Tree : Gtk.TreeView { public Tree(Gtk.TargetEntry[] target_entries, Gdk.DragAction actions, ExternalDropHandler drop_handler) { set_model(store); - get_style_context().add_class("sidebar"); Gtk.TreeViewColumn text_column = new Gtk.TreeViewColumn(); text_column.set_expand(true); Gtk.CellRendererPixbuf icon_renderer = new Gtk.CellRendererPixbuf(); icon_renderer.follow_state = true; - text_column.pack_start(icon_renderer, false); - text_column.add_attribute(icon_renderer, "icon_name", Columns.ICON); + text_column.pack_start (icon_renderer, false); + text_column.add_attribute(icon_renderer, "gicon", Columns.ICON); text_column.set_cell_data_func(icon_renderer, icon_renderer_function); text_renderer = new Gtk.CellRendererText(); text_renderer.ellipsize = Pango.EllipsizeMode.END; @@ -736,10 +735,17 @@ public class Sidebar.Tree : Gtk.TreeView { store.set(wrapper.get_iter(), Columns.TOOLTIP, guarded_markup_escape_text(tooltip)); } - private void on_sidebar_icon_changed(Sidebar.Entry entry, string? icon) { + private void on_sidebar_icon_changed(Sidebar.Entry entry, string? icon_name) { EntryWrapper? wrapper = get_wrapper(entry); assert(wrapper != null); - + Icon? icon = null; + + try { + if (icon_name != null) { + icon = Icon.new_for_string (icon_name); + } + } catch (Error e) { } + store.set(wrapper.get_iter(), Columns.ICON, icon); } @@ -768,9 +774,18 @@ public class Sidebar.Tree : Gtk.TreeView { private void load_entry_icons(Gtk.TreeIter iter) { EntryWrapper? wrapper = get_wrapper_at_iter(iter); + Icon? icon = null; if (wrapper == null) return; - string? icon = wrapper.entry.get_sidebar_icon(); + + try { + string? name = wrapper.entry.get_sidebar_icon(); + if (name != null) { + icon = Icon.new_for_string (name); + } + } catch (Error e) { } + + store.set(iter, Columns.ICON, icon); } diff --git a/src/sidebar/common.c b/src/sidebar/common.c index 4b46c50..eebbd0d 100644 --- a/src/sidebar/common.c +++ b/src/sidebar/common.c @@ -342,8 +342,8 @@ GType sidebar_header_get_type (void) G_GNUC_CONST; enum { SIDEBAR_HEADER_DUMMY_PROPERTY }; -SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized); -SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized); +SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized); +SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized); static gboolean sidebar_header_real_is_emphasized (SidebarEmphasizableEntry* base); static void sidebar_header_finalize (GObject * obj); GtkMenu* sidebar_contextable_get_sidebar_context_menu (SidebarContextable* self, GdkEventButton* event); @@ -1033,30 +1033,33 @@ GType sidebar_root_only_branch_get_type (void) { } -SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized) { +SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized) { SidebarHeader * self = NULL; const gchar* _tmp0_; - gboolean _tmp1_; + const gchar* _tmp1_; + gboolean _tmp2_; #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" _tmp0_ = name; #line 124 "/home/jens/Source/shotwell/src/sidebar/common.vala" - self = (SidebarHeader*) sidebar_grouping_construct (object_type, _tmp0_, NULL, NULL); + _tmp1_ = tooltip; +#line 124 "/home/jens/Source/shotwell/src/sidebar/common.vala" + self = (SidebarHeader*) sidebar_grouping_construct (object_type, _tmp0_, NULL, _tmp1_); #line 125 "/home/jens/Source/shotwell/src/sidebar/common.vala" - _tmp1_ = emphasized; + _tmp2_ = emphasized; #line 125 "/home/jens/Source/shotwell/src/sidebar/common.vala" - self->priv->emphasized = _tmp1_; + self->priv->emphasized = _tmp2_; #line 123 "/home/jens/Source/shotwell/src/sidebar/common.vala" return self; -#line 1053 "common.c" +#line 1056 "common.c" } -SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized) { +SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized) { #line 123 "/home/jens/Source/shotwell/src/sidebar/common.vala" - return sidebar_header_construct (SIDEBAR_TYPE_HEADER, name, emphasized); -#line 1060 "common.c" + return sidebar_header_construct (SIDEBAR_TYPE_HEADER, name, tooltip, emphasized); +#line 1063 "common.c" } @@ -1072,7 +1075,7 @@ static gboolean sidebar_header_real_is_emphasized (SidebarEmphasizableEntry* bas result = _tmp0_; #line 129 "/home/jens/Source/shotwell/src/sidebar/common.vala" return result; -#line 1076 "common.c" +#line 1079 "common.c" } @@ -1083,7 +1086,7 @@ static void sidebar_header_class_init (SidebarHeaderClass * klass) { g_type_class_add_private (klass, sizeof (SidebarHeaderPrivate)); #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala" G_OBJECT_CLASS (klass)->finalize = sidebar_header_finalize; -#line 1087 "common.c" +#line 1090 "common.c" } @@ -1092,14 +1095,14 @@ static void sidebar_header_sidebar_emphasizable_entry_interface_init (SidebarEmp 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; -#line 1096 "common.c" +#line 1099 "common.c" } static void sidebar_header_instance_init (SidebarHeader * self) { #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala" self->priv = SIDEBAR_HEADER_GET_PRIVATE (self); -#line 1103 "common.c" +#line 1106 "common.c" } @@ -1109,7 +1112,7 @@ static void sidebar_header_finalize (GObject * obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_HEADER, SidebarHeader); #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala" G_OBJECT_CLASS (sidebar_header_parent_class)->finalize (obj); -#line 1113 "common.c" +#line 1116 "common.c" } @@ -1139,7 +1142,7 @@ GtkMenu* sidebar_contextable_get_sidebar_context_menu (SidebarContextable* self, g_return_val_if_fail (SIDEBAR_IS_CONTEXTABLE (self), NULL); #line 135 "/home/jens/Source/shotwell/src/sidebar/common.vala" return SIDEBAR_CONTEXTABLE_GET_INTERFACE (self)->get_sidebar_context_menu (self, event); -#line 1143 "common.c" +#line 1146 "common.c" } @@ -1150,7 +1153,7 @@ static void sidebar_contextable_base_init (SidebarContextableIface * iface) { if (!initialized) { #line 133 "/home/jens/Source/shotwell/src/sidebar/common.vala" initialized = TRUE; -#line 1154 "common.c" +#line 1157 "common.c" } } diff --git a/src/sidebar/common.vala b/src/sidebar/common.vala index c5a4764..0467ce3 100644 --- a/src/sidebar/common.vala +++ b/src/sidebar/common.vala @@ -120,8 +120,8 @@ public class Sidebar.RootOnlyBranch : Sidebar.Branch { public class Sidebar.Header : Sidebar.Grouping, Sidebar.EmphasizableEntry { private bool emphasized; - public Header(string name, bool emphasized = true) { - base(name, null); + public Header(string name, string? tooltip = null, bool emphasized = true) { + base(name, null, tooltip); this.emphasized = emphasized; } -- cgit v1.2.3