summaryrefslogtreecommitdiff
path: root/src/publishing
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-11-25 04:10:33 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-11-25 04:10:33 +0100
commit4a3f1fdfe1eb3743564adcee35d5513224339260 (patch)
tree1bcc97c9bd5abcf181b9f19294a0f187ff8af103 /src/publishing
parent7152401783578b56343f578b4ec920998660de33 (diff)
New upstream version 0.25.1upstream/0.25.1
Diffstat (limited to 'src/publishing')
-rw-r--r--src/publishing/PublishingUI.c2060
-rw-r--r--src/publishing/PublishingUI.vala69
2 files changed, 1072 insertions, 1057 deletions
diff --git a/src/publishing/PublishingUI.c b/src/publishing/PublishingUI.c
index ad6c097..fbe90d8 100644
--- a/src/publishing/PublishingUI.c
+++ b/src/publishing/PublishingUI.c
@@ -1077,119 +1077,98 @@ GType publishing_ui_progress_pane_get_type (void) {
PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type, SpitPublishingPublisherMediaType published_media, gint num_uploaded) {
PublishingUISuccessPane * self = NULL;
gchar* message_string = NULL;
- gint _tmp0_ = 0;
- const gchar* _tmp14_ = NULL;
+ SpitPublishingPublisherMediaType _tmp0_ = 0;
+ const gchar* _tmp11_ = NULL;
#line 99 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
message_string = NULL;
#line 103 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp0_ = num_uploaded;
+ _tmp0_ = published_media;
#line 103 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp0_ > 1) {
+ if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
#line 1089 "PublishingUI.c"
- SpitPublishingPublisherMediaType _tmp1_ = 0;
+ gint _tmp1_ = 0;
+ const gchar* _tmp2_ = NULL;
+ gchar* _tmp3_ = NULL;
#line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp1_ = published_media;
+ _tmp1_ = num_uploaded;
#line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp1_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
-#line 1095 "PublishingUI.c"
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
-#line 105 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp2_ = _ ("The selected photos/videos were successfully published.");
-#line 105 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp3_ = g_strdup (_tmp2_);
-#line 105 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_free0 (message_string);
-#line 105 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- message_string = _tmp3_;
-#line 1106 "PublishingUI.c"
- } else {
- SpitPublishingPublisherMediaType _tmp4_ = 0;
-#line 106 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp4_ = published_media;
-#line 106 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp4_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 1113 "PublishingUI.c"
- const gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
-#line 107 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp5_ = _ ("The selected videos were successfully published.");
-#line 107 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp6_ = g_strdup (_tmp5_);
-#line 107 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_free0 (message_string);
-#line 107 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- message_string = _tmp6_;
-#line 1124 "PublishingUI.c"
- } else {
- const gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
+ _tmp2_ = ngettext ("The selected video was successfully published.", "The selected videos were successfully published.", (gulong) _tmp1_);
+#line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp3_ = g_strdup (_tmp2_);
+#line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_free0 (message_string);
+#line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ message_string = _tmp3_;
+#line 1103 "PublishingUI.c"
+ } else {
+ SpitPublishingPublisherMediaType _tmp4_ = 0;
+#line 108 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp4_ = published_media;
+#line 108 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (_tmp4_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
+#line 1110 "PublishingUI.c"
+ gint _tmp5_ = 0;
+ const gchar* _tmp6_ = NULL;
+ gchar* _tmp7_ = NULL;
#line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp7_ = _ ("The selected photos were successfully published.");
+ _tmp5_ = num_uploaded;
#line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp8_ = g_strdup (_tmp7_);
+ _tmp6_ = ngettext ("The selected video was successfully published.", "The selected videos were successfully published.", (gulong) _tmp5_);
#line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_free0 (message_string);
+ _tmp7_ = g_strdup (_tmp6_);
#line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- message_string = _tmp8_;
-#line 1136 "PublishingUI.c"
- }
- }
- } else {
- SpitPublishingPublisherMediaType _tmp9_ = 0;
-#line 111 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp9_ = published_media;
-#line 111 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp9_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 1145 "PublishingUI.c"
- const gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
-#line 112 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp10_ = _ ("The selected video was successfully published.");
-#line 112 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp11_ = g_strdup (_tmp10_);
-#line 112 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (message_string);
-#line 112 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- message_string = _tmp11_;
-#line 1156 "PublishingUI.c"
+#line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ message_string = _tmp7_;
+#line 1124 "PublishingUI.c"
} else {
- const gchar* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
-#line 114 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp12_ = _ ("The selected photo was successfully published.");
-#line 114 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp13_ = g_strdup (_tmp12_);
-#line 114 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_free0 (message_string);
-#line 114 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- message_string = _tmp13_;
-#line 1168 "PublishingUI.c"
+ SpitPublishingPublisherMediaType _tmp8_ = 0;
+#line 113 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp8_ = published_media;
+#line 113 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (_tmp8_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
+#line 1131 "PublishingUI.c"
+ const gchar* _tmp9_ = NULL;
+ gchar* _tmp10_ = NULL;
+#line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp9_ = _ ("The selected photos/videos were successfully published.");
+#line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp10_ = g_strdup (_tmp9_);
+#line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_free0 (message_string);
+#line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ message_string = _tmp10_;
+#line 1142 "PublishingUI.c"
+ } else {
+#line 118 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_assert_not_reached ();
+#line 1146 "PublishingUI.c"
+ }
}
}
-#line 116 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp14_ = message_string;
-#line 116 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self = (PublishingUISuccessPane*) publishing_ui_static_message_pane_construct (object_type, _tmp14_, FALSE);
+#line 121 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp11_ = message_string;
+#line 121 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ self = (PublishingUISuccessPane*) publishing_ui_static_message_pane_construct (object_type, _tmp11_, FALSE);
#line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (message_string);
#line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self;
-#line 1179 "PublishingUI.c"
+#line 1158 "PublishingUI.c"
}
PublishingUISuccessPane* publishing_ui_success_pane_new (SpitPublishingPublisherMediaType published_media, gint num_uploaded) {
#line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return publishing_ui_success_pane_construct (PUBLISHING_UI_TYPE_SUCCESS_PANE, published_media, num_uploaded);
-#line 1186 "PublishingUI.c"
+#line 1165 "PublishingUI.c"
}
static void publishing_ui_success_pane_class_init (PublishingUISuccessPaneClass * klass) {
#line 97 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_success_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1193 "PublishingUI.c"
+#line 1172 "PublishingUI.c"
}
@@ -1212,27 +1191,27 @@ GType publishing_ui_success_pane_get_type (void) {
PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_construct (GType object_type) {
PublishingUIAccountFetchWaitPane * self = NULL;
const gchar* _tmp0_ = NULL;
-#line 122 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 127 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = _ ("Fetching account information…");
-#line 122 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 127 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self = (PublishingUIAccountFetchWaitPane*) publishing_ui_static_message_pane_construct (object_type, _tmp0_, FALSE);
-#line 121 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 126 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self;
-#line 1222 "PublishingUI.c"
+#line 1201 "PublishingUI.c"
}
PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_new (void) {
-#line 121 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 126 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return publishing_ui_account_fetch_wait_pane_construct (PUBLISHING_UI_TYPE_ACCOUNT_FETCH_WAIT_PANE);
-#line 1229 "PublishingUI.c"
+#line 1208 "PublishingUI.c"
}
static void publishing_ui_account_fetch_wait_pane_class_init (PublishingUIAccountFetchWaitPaneClass * klass) {
-#line 120 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 125 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_account_fetch_wait_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1236 "PublishingUI.c"
+#line 1215 "PublishingUI.c"
}
@@ -1255,27 +1234,27 @@ GType publishing_ui_account_fetch_wait_pane_get_type (void) {
PublishingUILoginWaitPane* publishing_ui_login_wait_pane_construct (GType object_type) {
PublishingUILoginWaitPane * self = NULL;
const gchar* _tmp0_ = NULL;
-#line 128 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 133 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = _ ("Logging in…");
-#line 128 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 133 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self = (PublishingUILoginWaitPane*) publishing_ui_static_message_pane_construct (object_type, _tmp0_, FALSE);
-#line 127 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self;
-#line 1265 "PublishingUI.c"
+#line 1244 "PublishingUI.c"
}
PublishingUILoginWaitPane* publishing_ui_login_wait_pane_new (void) {
-#line 127 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return publishing_ui_login_wait_pane_construct (PUBLISHING_UI_TYPE_LOGIN_WAIT_PANE);
-#line 1272 "PublishingUI.c"
+#line 1251 "PublishingUI.c"
}
static void publishing_ui_login_wait_pane_class_init (PublishingUILoginWaitPaneClass * klass) {
-#line 126 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 131 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_login_wait_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1279 "PublishingUI.c"
+#line 1258 "PublishingUI.c"
}
@@ -1298,40 +1277,40 @@ GType publishing_ui_login_wait_pane_get_type (void) {
static gboolean _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
gboolean result;
result = publishing_ui_publishing_dialog_on_window_close ((PublishingUIPublishingDialog*) self, event);
-#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 1304 "PublishingUI.c"
+#line 1283 "PublishingUI.c"
}
static void _vala_array_add55 (SpitPublishingPublishable*** array, int* length, int* size, SpitPublishingPublishable* value) {
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((*length) == (*size)) {
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*array = g_renew (SpitPublishingPublishable*, *array, (*size) + 1);
-#line 1315 "PublishingUI.c"
+#line 1294 "PublishingUI.c"
}
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[(*length)++] = value;
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[*length] = NULL;
-#line 1321 "PublishingUI.c"
+#line 1300 "PublishingUI.c"
}
static void _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_on_service_changed ((PublishingUIPublishingDialog*) self);
-#line 1328 "PublishingUI.c"
+#line 1307 "PublishingUI.c"
}
static void _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_on_close_cancel_clicked ((PublishingUIPublishingDialog*) self);
-#line 1335 "PublishingUI.c"
+#line 1314 "PublishingUI.c"
}
@@ -1386,85 +1365,85 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
gint _tmp65__length1 = 0;
GtkComboBox* _tmp103_ = NULL;
gboolean _tmp104_ = FALSE;
- GtkBox* _tmp130_ = NULL;
- GtkBox* _tmp131_ = NULL;
- GtkBox* _tmp132_ = NULL;
- GtkButton* _tmp133_ = NULL;
- GtkButton* _tmp134_ = NULL;
- GtkButton* _tmp135_ = NULL;
- gboolean _tmp136_ = FALSE;
-#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ GtkBox* _tmp134_ = NULL;
+ GtkBox* _tmp135_ = NULL;
+ GtkBox* _tmp136_ = NULL;
+ gboolean _tmp137_ = FALSE;
+ GtkButton* _tmp147_ = NULL;
+#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_val_if_fail (GEE_IS_COLLECTION (to_publish), NULL);
-#line 157 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = to_publish;
-#line 157 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 157 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp2_ = _tmp1_;
-#line 157 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_vala_assert (_tmp2_ > 0, "to_publish.size > 0");
-#line 160 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 164 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ use_header = FALSE;
+#line 165 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp3_ = gtk_settings_get_default ();
-#line 160 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 165 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp5_ = use_header;
-#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp5_) {
-#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp4_ = 1;
-#line 1417 "PublishingUI.c"
+#line 1396 "PublishingUI.c"
} else {
-#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp4_ = 0;
-#line 1421 "PublishingUI.c"
+#line 1400 "PublishingUI.c"
}
-#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self = (PublishingUIPublishingDialog*) g_object_new (object_type, "use-header-bar", _tmp4_, NULL);
-#line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 167 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp6_ = use_header;
-#line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 167 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp6_) {
-#line 1429 "PublishingUI.c"
+#line 1408 "PublishingUI.c"
GtkWidget* _tmp7_ = NULL;
-#line 163 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp7_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 163 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE);
-#line 1435 "PublishingUI.c"
+#line 1414 "PublishingUI.c"
}
-#line 165 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 170 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event, self, 0);
-#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp8_ = g_new0 (SpitPublishingPublishable*, 0 + 1);
-#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->publishables = _tmp8_;
-#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->publishables_length1 = 0;
-#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->_publishables_size_ = self->priv->publishables_length1;
-#line 169 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
has_photos = FALSE;
-#line 170 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
has_videos = FALSE;
-#line 1455 "PublishingUI.c"
+#line 1434 "PublishingUI.c"
{
GeeIterator* _media_it = NULL;
GeeCollection* _tmp9_ = NULL;
GeeIterator* _tmp10_ = NULL;
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp9_ = to_publish;
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_media_it = _tmp10_;
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
while (TRUE) {
-#line 1468 "PublishingUI.c"
+#line 1447 "PublishingUI.c"
GeeIterator* _tmp11_ = NULL;
gboolean _tmp12_ = FALSE;
MediaSource* media = NULL;
@@ -1479,294 +1458,294 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
gint _tmp21__length1 = 0;
SpitPublishingPublishable* _tmp22_ = NULL;
SpitPublishingPublishable* _tmp23_ = NULL;
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp11_ = _media_it;
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp12_ = gee_iterator_next (_tmp11_);
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (!_tmp12_) {
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
break;
-#line 1491 "PublishingUI.c"
+#line 1470 "PublishingUI.c"
}
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp13_ = _media_it;
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp14_ = gee_iterator_get (_tmp13_);
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
media = (MediaSource*) _tmp14_;
-#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp15_ = media;
-#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp16_ = publishing_glue_media_source_publishable_wrapper_new (_tmp15_);
-#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishable = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_PUBLISHING_TYPE_PUBLISHABLE, SpitPublishingPublishable);
-#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp17_ = publishable;
-#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp18_ = spit_publishing_publishable_get_media_type (_tmp17_);
-#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp18_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
has_photos = TRUE;
-#line 1513 "PublishingUI.c"
+#line 1492 "PublishingUI.c"
} else {
SpitPublishingPublishable* _tmp19_ = NULL;
SpitPublishingPublisherMediaType _tmp20_ = 0;
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp19_ = publishable;
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp20_ = spit_publishing_publishable_get_media_type (_tmp19_);
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp20_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 182 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
has_videos = TRUE;
-#line 1525 "PublishingUI.c"
+#line 1504 "PublishingUI.c"
} else {
-#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 184 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_assert_not_reached ();
-#line 1529 "PublishingUI.c"
+#line 1508 "PublishingUI.c"
}
}
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp21_ = self->priv->publishables;
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp21__length1 = self->priv->publishables_length1;
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp22_ = publishable;
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp23_ = _g_object_ref0 (_tmp22_);
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_vala_array_add55 (&self->priv->publishables, &self->priv->publishables_length1, &self->priv->_publishables_size_, _tmp23_);
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (publishable);
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (media);
-#line 1546 "PublishingUI.c"
+#line 1525 "PublishingUI.c"
}
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (_media_it);
-#line 1550 "PublishingUI.c"
+#line 1529 "PublishingUI.c"
}
-#line 184 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 189 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
title = NULL;
-#line 185 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
label = NULL;
-#line 187 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp25_ = has_photos;
-#line 187 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp25_) {
-#line 1560 "PublishingUI.c"
+#line 1539 "PublishingUI.c"
gboolean _tmp26_ = FALSE;
-#line 187 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp26_ = has_videos;
-#line 187 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp24_ = !_tmp26_;
-#line 1566 "PublishingUI.c"
+#line 1545 "PublishingUI.c"
} else {
-#line 187 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp24_ = FALSE;
-#line 1570 "PublishingUI.c"
+#line 1549 "PublishingUI.c"
}
-#line 187 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp24_) {
-#line 1574 "PublishingUI.c"
+#line 1553 "PublishingUI.c"
const gchar* _tmp27_ = NULL;
gchar* _tmp28_ = NULL;
const gchar* _tmp29_ = NULL;
gchar* _tmp30_ = NULL;
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp27_ = _ ("Publish Photos");
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp28_ = g_strdup (_tmp27_);
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (title);
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
title = _tmp28_;
-#line 189 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp29_ = _ ("Publish photos _to:");
-#line 189 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp30_ = g_strdup (_tmp29_);
-#line 189 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (label);
-#line 189 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
label = _tmp30_;
-#line 1595 "PublishingUI.c"
+#line 1574 "PublishingUI.c"
} else {
gboolean _tmp31_ = FALSE;
gboolean _tmp32_ = FALSE;
-#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp32_ = has_photos;
-#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (!_tmp32_) {
-#line 1603 "PublishingUI.c"
+#line 1582 "PublishingUI.c"
gboolean _tmp33_ = FALSE;
-#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp33_ = has_videos;
-#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp31_ = _tmp33_;
-#line 1609 "PublishingUI.c"
+#line 1588 "PublishingUI.c"
} else {
-#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp31_ = FALSE;
-#line 1613 "PublishingUI.c"
+#line 1592 "PublishingUI.c"
}
-#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp31_) {
-#line 1617 "PublishingUI.c"
+#line 1596 "PublishingUI.c"
const gchar* _tmp34_ = NULL;
gchar* _tmp35_ = NULL;
const gchar* _tmp36_ = NULL;
gchar* _tmp37_ = NULL;
-#line 191 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp34_ = _ ("Publish Videos");
-#line 191 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp35_ = g_strdup (_tmp34_);
-#line 191 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (title);
-#line 191 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
title = _tmp35_;
-#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp36_ = _ ("Publish videos _to");
-#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp37_ = g_strdup (_tmp36_);
-#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (label);
-#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
label = _tmp37_;
-#line 1638 "PublishingUI.c"
+#line 1617 "PublishingUI.c"
} else {
const gchar* _tmp38_ = NULL;
gchar* _tmp39_ = NULL;
const gchar* _tmp40_ = NULL;
gchar* _tmp41_ = NULL;
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp38_ = _ ("Publish Photos and Videos");
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp39_ = g_strdup (_tmp38_);
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (title);
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
title = _tmp39_;
-#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp40_ = _ ("Publish photos and videos _to");
-#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp41_ = g_strdup (_tmp40_);
-#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (label);
-#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
label = _tmp41_;
-#line 1660 "PublishingUI.c"
+#line 1639 "PublishingUI.c"
}
}
-#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp42_ = title;
-#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp42_);
-#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp43_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
-#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->service_selector_box_model);
-#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->service_selector_box_model = _tmp43_;
-#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 205 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp44_ = self->priv->service_selector_box_model;
-#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 205 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp45_ = (GtkComboBox*) gtk_combo_box_new_with_model (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 205 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_object_ref_sink (_tmp45_);
-#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 205 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->service_selector_box);
-#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 205 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->service_selector_box = _tmp45_;
-#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp46_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
-#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_object_ref_sink (_tmp46_);
-#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
renderer_pix = _tmp46_;
-#line 203 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp47_ = self->priv->service_selector_box;
-#line 203 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp48_ = renderer_pix;
-#line 203 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
-#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp49_ = self->priv->service_selector_box;
-#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp50_ = renderer_pix;
-#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0);
-#line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp51_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_object_ref_sink (_tmp51_);
-#line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
renderer_text = _tmp51_;
-#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp52_ = self->priv->service_selector_box;
-#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp53_ = renderer_text;
-#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
-#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp54_ = self->priv->service_selector_box;
-#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp55_ = renderer_text;
-#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1);
-#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp56_ = self->priv->service_selector_box;
-#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_combo_box_set_active (_tmp56_, 0);
-#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp57_ = config_facade_get_instance ();
-#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp58_ = _tmp57_;
-#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp59_ = configuration_facade_get_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp60_ = _tmp59_;
-#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (_tmp58_);
-#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
last_used_service = _tmp60_;
-#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp61_ = has_photos;
-#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp62_ = has_videos;
-#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp64_ = publishing_ui_publishing_dialog_load_services (_tmp61_, _tmp62_, &_tmp63_);
-#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
loaded_services = _tmp64_;
-#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
loaded_services_length1 = _tmp63_;
-#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_loaded_services_size_ = loaded_services_length1;
-#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp65_ = loaded_services;
-#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp65__length1 = loaded_services_length1;
-#line 1751 "PublishingUI.c"
+#line 1730 "PublishingUI.c"
{
SpitPublishingService** service_collection = NULL;
gint service_collection_length1 = 0;
gint _service_collection_size_ = 0;
gint service_it = 0;
-#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service_collection = _tmp65_;
-#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service_collection_length1 = _tmp65__length1;
-#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
for (service_it = 0; service_it < _tmp65__length1; service_it = service_it + 1) {
-#line 1763 "PublishingUI.c"
+#line 1742 "PublishingUI.c"
SpitPublishingService* _tmp66_ = NULL;
SpitPublishingService* service = NULL;
-#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp66_ = _g_object_ref0 (service_collection[service_it]);
-#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service = _tmp66_;
-#line 1770 "PublishingUI.c"
+#line 1749 "PublishingUI.c"
{
GtkListStore* _tmp67_ = NULL;
GtkTreeIter _tmp68_ = {0};
@@ -1780,53 +1759,53 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
GdkPixbuf** _tmp75_ = NULL;
gint _tmp75__length1 = 0;
const gchar* _tmp93_ = NULL;
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 225 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp67_ = self->priv->service_selector_box_model;
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 225 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_list_store_append (_tmp67_, &_tmp68_);
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 225 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
iter = _tmp68_;
-#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp69_ = service;
-#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp70_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp71_ = g_strdup (_tmp70_);
-#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
curr_service_id = _tmp71_;
-#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp72_ = service;
-#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
spit_pluggable_get_info (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, SPIT_TYPE_PLUGGABLE, SpitPluggable), &self->priv->info);
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp74_ = self->priv->info;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp75_ = _tmp74_.icons;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp75__length1 = _tmp74_.icons_length1;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (NULL != _tmp75_) {
-#line 1810 "PublishingUI.c"
+#line 1789 "PublishingUI.c"
SpitPluggableInfo _tmp76_ = {0};
GdkPixbuf** _tmp77_ = NULL;
gint _tmp77__length1 = 0;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp76_ = self->priv->info;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp77_ = _tmp76_.icons;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp77__length1 = _tmp76_.icons_length1;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp73_ = 0 < _tmp77__length1;
-#line 1822 "PublishingUI.c"
+#line 1801 "PublishingUI.c"
} else {
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp73_ = FALSE;
-#line 1826 "PublishingUI.c"
+#line 1805 "PublishingUI.c"
}
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp73_) {
-#line 1830 "PublishingUI.c"
+#line 1809 "PublishingUI.c"
GtkListStore* _tmp78_ = NULL;
GtkTreeIter _tmp79_ = {0};
SpitPluggableInfo _tmp80_ = {0};
@@ -1837,33 +1816,33 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
const gchar* _tmp84_ = NULL;
GdkPixbuf* _tmp85_ = NULL;
GdkPixbuf* _tmp86_ = NULL;
-#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp78_ = self->priv->service_selector_box_model;
-#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp79_ = iter;
-#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp80_ = self->priv->info;
-#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp81_ = _tmp80_.icons;
-#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp81__length1 = _tmp80_.icons_length1;
-#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp82_ = _tmp81_[0];
-#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp83_ = service;
-#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp84_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_list_store_set (_tmp78_, &_tmp79_, 0, _tmp82_, 1, _tmp84_, -1);
-#line 232 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp85_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
-#line 232 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->info.icons[0]);
-#line 232 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->info.icons[0] = _tmp85_;
-#line 232 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp86_ = self->priv->info.icons[0];
-#line 1867 "PublishingUI.c"
+#line 1846 "PublishingUI.c"
} else {
GtkListStore* _tmp87_ = NULL;
GtkTreeIter _tmp88_ = {0};
@@ -1871,331 +1850,354 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
GdkPixbuf* _tmp90_ = NULL;
SpitPublishingService* _tmp91_ = NULL;
const gchar* _tmp92_ = NULL;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp87_ = self->priv->service_selector_box_model;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp88_ = iter;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp89_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp90_ = _tmp89_;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp91_ = service;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp92_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_list_store_set (_tmp87_, &_tmp88_, 0, _tmp90_, 1, _tmp92_, -1);
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (_tmp90_);
-#line 1891 "PublishingUI.c"
+#line 1870 "PublishingUI.c"
}
-#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp93_ = last_used_service;
-#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp93_ == NULL) {
-#line 1897 "PublishingUI.c"
+#line 1876 "PublishingUI.c"
GtkComboBox* _tmp94_ = NULL;
GtkTreeIter _tmp95_ = {0};
SpitPublishingService* _tmp96_ = NULL;
const gchar* _tmp97_ = NULL;
gchar* _tmp98_ = NULL;
-#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 245 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp94_ = self->priv->service_selector_box;
-#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 245 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp95_ = iter;
-#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 245 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_combo_box_set_active_iter (_tmp94_, &_tmp95_);
-#line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp96_ = service;
-#line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp97_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp98_ = g_strdup (_tmp97_);
-#line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (last_used_service);
-#line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
last_used_service = _tmp98_;
-#line 1919 "PublishingUI.c"
+#line 1898 "PublishingUI.c"
} else {
const gchar* _tmp99_ = NULL;
const gchar* _tmp100_ = NULL;
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp99_ = last_used_service;
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp100_ = curr_service_id;
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (g_strcmp0 (_tmp99_, _tmp100_) == 0) {
-#line 1929 "PublishingUI.c"
+#line 1908 "PublishingUI.c"
GtkComboBox* _tmp101_ = NULL;
GtkTreeIter _tmp102_ = {0};
-#line 243 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp101_ = self->priv->service_selector_box;
-#line 243 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp102_ = iter;
-#line 243 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_combo_box_set_active_iter (_tmp101_, &_tmp102_);
-#line 1938 "PublishingUI.c"
+#line 1917 "PublishingUI.c"
}
}
-#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (curr_service_id);
-#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (service);
-#line 1945 "PublishingUI.c"
+#line 1924 "PublishingUI.c"
}
}
}
-#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp103_ = self->priv->service_selector_box;
-#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_signal_connect_object (_tmp103_, "changed", (GCallback) _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
-#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp104_ = use_header;
-#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (!_tmp104_) {
-#line 1957 "PublishingUI.c"
+#line 1936 "PublishingUI.c"
GtkLabel* service_selector_box_label = NULL;
const gchar* _tmp105_ = NULL;
GtkLabel* _tmp106_ = NULL;
GtkLabel* _tmp107_ = NULL;
GtkComboBox* _tmp108_ = NULL;
GtkLabel* _tmp109_ = NULL;
- GtkAlignment* service_selector_box_wrapper = NULL;
- GtkAlignment* _tmp110_ = NULL;
- GtkAlignment* _tmp111_ = NULL;
+ GtkLabel* _tmp110_ = NULL;
+ GtkComboBox* _tmp111_ = NULL;
GtkComboBox* _tmp112_ = NULL;
+ GtkComboBox* _tmp113_ = NULL;
+ GtkComboBox* _tmp114_ = NULL;
GtkBox* service_selector_layouter = NULL;
- GtkBox* _tmp113_ = NULL;
- GtkBox* _tmp114_ = NULL;
GtkBox* _tmp115_ = NULL;
- GtkLabel* _tmp116_ = NULL;
+ GtkBox* _tmp116_ = NULL;
GtkBox* _tmp117_ = NULL;
- GtkAlignment* _tmp118_ = NULL;
- GtkBox* service_area_layouter = NULL;
- GtkBox* _tmp119_ = NULL;
+ GtkBox* _tmp118_ = NULL;
+ GtkLabel* _tmp119_ = NULL;
GtkBox* _tmp120_ = NULL;
- GtkBox* _tmp121_ = NULL;
+ GtkComboBox* _tmp121_ = NULL;
+ GtkBox* service_area_layouter = NULL;
GtkBox* _tmp122_ = NULL;
- GtkSeparator* _tmp123_ = NULL;
- GtkSeparator* _tmp124_ = NULL;
- GtkAlignment* service_area_wrapper = NULL;
- GtkAlignment* _tmp125_ = NULL;
- GtkAlignment* _tmp126_ = NULL;
- GtkBox* _tmp127_ = NULL;
+ GtkBox* _tmp123_ = NULL;
+ GtkBox* _tmp124_ = NULL;
+ GtkBox* _tmp125_ = NULL;
+ GtkSeparator* _tmp126_ = NULL;
+ GtkSeparator* _tmp127_ = NULL;
GtkBox* _tmp128_ = NULL;
- GtkAlignment* _tmp129_ = NULL;
-#line 251 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ GtkBox* _tmp129_ = NULL;
+ GtkBox* _tmp130_ = NULL;
+ GtkBox* _tmp131_ = NULL;
+ GtkBox* _tmp132_ = NULL;
+ GtkBox* _tmp133_ = NULL;
+#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp105_ = label;
-#line 251 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp106_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp105_);
-#line 251 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_object_ref_sink (_tmp106_);
-#line 251 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service_selector_box_label = _tmp106_;
-#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 257 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp107_ = service_selector_box_label;
-#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 257 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp108_ = self->priv->service_selector_box;
-#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 257 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_label_set_mnemonic_widget (_tmp107_, G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_widget_get_type (), GtkWidget));
-#line 253 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp109_ = service_selector_box_label;
-#line 253 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
-#line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp110_ = (GtkAlignment*) gtk_alignment_new (1.0f, 0.5f, 0.0f, 0.0f);
+#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
#line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp110_);
+ _tmp110_ = service_selector_box_label;
#line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service_selector_box_wrapper = _tmp110_;
-#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp111_ = service_selector_box_wrapper;
-#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp112_ = self->priv->service_selector_box;
-#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, gtk_widget_get_type (), GtkWidget));
-#line 262 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp113_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-#line 262 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp113_);
-#line 262 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service_selector_layouter = _tmp113_;
-#line 263 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp114_ = service_selector_layouter;
-#line 263 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_container_get_type (), GtkContainer), (guint) 12);
-#line 264 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp115_ = service_selector_layouter;
-#line 264 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp116_ = service_selector_box_label;
-#line 264 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, gtk_widget_get_type (), GtkWidget));
-#line 265 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp117_ = service_selector_layouter;
+ gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
#line 265 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp118_ = service_selector_box_wrapper;
+ _tmp111_ = self->priv->service_selector_box;
#line 265 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_box_pack_start (_tmp117_, G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp119_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp119_);
-#line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service_area_layouter = _tmp119_;
+ gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
+#line 266 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp112_ = self->priv->service_selector_box;
+#line 266 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 267 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp113_ = self->priv->service_selector_box;
+#line 267 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp113_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 268 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp114_ = self->priv->service_selector_box;
+#line 268 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp120_ = service_area_layouter;
+ _tmp115_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
#line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp121_ = service_selector_layouter;
+ g_object_ref_sink (_tmp115_);
#line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_widget_get_type (), GtkWidget));
-#line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp122_ = service_area_layouter;
-#line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp123_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+ service_selector_layouter = _tmp115_;
#line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp123_);
+ _tmp116_ = service_selector_layouter;
#line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp124_ = _tmp123_;
-#line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp122_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, gtk_widget_get_type (), GtkWidget));
-#line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (_tmp124_);
+ gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, gtk_container_get_type (), GtkContainer), (guint) 12);
+#line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp117_ = service_selector_layouter;
+#line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp125_ = (GtkAlignment*) gtk_alignment_new (0.0f, 0.0f, 1.0f, 0.0f);
+ _tmp118_ = service_selector_layouter;
#line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp125_);
+ _tmp119_ = service_selector_box_label;
#line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service_area_wrapper = _tmp125_;
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, gtk_widget_get_type (), GtkWidget));
#line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp126_ = service_area_wrapper;
+ _tmp120_ = service_selector_layouter;
#line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp127_ = service_area_layouter;
+ _tmp121_ = self->priv->service_selector_box;
#line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, gtk_widget_get_type (), GtkWidget));
-#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp128_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp129_ = service_area_wrapper;
-#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_box_pack_start (_tmp128_, G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (service_area_wrapper);
-#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (service_area_layouter);
-#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (service_selector_layouter);
-#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (service_selector_box_wrapper);
-#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (service_selector_box_label);
-#line 2092 "PublishingUI.c"
- }
-#line 279 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp130_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ gtk_box_pack_start (_tmp120_, G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp122_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_object_ref_sink (_tmp122_);
+#line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ service_area_layouter = _tmp122_;
#line 279 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp130_);
+ _tmp123_ = service_area_layouter;
#line 279 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (self->priv->central_area_layouter);
+ _tmp124_ = service_selector_layouter;
#line 279 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self->priv->central_area_layouter = _tmp130_;
-#line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp131_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, gtk_widget_get_type (), GtkWidget));
+#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp125_ = service_area_layouter;
+#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp126_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_object_ref_sink (_tmp126_);
+#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp127_ = _tmp126_;
+#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, gtk_widget_get_type (), GtkWidget));
+#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_object_unref0 (_tmp127_);
#line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp132_ = self->priv->central_area_layouter;
+ _tmp128_ = service_area_layouter;
#line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_box_pack_start (_tmp131_, G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp133_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
+ gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp128_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp129_ = service_area_layouter;
+#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
#line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp133_);
+ _tmp130_ = service_area_layouter;
#line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (self->priv->close_cancel_button);
-#line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self->priv->close_cancel_button = _tmp133_;
+ gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp134_ = self->priv->close_cancel_button;
+ _tmp131_ = service_area_layouter;
#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp135_ = self->priv->close_cancel_button;
-#line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_signal_connect_object (_tmp135_, "clicked", (GCallback) _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
+ gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp131_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp136_ = use_header;
+ _tmp132_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
#line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp136_) {
-#line 2128 "PublishingUI.c"
- GtkWidget* _tmp137_ = NULL;
- GtkButton* _tmp138_ = NULL;
- GtkWidget* _tmp139_ = NULL;
- GtkComboBox* _tmp140_ = NULL;
-#line 287 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp137_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 287 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp138_ = self->priv->close_cancel_button;
-#line 287 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp138_, gtk_widget_get_type (), GtkWidget));
-#line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp139_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp140_ = self->priv->service_selector_box;
-#line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp139_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp140_, gtk_widget_get_type (), GtkWidget));
-#line 2145 "PublishingUI.c"
- } else {
- GtkWidget* _tmp141_ = NULL;
- GtkButton* _tmp142_ = NULL;
+ _tmp133_ = service_area_layouter;
+#line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_box_pack_start (_tmp132_, G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_object_unref0 (service_area_layouter);
+#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_object_unref0 (service_selector_layouter);
+#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_object_unref0 (service_selector_box_label);
+#line 2085 "PublishingUI.c"
+ }
+#line 289 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp134_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#line 289 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_object_ref_sink (_tmp134_);
+#line 289 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_object_unref0 (self->priv->central_area_layouter);
+#line 289 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ self->priv->central_area_layouter = _tmp134_;
#line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp141_ = gtk_dialog_get_action_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+ _tmp135_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
#line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp142_ = self->priv->close_cancel_button;
+ _tmp136_ = self->priv->central_area_layouter;
#line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, gtk_widget_get_type (), GtkWidget));
-#line 2155 "PublishingUI.c"
- }
+ gtk_box_pack_start (_tmp135_, G_TYPE_CHECK_INSTANCE_CAST (_tmp136_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
#line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- publishing_ui_publishing_dialog_set_standard_window_mode (self);
+ _tmp137_ = use_header;
+#line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (_tmp137_) {
+#line 2105 "PublishingUI.c"
+ GtkButton* _tmp138_ = NULL;
+ GtkButton* _tmp139_ = NULL;
+ GtkWidget* _tmp140_ = NULL;
+ GtkButton* _tmp141_ = NULL;
+ GtkWidget* _tmp142_ = NULL;
+ GtkComboBox* _tmp143_ = NULL;
+#line 294 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp138_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
+#line 294 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_object_ref_sink (_tmp138_);
+#line 294 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_object_unref0 (self->priv->close_cancel_button);
+#line 294 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ self->priv->close_cancel_button = _tmp138_;
#line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp139_ = self->priv->close_cancel_button;
+#line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp139_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp140_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp141_ = self->priv->close_cancel_button;
+#line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp140_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, gtk_widget_get_type (), GtkWidget));
+#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp142_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp143_ = self->priv->service_selector_box;
+#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, gtk_widget_get_type (), GtkWidget));
+#line 2136 "PublishingUI.c"
+ } else {
+ const gchar* _tmp144_ = NULL;
+ GtkWidget* _tmp145_ = NULL;
+ GtkButton* _tmp146_ = NULL;
+#line 301 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp144_ = _ ("_Cancel");
+#line 301 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _tmp144_, (gint) GTK_RESPONSE_CANCEL);
+#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp145_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
+#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp146_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp145_, gtk_button_get_type ()) ? ((GtkButton*) _tmp145_) : NULL);
+#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_object_unref0 (self->priv->close_cancel_button);
+#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ self->priv->close_cancel_button = _tmp146_;
+#line 2153 "PublishingUI.c"
+ }
+#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp147_ = self->priv->close_cancel_button;
+#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_signal_connect_object (_tmp147_, "clicked", (GCallback) _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
+#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ publishing_ui_publishing_dialog_set_standard_window_mode (self);
+#line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
loaded_services = (_vala_array_free (loaded_services, loaded_services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (last_used_service);
-#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (renderer_text);
-#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (renderer_pix);
-#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (label);
-#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (title);
-#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self;
-#line 2175 "PublishingUI.c"
+#line 2177 "PublishingUI.c"
}
PublishingUIPublishingDialog* publishing_ui_publishing_dialog_new (GeeCollection* to_publish) {
-#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return publishing_ui_publishing_dialog_construct (PUBLISHING_UI_TYPE_PUBLISHING_DIALOG, to_publish);
-#line 2182 "PublishingUI.c"
+#line 2184 "PublishingUI.c"
}
static void _vala_array_add56 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) {
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((*length) == (*size)) {
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2193 "PublishingUI.c"
+#line 2195 "PublishingUI.c"
}
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[(*length)++] = value;
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[*length] = NULL;
-#line 2199 "PublishingUI.c"
+#line 2201 "PublishingUI.c"
}
@@ -2206,30 +2208,30 @@ static gint __lambda15_ (void* a, void* b) {
void* _tmp2_ = NULL;
const gchar* _tmp3_ = NULL;
gint _tmp4_ = 0;
-#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = a;
-#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitPublishingService**) _tmp0_), SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp2_ = b;
-#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp3_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitPublishingService**) _tmp2_), SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp4_ = utf8_cs_compare (_tmp1_, _tmp3_);
-#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
result = _tmp4_;
-#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 2224 "PublishingUI.c"
+#line 2226 "PublishingUI.c"
}
static gint ___lambda15____compar_fn_t (void* key1, void* key2) {
gint result;
result = __lambda15_ (key1, key2);
-#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 2233 "PublishingUI.c"
+#line 2235 "PublishingUI.c"
}
@@ -2250,41 +2252,41 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
gint _tmp26__length1 = 0;
SpitPublishingService** _tmp27_ = NULL;
gint _tmp27__length1 = 0;
-#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 312 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = g_new0 (SpitPublishingService*, 0 + 1);
-#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 312 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
loaded_services = _tmp0_;
-#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 312 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
loaded_services_length1 = 0;
-#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 312 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_loaded_services_size_ = loaded_services_length1;
-#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 315 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = plugins_get_pluggables_for_type (SPIT_PUBLISHING_TYPE_SERVICE, NULL, NULL, NULL, FALSE);
-#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 315 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
pluggables = _tmp1_;
-#line 305 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 318 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp2_ = pluggables;
-#line 305 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 318 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp3_ = gee_collection_get_size (_tmp2_);
-#line 305 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 318 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp4_ = _tmp3_;
-#line 305 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_debug ("PublishingUI.vala:305: PublisingDialog: discovered %d pluggable publis" \
+#line 318 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_debug ("PublishingUI.vala:318: PublisingDialog: discovered %d pluggable publis" \
"hing services.", _tmp4_);
-#line 2274 "PublishingUI.c"
+#line 2276 "PublishingUI.c"
{
GeeIterator* _pluggable_it = NULL;
GeeCollection* _tmp5_ = NULL;
GeeIterator* _tmp6_ = NULL;
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp5_ = pluggables;
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_pluggable_it = _tmp6_;
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
while (TRUE) {
-#line 2287 "PublishingUI.c"
+#line 2289 "PublishingUI.c"
GeeIterator* _tmp7_ = NULL;
gboolean _tmp8_ = FALSE;
SpitPluggable* pluggable = NULL;
@@ -2303,167 +2305,167 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
gint _tmp22__length1 = 0;
SpitPublishingService* _tmp23_ = NULL;
SpitPublishingService* _tmp24_ = NULL;
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp7_ = _pluggable_it;
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp8_ = gee_iterator_next (_tmp7_);
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (!_tmp8_) {
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
break;
-#line 2314 "PublishingUI.c"
+#line 2316 "PublishingUI.c"
}
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp9_ = _pluggable_it;
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp10_ = gee_iterator_get (_tmp9_);
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
pluggable = (SpitPluggable*) _tmp10_;
-#line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 321 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp11_ = pluggable;
-#line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 321 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp12_ = spit_pluggable_get_pluggable_interface (_tmp11_, SPIT_PUBLISHING_CURRENT_INTERFACE, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 321 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
pluggable_interface = _tmp12_;
-#line 310 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp13_ = pluggable_interface;
-#line 310 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp13_ != SPIT_PUBLISHING_CURRENT_INTERFACE) {
-#line 2332 "PublishingUI.c"
+#line 2334 "PublishingUI.c"
SpitPluggable* _tmp14_ = NULL;
gchar* _tmp15_ = NULL;
gchar* _tmp16_ = NULL;
gint _tmp17_ = 0;
-#line 311 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp14_ = pluggable;
-#line 311 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp15_ = plugins_get_pluggable_module_id (_tmp14_);
-#line 311 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp16_ = _tmp15_;
-#line 311 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp17_ = pluggable_interface;
-#line 311 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_warning ("PublishingUI.vala:311: Unable to load publisher %s: reported interface" \
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_warning ("PublishingUI.vala:324: Unable to load publisher %s: reported interface" \
" %d.", _tmp16_, _tmp17_);
-#line 311 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (_tmp16_);
-#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (pluggable);
-#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
continue;
-#line 2353 "PublishingUI.c"
+#line 2355 "PublishingUI.c"
}
-#line 317 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 330 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp18_ = pluggable;
-#line 317 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 330 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService));
-#line 317 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 330 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service = _tmp19_;
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 333 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp20_ = service;
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 333 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp21_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_debug ("PublishingUI.vala:320: PublishingDialog: discovered pluggable publishi" \
+#line 333 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_debug ("PublishingUI.vala:333: PublishingDialog: discovered pluggable publishi" \
"ng service '%s'.", _tmp21_);
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp22_ = loaded_services;
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp22__length1 = loaded_services_length1;
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp23_ = service;
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_vala_array_add56 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp24_);
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (service);
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (pluggable);
-#line 2381 "PublishingUI.c"
+#line 2383 "PublishingUI.c"
}
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (_pluggable_it);
-#line 2385 "PublishingUI.c"
+#line 2387 "PublishingUI.c"
}
-#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp25_ = loaded_services;
-#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp25__length1 = loaded_services_length1;
-#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp26_ = loaded_services;
-#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp26__length1 = loaded_services_length1;
-#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
qsort (_tmp25_, (gsize) _tmp26__length1, (gsize) sizeof (SpitPublishingService*), ___lambda15____compar_fn_t);
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp27_ = loaded_services;
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp27__length1 = loaded_services_length1;
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (result_length1) {
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*result_length1 = _tmp27__length1;
-#line 2405 "PublishingUI.c"
+#line 2407 "PublishingUI.c"
}
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
result = _tmp27_;
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (pluggables);
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 2413 "PublishingUI.c"
+#line 2415 "PublishingUI.c"
}
static void _vala_array_add57 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) {
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((*length) == (*size)) {
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2424 "PublishingUI.c"
+#line 2426 "PublishingUI.c"
}
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[(*length)++] = value;
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[*length] = NULL;
-#line 2430 "PublishingUI.c"
+#line 2432 "PublishingUI.c"
}
static void _vala_array_add58 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) {
-#line 348 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((*length) == (*size)) {
-#line 348 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 348 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2441 "PublishingUI.c"
+#line 2443 "PublishingUI.c"
}
-#line 348 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[(*length)++] = value;
-#line 348 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[*length] = NULL;
-#line 2447 "PublishingUI.c"
+#line 2449 "PublishingUI.c"
}
static void _vala_array_add59 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) {
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((*length) == (*size)) {
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2458 "PublishingUI.c"
+#line 2460 "PublishingUI.c"
}
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[(*length)++] = value;
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[*length] = NULL;
-#line 2464 "PublishingUI.c"
+#line 2466 "PublishingUI.c"
}
@@ -2484,226 +2486,226 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gb
gint _tmp6__length1 = 0;
SpitPublishingService** _tmp32_ = NULL;
gint _tmp32__length1 = 0;
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = has_photos;
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp1_) {
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = TRUE;
-#line 2491 "PublishingUI.c"
+#line 2493 "PublishingUI.c"
} else {
gboolean _tmp2_ = FALSE;
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp2_ = has_videos;
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = _tmp2_;
-#line 2498 "PublishingUI.c"
+#line 2500 "PublishingUI.c"
}
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_vala_assert (_tmp0_, "has_photos || has_videos");
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp3_ = g_new0 (SpitPublishingService*, 0 + 1);
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
filtered_services = _tmp3_;
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
filtered_services_length1 = 0;
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_filtered_services_size_ = filtered_services_length1;
-#line 339 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp5_ = publishing_ui_publishing_dialog_load_all_services (&_tmp4_);
-#line 339 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
all_services = _tmp5_;
-#line 339 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
all_services_length1 = _tmp4_;
-#line 339 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_all_services_size_ = all_services_length1;
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp6_ = all_services;
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp6__length1 = all_services_length1;
-#line 2522 "PublishingUI.c"
+#line 2524 "PublishingUI.c"
{
SpitPublishingService** service_collection = NULL;
gint service_collection_length1 = 0;
gint _service_collection_size_ = 0;
gint service_it = 0;
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service_collection = _tmp6_;
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service_collection_length1 = _tmp6__length1;
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
for (service_it = 0; service_it < _tmp6__length1; service_it = service_it + 1) {
-#line 2534 "PublishingUI.c"
+#line 2536 "PublishingUI.c"
SpitPublishingService* _tmp7_ = NULL;
SpitPublishingService* service = NULL;
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp7_ = _g_object_ref0 (service_collection[service_it]);
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service = _tmp7_;
-#line 2541 "PublishingUI.c"
+#line 2543 "PublishingUI.c"
{
gboolean _tmp8_ = FALSE;
gboolean _tmp9_ = FALSE;
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp9_ = has_photos;
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp9_) {
-#line 2549 "PublishingUI.c"
+#line 2551 "PublishingUI.c"
gboolean _tmp10_ = FALSE;
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp10_ = has_videos;
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp8_ = !_tmp10_;
-#line 2555 "PublishingUI.c"
+#line 2557 "PublishingUI.c"
} else {
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp8_ = FALSE;
-#line 2559 "PublishingUI.c"
+#line 2561 "PublishingUI.c"
}
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp8_) {
-#line 2563 "PublishingUI.c"
+#line 2565 "PublishingUI.c"
SpitPublishingService* _tmp11_ = NULL;
SpitPublishingPublisherMediaType _tmp12_ = 0;
-#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 357 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp11_ = service;
-#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 357 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp12_ = spit_publishing_service_get_supported_media (_tmp11_);
-#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 357 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((_tmp12_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 2572 "PublishingUI.c"
+#line 2574 "PublishingUI.c"
SpitPublishingService** _tmp13_ = NULL;
gint _tmp13__length1 = 0;
SpitPublishingService* _tmp14_ = NULL;
SpitPublishingService* _tmp15_ = NULL;
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp13_ = filtered_services;
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp13__length1 = filtered_services_length1;
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp14_ = service;
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp15_ = _g_object_ref0 (_tmp14_);
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_vala_array_add57 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp15_);
-#line 2587 "PublishingUI.c"
+#line 2589 "PublishingUI.c"
}
} else {
gboolean _tmp16_ = FALSE;
gboolean _tmp17_ = FALSE;
-#line 346 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp17_ = has_photos;
-#line 346 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (!_tmp17_) {
-#line 2596 "PublishingUI.c"
+#line 2598 "PublishingUI.c"
gboolean _tmp18_ = FALSE;
-#line 346 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp18_ = has_videos;
-#line 346 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp16_ = _tmp18_;
-#line 2602 "PublishingUI.c"
+#line 2604 "PublishingUI.c"
} else {
-#line 346 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp16_ = FALSE;
-#line 2606 "PublishingUI.c"
+#line 2608 "PublishingUI.c"
}
-#line 346 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp16_) {
-#line 2610 "PublishingUI.c"
+#line 2612 "PublishingUI.c"
SpitPublishingService* _tmp19_ = NULL;
SpitPublishingPublisherMediaType _tmp20_ = 0;
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp19_ = service;
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp20_ = spit_publishing_service_get_supported_media (_tmp19_);
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((_tmp20_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0) {
-#line 2619 "PublishingUI.c"
+#line 2621 "PublishingUI.c"
SpitPublishingService** _tmp21_ = NULL;
gint _tmp21__length1 = 0;
SpitPublishingService* _tmp22_ = NULL;
SpitPublishingService* _tmp23_ = NULL;
-#line 348 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp21_ = filtered_services;
-#line 348 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp21__length1 = filtered_services_length1;
-#line 348 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp22_ = service;
-#line 348 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp23_ = _g_object_ref0 (_tmp22_);
-#line 348 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_vala_array_add58 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp23_);
-#line 2634 "PublishingUI.c"
+#line 2636 "PublishingUI.c"
}
} else {
gboolean _tmp24_ = FALSE;
SpitPublishingService* _tmp25_ = NULL;
SpitPublishingPublisherMediaType _tmp26_ = 0;
-#line 350 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp25_ = service;
-#line 350 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp26_ = spit_publishing_service_get_supported_media (_tmp25_);
-#line 350 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((_tmp26_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 2646 "PublishingUI.c"
+#line 2648 "PublishingUI.c"
SpitPublishingService* _tmp27_ = NULL;
SpitPublishingPublisherMediaType _tmp28_ = 0;
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp27_ = service;
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp28_ = spit_publishing_service_get_supported_media (_tmp27_);
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp24_ = (_tmp28_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0;
-#line 2655 "PublishingUI.c"
+#line 2657 "PublishingUI.c"
} else {
-#line 350 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp24_ = FALSE;
-#line 2659 "PublishingUI.c"
+#line 2661 "PublishingUI.c"
}
-#line 350 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp24_) {
-#line 2663 "PublishingUI.c"
+#line 2665 "PublishingUI.c"
SpitPublishingService** _tmp29_ = NULL;
gint _tmp29__length1 = 0;
SpitPublishingService* _tmp30_ = NULL;
SpitPublishingService* _tmp31_ = NULL;
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp29_ = filtered_services;
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp29__length1 = filtered_services_length1;
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp30_ = service;
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp31_ = _g_object_ref0 (_tmp30_);
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_vala_array_add59 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp31_);
-#line 2678 "PublishingUI.c"
+#line 2680 "PublishingUI.c"
}
}
}
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (service);
-#line 2684 "PublishingUI.c"
+#line 2686 "PublishingUI.c"
}
}
}
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp32_ = filtered_services;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp32__length1 = filtered_services_length1;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (result_length1) {
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*result_length1 = _tmp32__length1;
-#line 2696 "PublishingUI.c"
+#line 2698 "PublishingUI.c"
}
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
result = _tmp32_;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
all_services = (_vala_array_free (all_services, all_services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 2704 "PublishingUI.c"
+#line 2706 "PublishingUI.c"
}
@@ -2734,208 +2736,208 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
PublishingUIPublishingDialog* _tmp29_ = NULL;
PublishingUIPublishingDialog* _tmp30_ = NULL;
GTimer* _tmp31_ = NULL;
-#line 370 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (GEE_IS_COLLECTION (to_publish));
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 384 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = publishing_ui_publishing_dialog_active_instance;
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 384 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp0_ != NULL) {
-#line 372 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return;
-#line 2743 "PublishingUI.c"
+#line 2745 "PublishingUI.c"
}
-#line 374 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = publishing_ui_publishing_dialog_since_last_start;
-#line 374 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp1_ == NULL) {
-#line 2749 "PublishingUI.c"
+#line 2751 "PublishingUI.c"
GTimer* _tmp2_ = NULL;
GTimer* _tmp3_ = NULL;
GTimer* _tmp4_ = NULL;
-#line 377 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 390 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp2_ = g_timer_new ();
-#line 377 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 390 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_timer_destroy0 (publishing_ui_publishing_dialog_since_last_start);
-#line 377 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 390 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_since_last_start = _tmp2_;
-#line 378 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp3_ = publishing_ui_publishing_dialog_since_last_start;
-#line 378 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_timer_stop (_tmp3_);
-#line 379 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp4_ = publishing_ui_publishing_dialog_since_last_start;
-#line 379 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_timer_reset (_tmp4_);
-#line 380 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 393 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_elapsed_is_valid = FALSE;
-#line 2769 "PublishingUI.c"
+#line 2771 "PublishingUI.c"
} else {
gdouble elapsed = 0.0;
GTimer* _tmp5_ = NULL;
gdouble _tmp6_ = 0.0;
gboolean _tmp7_ = FALSE;
gdouble _tmp8_ = 0.0;
-#line 382 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp5_ = publishing_ui_publishing_dialog_since_last_start;
-#line 382 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp6_ = g_timer_elapsed (_tmp5_, NULL);
-#line 382 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
elapsed = _tmp6_;
-#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp8_ = elapsed;
-#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp8_ < 0.05) {
-#line 2786 "PublishingUI.c"
+#line 2788 "PublishingUI.c"
gboolean _tmp9_ = FALSE;
-#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp9_ = publishing_ui_publishing_dialog_elapsed_is_valid;
-#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp7_ = _tmp9_;
-#line 2792 "PublishingUI.c"
+#line 2794 "PublishingUI.c"
} else {
-#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp7_ = FALSE;
-#line 2796 "PublishingUI.c"
+#line 2798 "PublishingUI.c"
}
-#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp7_) {
-#line 384 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return;
-#line 2802 "PublishingUI.c"
+#line 2804 "PublishingUI.c"
}
}
-#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp10_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
photos = _tmp10_;
-#line 388 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp11_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 388 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
videos = _tmp11_;
-#line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp12_ = to_publish;
-#line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp13_ = photos;
-#line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp14_ = videos;
-#line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
media_source_collection_filter_media (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp15_ = photos;
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp17_ = _tmp16_;
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp18_ = videos;
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp20_ = _tmp19_;
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp22_ = publishing_ui_publishing_dialog_load_services (_tmp17_ > 0, _tmp20_ > 0, &_tmp21_);
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
avail_services = _tmp22_;
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
avail_services_length1 = _tmp21_;
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_avail_services_size_ = avail_services_length1;
-#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 407 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp23_ = avail_services;
-#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 407 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp23__length1 = avail_services_length1;
-#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 407 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp23__length1 == 0) {
-#line 2847 "PublishingUI.c"
+#line 2849 "PublishingUI.c"
const gchar* _tmp24_ = NULL;
const gchar* _tmp25_ = NULL;
gchar* _tmp26_ = NULL;
gchar* _tmp27_ = NULL;
-#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp24_ = _ ("Unable to publish");
-#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp25_ = _ ("Shotwell cannot publish the selected items because you do not have a c" \
"ompatible publishing plugin enabled. To correct this, choose <b>Edit %" \
"s Preferences</b> and enable one or more of the publishing plugins on " \
"the <b>Plugins</b> tab.");
-#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp26_ = g_strdup_printf (_tmp25_, "▸");
-#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp27_ = _tmp26_;
-#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
app_window_error_message_with_title (_tmp24_, _tmp27_, NULL, FALSE);
-#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (_tmp27_);
-#line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
avail_services = (_vala_array_free (avail_services, avail_services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (videos);
-#line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (photos);
-#line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return;
-#line 2872 "PublishingUI.c"
+#line 2874 "PublishingUI.c"
}
-#line 407 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_debug ("PublishingUI.vala:407: PublishingDialog.go( )");
-#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 420 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_debug ("PublishingUI.vala:420: PublishingDialog.go( )");
+#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp28_ = to_publish;
-#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp29_ = publishing_ui_publishing_dialog_new (_tmp28_);
-#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_object_ref_sink (_tmp29_);
-#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (publishing_ui_publishing_dialog_active_instance);
-#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_active_instance = _tmp29_;
-#line 411 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp30_ = publishing_ui_publishing_dialog_active_instance;
-#line 411 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_run (_tmp30_);
-#line 413 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (publishing_ui_publishing_dialog_active_instance);
-#line 413 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_active_instance = NULL;
-#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 429 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp31_ = publishing_ui_publishing_dialog_since_last_start;
-#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 429 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_timer_start (_tmp31_);
-#line 417 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 430 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_elapsed_is_valid = TRUE;
-#line 370 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
avail_services = (_vala_array_free (avail_services, avail_services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 370 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (videos);
-#line 370 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (photos);
-#line 2906 "PublishingUI.c"
+#line 2908 "PublishingUI.c"
}
static gboolean publishing_ui_publishing_dialog_on_window_close (PublishingUIPublishingDialog* self, GdkEventAny* evt) {
gboolean result = FALSE;
SpitPublishingConcretePublishingHost* _tmp0_ = NULL;
-#line 420 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 433 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), FALSE);
-#line 420 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 433 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_val_if_fail (evt != NULL, FALSE);
-#line 421 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 434 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->host;
-#line 421 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 434 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
spit_publishing_plugin_host_stop_publishing (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost));
-#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->host);
-#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->host = NULL;
-#line 423 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 436 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 439 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
result = TRUE;
-#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 439 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 2933 "PublishingUI.c"
+#line 2935 "PublishingUI.c"
}
@@ -2971,253 +2973,253 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl
gint _tmp27__length1 = 0;
SpitPublishingConcretePublishingHost* _tmp28_ = NULL;
SpitPublishingConcretePublishingHost* _tmp29_ = NULL;
-#line 429 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 442 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 431 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
have_active_iter = FALSE;
-#line 432 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 445 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->service_selector_box;
-#line 432 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 445 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 432 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 445 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
iter = _tmp1_;
-#line 432 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 445 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
have_active_iter = _tmp2_;
-#line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 448 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp3_ = have_active_iter;
-#line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 448 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (!_tmp3_) {
-#line 2985 "PublishingUI.c"
+#line 2987 "PublishingUI.c"
GtkComboBox* _tmp4_ = NULL;
GtkComboBox* _tmp5_ = NULL;
GtkTreeIter _tmp6_ = {0};
-#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp4_ = self->priv->service_selector_box;
-#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_combo_box_set_active (_tmp4_, 0);
-#line 440 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 453 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp5_ = self->priv->service_selector_box;
-#line 440 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 453 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_combo_box_get_active_iter (_tmp5_, &_tmp6_);
-#line 440 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 453 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
iter = _tmp6_;
-#line 2999 "PublishingUI.c"
+#line 3001 "PublishingUI.c"
}
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp7_ = self->priv->service_selector_box_model;
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp8_ = iter;
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_tree_model_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp8_, 1, &_tmp9_);
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_IS_VALUE (&service_name_val) ? (g_value_unset (&service_name_val), NULL) : NULL;
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service_name_val = _tmp9_;
-#line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp10_ = service_name_val;
-#line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp11_ = g_strdup (g_value_get_string (&_tmp10_));
-#line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service_name = _tmp11_;
-#line 448 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
selected_service = NULL;
-#line 449 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 462 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp13_ = publishing_ui_publishing_dialog_load_all_services (&_tmp12_);
-#line 449 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 462 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
services = _tmp13_;
-#line 449 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 462 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
services_length1 = _tmp12_;
-#line 449 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 462 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_services_size_ = services_length1;
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp14_ = services;
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp14__length1 = services_length1;
-#line 3031 "PublishingUI.c"
+#line 3033 "PublishingUI.c"
{
SpitPublishingService** service_collection = NULL;
gint service_collection_length1 = 0;
gint _service_collection_size_ = 0;
gint service_it = 0;
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service_collection = _tmp14_;
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service_collection_length1 = _tmp14__length1;
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
for (service_it = 0; service_it < _tmp14__length1; service_it = service_it + 1) {
-#line 3043 "PublishingUI.c"
+#line 3045 "PublishingUI.c"
SpitPublishingService* _tmp15_ = NULL;
SpitPublishingService* service = NULL;
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp15_ = _g_object_ref0 (service_collection[service_it]);
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service = _tmp15_;
-#line 3050 "PublishingUI.c"
+#line 3052 "PublishingUI.c"
{
SpitPublishingService* _tmp16_ = NULL;
const gchar* _tmp17_ = NULL;
const gchar* _tmp18_ = NULL;
-#line 451 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp16_ = service;
-#line 451 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp17_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 451 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp18_ = service_name;
-#line 451 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (g_strcmp0 (_tmp17_, _tmp18_) == 0) {
-#line 3063 "PublishingUI.c"
+#line 3065 "PublishingUI.c"
SpitPublishingService* _tmp19_ = NULL;
SpitPublishingService* _tmp20_ = NULL;
-#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp19_ = service;
-#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (selected_service);
-#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
selected_service = _tmp20_;
-#line 453 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (service);
-#line 453 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
break;
-#line 3078 "PublishingUI.c"
+#line 3080 "PublishingUI.c"
}
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (service);
-#line 3082 "PublishingUI.c"
+#line 3084 "PublishingUI.c"
}
}
}
-#line 456 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp21_ = selected_service;
-#line 456 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_vala_assert (_tmp21_ != NULL, "selected_service != null");
-#line 458 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp22_ = config_facade_get_instance ();
-#line 458 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp23_ = _tmp22_;
-#line 458 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp24_ = selected_service;
-#line 458 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp25_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 458 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
configuration_facade_set_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp25_);
-#line 458 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (_tmp23_);
-#line 460 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp26_ = selected_service;
-#line 460 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp27_ = self->priv->publishables;
-#line 460 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp27__length1 = self->priv->publishables_length1;
-#line 460 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp28_ = spit_publishing_concrete_publishing_host_new (_tmp26_, self, _tmp27_, _tmp27__length1);
-#line 460 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->host);
-#line 460 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->host = _tmp28_;
-#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 474 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp29_ = self->priv->host;
-#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 474 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
spit_publishing_concrete_publishing_host_start_publishing (_tmp29_);
-#line 429 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 442 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
services = (_vala_array_free (services, services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 429 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 442 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (selected_service);
-#line 429 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 442 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (service_name);
-#line 429 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 442 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_IS_VALUE (&service_name_val) ? (g_value_unset (&service_name_val), NULL) : NULL;
-#line 3126 "PublishingUI.c"
+#line 3128 "PublishingUI.c"
}
static void publishing_ui_publishing_dialog_on_close_cancel_clicked (PublishingUIPublishingDialog* self) {
SpitPublishingConcretePublishingHost* _tmp0_ = NULL;
-#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_debug ("PublishingUI.vala:465: PublishingDialog: on_close_cancel_clicked( ): i" \
+#line 478 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_debug ("PublishingUI.vala:478: PublishingDialog: on_close_cancel_clicked( ): i" \
"nvoked.");
-#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 480 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->host;
-#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 480 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
spit_publishing_plugin_host_stop_publishing (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost));
-#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 481 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->host);
-#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 481 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->host = NULL;
-#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 482 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 470 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 483 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 3148 "PublishingUI.c"
+#line 3150 "PublishingUI.c"
}
static void publishing_ui_publishing_dialog_set_large_window_mode (PublishingUIPublishingDialog* self) {
GtkBox* _tmp0_ = NULL;
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 486 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 474 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 487 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT);
-#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 488 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->central_area_layouter;
-#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 488 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
-#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 490 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3164 "PublishingUI.c"
+#line 3166 "PublishingUI.c"
}
static void publishing_ui_publishing_dialog_set_colossal_window_mode (PublishingUIPublishingDialog* self) {
GtkBox* _tmp0_ = NULL;
-#line 480 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 493 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 481 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 494 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_HEIGHT);
-#line 482 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 495 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->central_area_layouter;
-#line 482 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 495 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
-#line 484 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 497 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3180 "PublishingUI.c"
+#line 3182 "PublishingUI.c"
}
static void publishing_ui_publishing_dialog_set_standard_window_mode (PublishingUIPublishingDialog* self) {
GtkBox* _tmp0_ = NULL;
-#line 487 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 500 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 488 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 501 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_HEIGHT);
-#line 489 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 502 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->central_area_layouter;
-#line 489 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 502 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
-#line 491 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 504 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3196 "PublishingUI.c"
+#line 3198 "PublishingUI.c"
}
static void publishing_ui_publishing_dialog_set_free_sizable_window_mode (PublishingUIPublishingDialog* self) {
-#line 494 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 507 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 495 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 508 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 3205 "PublishingUI.c"
+#line 3207 "PublishingUI.c"
}
static void publishing_ui_publishing_dialog_clear_free_sizable_window_mode (PublishingUIPublishingDialog* self) {
-#line 498 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 511 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 499 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 512 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3214 "PublishingUI.c"
+#line 3216 "PublishingUI.c"
}
@@ -3225,17 +3227,17 @@ SpitPublishingDialogPane* publishing_ui_publishing_dialog_get_active_pane (Publi
SpitPublishingDialogPane* result = NULL;
SpitPublishingDialogPane* _tmp0_ = NULL;
SpitPublishingDialogPane* _tmp1_ = NULL;
-#line 502 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 515 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), NULL);
-#line 503 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->active_pane;
-#line 503 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 503 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
result = _tmp1_;
-#line 503 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 3232 "PublishingUI.c"
+#line 3234 "PublishingUI.c"
}
@@ -3243,58 +3245,58 @@ void publishing_ui_publishing_dialog_set_close_button_mode (PublishingUIPublishi
GtkButton* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
GtkButton* _tmp2_ = NULL;
-#line 506 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 519 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 507 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->close_cancel_button;
-#line 507 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = _ ("_Close");
-#line 507 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_button_set_label (_tmp0_, _tmp1_);
-#line 508 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 521 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp2_ = self->priv->close_cancel_button;
-#line 508 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 521 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 3252 "PublishingUI.c"
+#line 3254 "PublishingUI.c"
}
void publishing_ui_publishing_dialog_set_cancel_button_mode (PublishingUIPublishingDialog* self) {
GtkButton* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 511 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 524 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 512 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 525 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->close_cancel_button;
-#line 512 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 525 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = _ ("_Cancel");
-#line 512 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 525 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_button_set_label (_tmp0_, _tmp1_);
-#line 3267 "PublishingUI.c"
+#line 3269 "PublishingUI.c"
}
void publishing_ui_publishing_dialog_lock_service (PublishingUIPublishingDialog* self) {
GtkComboBox* _tmp0_ = NULL;
-#line 515 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 528 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 529 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->service_selector_box;
-#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 529 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 3279 "PublishingUI.c"
+#line 3281 "PublishingUI.c"
}
void publishing_ui_publishing_dialog_unlock_service (PublishingUIPublishingDialog* self) {
GtkComboBox* _tmp0_ = NULL;
-#line 519 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 532 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->service_selector_box;
-#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3291 "PublishingUI.c"
+#line 3293 "PublishingUI.c"
}
@@ -3312,110 +3314,110 @@ void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog*
SpitPublishingDialogPane* _tmp15_ = NULL;
SpitPublishingDialogPane* _tmp16_ = NULL;
SpitPublishingDialogPane* _tmp17_ = NULL;
-#line 523 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 536 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 523 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 536 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (pane));
-#line 524 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_debug ("PublishingUI.vala:524: PublishingDialog: install_pane( ): invoked.");
-#line 526 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 537 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_debug ("PublishingUI.vala:537: PublishingDialog: install_pane( ): invoked.");
+#line 539 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->active_pane;
-#line 526 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 539 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp0_ != NULL) {
-#line 3319 "PublishingUI.c"
+#line 3321 "PublishingUI.c"
SpitPublishingDialogPane* _tmp1_ = NULL;
GtkBox* _tmp2_ = NULL;
SpitPublishingDialogPane* _tmp3_ = NULL;
GtkWidget* _tmp4_ = NULL;
GtkWidget* _tmp5_ = NULL;
-#line 527 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_debug ("PublishingUI.vala:527: PublishingDialog: install_pane( ): a pane is al" \
+#line 540 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_debug ("PublishingUI.vala:540: PublishingDialog: install_pane( ): a pane is al" \
"ready installed; removing it.");
-#line 529 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 542 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = self->priv->active_pane;
-#line 529 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 542 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
spit_publishing_dialog_pane_on_pane_uninstalled (_tmp1_);
-#line 530 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp2_ = self->priv->central_area_layouter;
-#line 530 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp3_ = self->priv->active_pane;
-#line 530 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp4_ = spit_publishing_dialog_pane_get_widget (_tmp3_);
-#line 530 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp5_ = _tmp4_;
-#line 530 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), _tmp5_);
-#line 530 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (_tmp5_);
-#line 3343 "PublishingUI.c"
+#line 3345 "PublishingUI.c"
}
-#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp6_ = self->priv->central_area_layouter;
-#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp7_ = pane;
-#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp8_ = spit_publishing_dialog_pane_get_widget (_tmp7_);
-#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp9_ = _tmp8_;
-#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_box_pack_start (_tmp6_, _tmp9_, TRUE, TRUE, (guint) 0);
-#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (_tmp9_);
-#line 534 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 536 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 549 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp10_ = pane;
-#line 536 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 549 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp11_ = spit_publishing_dialog_pane_get_preferred_geometry (_tmp10_);
-#line 536 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 549 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
geometry_options = _tmp11_;
-#line 538 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp12_ = geometry_options;
-#line 538 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((_tmp12_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) {
-#line 539 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 552 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_set_large_window_mode (self);
-#line 3371 "PublishingUI.c"
+#line 3373 "PublishingUI.c"
} else {
SpitPublishingDialogPaneGeometryOptions _tmp13_ = 0;
-#line 540 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp13_ = geometry_options;
-#line 540 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((_tmp13_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE) != 0) {
-#line 541 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 554 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_set_colossal_window_mode (self);
-#line 3380 "PublishingUI.c"
+#line 3382 "PublishingUI.c"
} else {
-#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 556 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_set_standard_window_mode (self);
-#line 3384 "PublishingUI.c"
+#line 3386 "PublishingUI.c"
}
}
-#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 558 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp14_ = geometry_options;
-#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 558 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((_tmp14_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) {
-#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 559 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_set_free_sizable_window_mode (self);
-#line 3393 "PublishingUI.c"
+#line 3395 "PublishingUI.c"
} else {
-#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 561 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_clear_free_sizable_window_mode (self);
-#line 3397 "PublishingUI.c"
+#line 3399 "PublishingUI.c"
}
-#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp15_ = pane;
-#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->active_pane);
-#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->active_pane = _tmp16_;
-#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 564 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp17_ = pane;
-#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 564 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
spit_publishing_dialog_pane_on_pane_installed (_tmp17_);
-#line 3411 "PublishingUI.c"
+#line 3413 "PublishingUI.c"
}
@@ -3423,67 +3425,67 @@ gint publishing_ui_publishing_dialog_run (PublishingUIPublishingDialog* self) {
gint result = 0;
gint _result_ = 0;
gint _tmp0_ = 0;
-#line 554 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 567 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), 0);
-#line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 568 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_on_service_changed (self);
-#line 557 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 570 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 557 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 570 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_result_ = _tmp0_;
-#line 559 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 572 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->host);
-#line 559 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 572 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->host = NULL;
-#line 561 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 574 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
result = _result_;
-#line 561 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 574 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 3435 "PublishingUI.c"
+#line 3437 "PublishingUI.c"
}
static void publishing_ui_publishing_dialog_class_init (PublishingUIPublishingDialogClass * klass) {
-#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_type_class_add_private (klass, sizeof (PublishingUIPublishingDialogPrivate));
-#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_ui_publishing_dialog_finalize;
-#line 3446 "PublishingUI.c"
+#line 3448 "PublishingUI.c"
}
static void publishing_ui_publishing_dialog_instance_init (PublishingUIPublishingDialog * self) {
-#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv = PUBLISHING_UI_PUBLISHING_DIALOG_GET_PRIVATE (self);
-#line 3453 "PublishingUI.c"
+#line 3455 "PublishingUI.c"
}
static void publishing_ui_publishing_dialog_finalize (GObject* obj) {
PublishingUIPublishingDialog * self;
-#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_PUBLISHING_DIALOG, PublishingUIPublishingDialog);
-#line 147 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 152 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->service_selector_box_model);
-#line 148 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 153 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->service_selector_box);
-#line 149 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 154 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->central_area_layouter);
-#line 150 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 155 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->close_cancel_button);
-#line 151 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->active_pane);
-#line 152 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 157 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 153 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 158 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->host);
-#line 154 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 159 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
spit_pluggable_info_destroy (&self->priv->info);
-#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_OBJECT_CLASS (publishing_ui_publishing_dialog_parent_class)->finalize (obj);
-#line 3479 "PublishingUI.c"
+#line 3481 "PublishingUI.c"
}
diff --git a/src/publishing/PublishingUI.vala b/src/publishing/PublishingUI.vala
index c0c3a34..8303f40 100644
--- a/src/publishing/PublishingUI.vala
+++ b/src/publishing/PublishingUI.vala
@@ -100,19 +100,24 @@ public class SuccessPane : StaticMessagePane {
// Here, we check whether more than one item is being uploaded, and if so, display
// an alternate message.
- if(num_uploaded > 1) {
- if (published_media == (Spit.Publishing.Publisher.MediaType.PHOTO | Spit.Publishing.Publisher.MediaType.VIDEO))
- message_string = _("The selected photos/videos were successfully published.");
- else if (published_media == Spit.Publishing.Publisher.MediaType.VIDEO)
- message_string = _("The selected videos were successfully published.");
- else
- message_string = _("The selected photos were successfully published.");
- } else {
- if (published_media == Spit.Publishing.Publisher.MediaType.VIDEO)
- message_string = _("The selected video was successfully published.");
- else
- message_string = _("The selected photo was successfully published.");
+ if (published_media == Spit.Publishing.Publisher.MediaType.VIDEO) {
+ message_string = ngettext ("The selected video was successfully published.",
+ "The selected videos were successfully published.",
+ num_uploaded);
+ }
+ else if (published_media == Spit.Publishing.Publisher.MediaType.PHOTO) {
+ message_string = ngettext ("The selected video was successfully published.",
+ "The selected videos were successfully published.",
+ num_uploaded);
+ }
+ else if (published_media == (Spit.Publishing.Publisher.MediaType.PHOTO
+ | Spit.Publishing.Publisher.MediaType.VIDEO)) {
+ message_string = _("The selected photos/videos were successfully published.");
}
+ else {
+ assert_not_reached ();
+ }
+
base(message_string);
}
}
@@ -156,15 +161,15 @@ public class PublishingDialog : Gtk.Dialog {
protected PublishingDialog(Gee.Collection<MediaSource> to_publish) {
assert(to_publish.size > 0);
- bool use_header;
+ bool use_header = false;
Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
Object(use_header_bar: use_header ? 1 : 0);
if (use_header)
((Gtk.HeaderBar) get_header_bar()).set_show_close_button(false);
-
+
resizable = false;
delete_event.connect(on_window_close);
-
+
publishables = new Spit.Publishing.Publishable[0];
bool has_photos = false;
bool has_videos = false;
@@ -250,45 +255,53 @@ public class PublishingDialog : Gtk.Dialog {
{
var service_selector_box_label = new Gtk.Label.with_mnemonic(label);
service_selector_box_label.set_mnemonic_widget(service_selector_box);
- service_selector_box_label.set_alignment(0.0f, 0.5f);
+ service_selector_box_label.halign = Gtk.Align.START;
+ service_selector_box_label.valign = Gtk.Align.CENTER;
/* the wrapper is not an extraneous widget -- it's necessary to prevent the service
selection box from growing and shrinking whenever its parent's size changes.
When wrapped inside a Gtk.Alignment, the Alignment grows and shrinks instead of
the service selection box. */
- Gtk.Alignment service_selector_box_wrapper = new Gtk.Alignment(1.0f, 0.5f, 0.0f, 0.0f);
- service_selector_box_wrapper.add(service_selector_box);
+ service_selector_box.halign = Gtk.Align.END;
+ service_selector_box.valign = Gtk.Align.CENTER;
+ service_selector_box.hexpand = false;
+ service_selector_box.vexpand = false;
Gtk.Box service_selector_layouter = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 8);
service_selector_layouter.set_border_width(12);
+ service_selector_layouter.hexpand = true;
service_selector_layouter.add(service_selector_box_label);
- service_selector_layouter.pack_start(service_selector_box_wrapper, true, true, 0);
+ service_selector_layouter.pack_start(service_selector_box, true, true, 0);
/* 'service area' is the selector assembly plus the horizontal rule dividing it from the
rest of the dialog */
Gtk.Box service_area_layouter = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
service_area_layouter.add(service_selector_layouter);
service_area_layouter.add(new Gtk.Separator(Gtk.Orientation.HORIZONTAL));
+ service_area_layouter.halign = Gtk.Align.FILL;
+ service_area_layouter.valign = Gtk.Align.START;
+ service_area_layouter.hexpand = true;
+ service_area_layouter.vexpand = false;
- Gtk.Alignment service_area_wrapper = new Gtk.Alignment(0.0f, 0.0f, 1.0f, 0.0f);
- service_area_wrapper.add(service_area_layouter);
-
- get_content_area().pack_start(service_area_wrapper, false, false, 0);
+ get_content_area().pack_start(service_area_layouter, false, false, 0);
}
central_area_layouter = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
get_content_area().pack_start(central_area_layouter, true, true, 0);
- close_cancel_button = new Gtk.Button.with_mnemonic("_Cancel");
- close_cancel_button.set_can_default(true);
- close_cancel_button.clicked.connect(on_close_cancel_clicked);
if (use_header) {
+ close_cancel_button = new Gtk.Button.with_mnemonic("_Cancel");
+ close_cancel_button.set_can_default(true);
+
((Gtk.HeaderBar) get_header_bar()).pack_start(close_cancel_button);
((Gtk.HeaderBar) get_header_bar()).pack_end(service_selector_box);
}
- else
- ((Gtk.Container) get_action_area()).add(close_cancel_button);
+ else {
+ add_button (_("_Cancel"), Gtk.ResponseType.CANCEL);
+ close_cancel_button = get_widget_for_response (Gtk.ResponseType.CANCEL) as Gtk.Button;
+ }
+ close_cancel_button.clicked.connect(on_close_cancel_clicked);
set_standard_window_mode();
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 13:46:06 +0000