summaryrefslogtreecommitdiff
path: root/src/dialogs
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-06-25 20:55:59 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-06-25 20:55:59 +0200
commitab841afa5cb39058d9ab2cebb67cfe6369443f6e (patch)
tree64961342a79003ee865b3f9f8f41f99f09f37a2e /src/dialogs
parent49120f48474fc8fdc2448c75d961bc238213cfac (diff)
New upstream version 0.28.3upstream/0.28.3
Diffstat (limited to 'src/dialogs')
-rw-r--r--src/dialogs/AdjustDateTimeDialog.c2077
-rw-r--r--src/dialogs/EntryMultiCompletion.c1087
-rw-r--r--src/dialogs/ExportDialog.c1743
-rw-r--r--src/dialogs/MultiTextEntryDialog.c173
-rw-r--r--src/dialogs/Preferences.c2261
-rw-r--r--src/dialogs/ProgressDialog.c529
-rw-r--r--src/dialogs/SetBackground.c125
-rw-r--r--src/dialogs/SetBackgroundSlideshow.c269
-rw-r--r--src/dialogs/TextEntry.c258
-rw-r--r--src/dialogs/WelcomeDialog.c1007
10 files changed, 4797 insertions, 4732 deletions
diff --git a/src/dialogs/AdjustDateTimeDialog.c b/src/dialogs/AdjustDateTimeDialog.c
index 9eb3020..fe412df 100644
--- a/src/dialogs/AdjustDateTimeDialog.c
+++ b/src/dialogs/AdjustDateTimeDialog.c
@@ -1,4 +1,4 @@
-/* AdjustDateTimeDialog.c generated by valac 0.36.6, the Vala compiler
+/* AdjustDateTimeDialog.c generated by valac 0.40.4, the Vala compiler
* generated from AdjustDateTimeDialog.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8,6 +8,7 @@
* See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
@@ -32,6 +33,11 @@ typedef struct _AdjustDateTimeDialogClass AdjustDateTimeDialogClass;
typedef struct _AdjustDateTimeDialogPrivate AdjustDateTimeDialogPrivate;
#define ADJUST_DATE_TIME_DIALOG_TYPE_TIME_SYSTEM (adjust_date_time_dialog_time_system_get_type ())
+enum {
+ ADJUST_DATE_TIME_DIALOG_0_PROPERTY,
+ ADJUST_DATE_TIME_DIALOG_NUM_PROPERTIES
+};
+static GParamSpec* adjust_date_time_dialog_properties[ADJUST_DATE_TIME_DIALOG_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define TYPE_DATA_OBJECT (data_object_get_type ())
@@ -171,9 +177,6 @@ static gpointer adjust_date_time_dialog_parent_class = NULL;
GType adjust_date_time_dialog_get_type (void) G_GNUC_CONST;
static GType adjust_date_time_dialog_time_system_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
#define ADJUST_DATE_TIME_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ADJUST_DATE_TIME_DIALOG, AdjustDateTimeDialogPrivate))
-enum {
- ADJUST_DATE_TIME_DIALOG_DUMMY_PROPERTY
-};
#define ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY ((gint64) ((60 * 60) * 24))
#define ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR ((gint64) (60 * 60))
#define ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE ((gint64) 60)
@@ -184,8 +187,17 @@ GType data_source_get_type (void) G_GNUC_CONST;
GType thumbnail_source_get_type (void) G_GNUC_CONST;
GType media_source_get_type (void) G_GNUC_CONST;
GType dateable_get_type (void) G_GNUC_CONST;
-AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video);
-AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video);
+AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source,
+ gint photo_count,
+ gboolean display_options,
+ gboolean contains_video,
+ gboolean only_video);
+AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type,
+ Dateable* source,
+ gint photo_count,
+ gboolean display_options,
+ gboolean contains_video,
+ gboolean only_video);
gint resources_use_header_bar (void);
GType page_window_get_type (void) G_GNUC_CONST;
GType app_window_get_type (void) G_GNUC_CONST;
@@ -194,35 +206,55 @@ AppWindow* app_window_get_instance (void);
#define RESOURCES_OK_LABEL _ ("_OK")
#define RESOURCES_ADJUST_DATE_TIME_LABEL _ ("Adjust Date and Time")
static void adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self);
-static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self);
-static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed (GtkCalendar* _sender, gpointer self);
-static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year (GtkCalendar* _sender, gpointer self);
-static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year (GtkCalendar* _sender, gpointer self);
+static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected (GtkCalendar* _sender,
+ gpointer self);
+static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed (GtkCalendar* _sender,
+ gpointer self);
+static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year (GtkCalendar* _sender,
+ gpointer self);
+static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year (GtkCalendar* _sender,
+ gpointer self);
GType configuration_facade_get_type (void) G_GNUC_CONST;
GType config_facade_get_type (void) G_GNUC_CONST;
ConfigFacade* config_facade_get_instance (void);
gboolean configuration_facade_get_use_24_hour_time (ConfigurationFacade* self);
-static gboolean adjust_date_time_dialog_on_spin_button_output (AdjustDateTimeDialog* self, GtkSpinButton* button);
-static gboolean _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output (GtkSpinButton* _sender, gpointer self);
+static gboolean adjust_date_time_dialog_on_spin_button_output (AdjustDateTimeDialog* self,
+ GtkSpinButton* button);
+static gboolean _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output (GtkSpinButton* _sender,
+ gpointer self);
static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog* self);
-static void _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self);
gboolean configuration_facade_get_keep_relativity (ConfigurationFacade* self);
-static void _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
+static void _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender,
+ gpointer self);
gboolean configuration_facade_get_commit_metadata_to_masters (ConfigurationFacade* self);
-GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GError** error);
+GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self,
+ gint scale,
+ GError** error);
gchar* data_object_to_string (DataObject* self);
time_t dateable_get_exposure_time (Dateable* self);
-static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct tm* time);
-static void adjust_date_time_dialog_set_original_time_label (AdjustDateTimeDialog* self, gboolean use_24_hr_format);
+static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self,
+ struct tm* time);
+static void adjust_date_time_dialog_set_original_time_label (AdjustDateTimeDialog* self,
+ gboolean use_24_hr_format);
static time_t adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self);
-gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* time_shift, gboolean* keep_relativity, gboolean* modify_originals);
-void configuration_facade_set_keep_relativity (ConfigurationFacade* self, gboolean keep_relativity);
-void configuration_facade_set_modify_originals (ConfigurationFacade* self, gboolean modify_originals);
-void configuration_facade_set_use_24_hour_time (ConfigurationFacade* self, gboolean use_24_hour_time);
+gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self,
+ gint64* time_shift,
+ gboolean* keep_relativity,
+ gboolean* modify_originals);
+void configuration_facade_set_keep_relativity (ConfigurationFacade* self,
+ gboolean keep_relativity);
+void configuration_facade_set_modify_originals (ConfigurationFacade* self,
+ gboolean modify_originals);
+void configuration_facade_set_use_24_hour_time (ConfigurationFacade* self,
+ gboolean use_24_hour_time);
static void adjust_date_time_dialog_finalize (GObject * obj);
-static GType adjust_date_time_dialog_time_system_get_type (void) {
+static GType
+adjust_date_time_dialog_time_system_get_type (void)
+{
static volatile gsize adjust_date_time_dialog_time_system_type_id__volatile = 0;
if (g_once_init_enter (&adjust_date_time_dialog_time_system_type_id__volatile)) {
static const GEnumValue values[] = {{ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_AM, "ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_AM", "am"}, {ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM, "ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM", "pm"}, {ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR, "ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR", "24hr"}, {0, NULL, NULL}};
@@ -234,73 +266,100 @@ static GType adjust_date_time_dialog_time_system_get_type (void) {
}
-static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) {
+static void
+_adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected (GtkCalendar* _sender,
+ gpointer self)
+{
#line 53 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 241 "AdjustDateTimeDialog.c"
+#line 276 "AdjustDateTimeDialog.c"
}
-static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed (GtkCalendar* _sender, gpointer self) {
+static void
+_adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed (GtkCalendar* _sender,
+ gpointer self)
+{
#line 54 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 248 "AdjustDateTimeDialog.c"
+#line 286 "AdjustDateTimeDialog.c"
}
-static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year (GtkCalendar* _sender, gpointer self) {
+static void
+_adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year (GtkCalendar* _sender,
+ gpointer self)
+{
#line 55 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 255 "AdjustDateTimeDialog.c"
+#line 296 "AdjustDateTimeDialog.c"
}
-static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year (GtkCalendar* _sender, gpointer self) {
+static void
+_adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year (GtkCalendar* _sender,
+ gpointer self)
+{
#line 56 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 262 "AdjustDateTimeDialog.c"
+#line 306 "AdjustDateTimeDialog.c"
}
-static gboolean _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output (GtkSpinButton* _sender, gpointer self) {
+static gboolean
+_adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output (GtkSpinButton* _sender,
+ gpointer self)
+{
gboolean result;
result = adjust_date_time_dialog_on_spin_button_output ((AdjustDateTimeDialog*) self, _sender);
#line 63 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
return result;
-#line 271 "AdjustDateTimeDialog.c"
+#line 318 "AdjustDateTimeDialog.c"
}
-static void _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self)
+{
#line 81 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
adjust_date_time_dialog_on_time_system_changed ((AdjustDateTimeDialog*) self);
-#line 278 "AdjustDateTimeDialog.c"
+#line 328 "AdjustDateTimeDialog.c"
}
-static void _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+static void
+_adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender,
+ gpointer self)
+{
#line 103 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 285 "AdjustDateTimeDialog.c"
+#line 338 "AdjustDateTimeDialog.c"
}
-static void g_time_gm (time_t time, struct tm* result) {
+static void
+g_time_gm (time_t time,
+ struct tm* result)
+{
struct tm _result_ = {0};
struct tm _tmp0_ = {0};
-#line 2841 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2861 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
gmtime_r (&time, &_tmp0_);
-#line 2841 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2861 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 2842 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2862 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
*result = _result_;
-#line 2842 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2862 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return;
-#line 300 "AdjustDateTimeDialog.c"
+#line 356 "AdjustDateTimeDialog.c"
}
-static gchar* g_time_format (struct tm *self, const gchar* format) {
+static gchar*
+g_time_format (struct tm *self,
+ const gchar* format)
+{
gchar* result = NULL;
gchar* buffer = NULL;
gchar* _tmp0_;
@@ -308,82 +367,91 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
gint _buffer_size_;
gchar* _tmp1_;
gint _tmp1__length1;
- const gchar* _tmp2_;
+ gchar* _tmp2_;
+ gint _tmp2__length1;
gchar* _tmp3_;
- gint _tmp3__length1;
- gchar* _tmp4_;
-#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2874 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (format != NULL, NULL);
-#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = g_new0 (gchar, 64);
-#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
buffer = _tmp0_;
-#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
buffer_length1 = 64;
-#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_buffer_size_ = buffer_length1;
-#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = buffer;
-#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1__length1 = buffer_length1;
-#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = format;
-#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = buffer;
-#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3__length1 = buffer_length1;
-#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp4_;
-#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ strftime (_tmp1_, _tmp1__length1, format, &(*self));
+#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = buffer;
+#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2__length1 = buffer_length1;
+#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = g_strdup ((const gchar*) _tmp2_);
+#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp3_;
+#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
buffer = (g_free (buffer), NULL);
-#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 346 "AdjustDateTimeDialog.c"
+#line 402 "AdjustDateTimeDialog.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
return self ? g_object_ref (self) : NULL;
-#line 353 "AdjustDateTimeDialog.c"
+#line 411 "AdjustDateTimeDialog.c"
}
-static void g_time_local (time_t time, struct tm* result) {
+static void
+g_time_local (time_t time,
+ struct tm* result)
+{
struct tm _result_ = {0};
struct tm _tmp0_ = {0};
-#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
localtime_r (&time, &_tmp0_);
-#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
*result = _result_;
-#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return;
-#line 368 "AdjustDateTimeDialog.c"
+#line 429 "AdjustDateTimeDialog.c"
}
-AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video) {
+AdjustDateTimeDialog*
+adjust_date_time_dialog_construct (GType object_type,
+ Dateable* source,
+ gint photo_count,
+ gboolean display_options,
+ gboolean contains_video,
+ gboolean only_video)
+{
AdjustDateTimeDialog * self = NULL;
- Dateable* _tmp0_;
- gint _tmp1_;
- AppWindow* _tmp2_;
- AppWindow* _tmp3_;
+ AppWindow* _tmp0_;
+ AppWindow* _tmp1_;
+ GtkCalendar* _tmp2_;
+ GtkCalendar* _tmp3_;
GtkCalendar* _tmp4_;
GtkCalendar* _tmp5_;
GtkCalendar* _tmp6_;
GtkCalendar* _tmp7_;
- GtkCalendar* _tmp8_;
- GtkCalendar* _tmp9_;
- ConfigFacade* _tmp10_;
- ConfigFacade* _tmp11_;
- gboolean _tmp12_;
- gboolean _tmp13_;
+ ConfigFacade* _tmp8_;
+ ConfigFacade* _tmp9_;
+ gboolean _tmp10_;
+ GtkSpinButton* _tmp13_;
+ GtkSpinButton* _tmp14_;
+ GtkSpinButton* _tmp15_;
GtkSpinButton* _tmp16_;
GtkSpinButton* _tmp17_;
GtkSpinButton* _tmp18_;
@@ -392,770 +460,703 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
GtkSpinButton* _tmp21_;
GtkSpinButton* _tmp22_;
GtkSpinButton* _tmp23_;
- GtkSpinButton* _tmp24_;
- GtkSpinButton* _tmp25_;
- GtkSpinButton* _tmp26_;
+ GtkComboBoxText* _tmp24_;
+ GtkComboBoxText* _tmp25_;
+ GtkComboBoxText* _tmp26_;
GtkComboBoxText* _tmp27_;
GtkComboBoxText* _tmp28_;
- GtkComboBoxText* _tmp29_;
- GtkComboBoxText* _tmp30_;
- GtkComboBoxText* _tmp31_;
GtkBox* clock = NULL;
+ GtkBox* _tmp29_;
+ GtkBox* _tmp30_;
+ GtkSpinButton* _tmp31_;
GtkBox* _tmp32_;
- GtkBox* _tmp33_;
- GtkSpinButton* _tmp34_;
+ GtkLabel* _tmp33_;
+ GtkLabel* _tmp34_;
GtkBox* _tmp35_;
- GtkLabel* _tmp36_;
- GtkLabel* _tmp37_;
- GtkBox* _tmp38_;
- GtkSpinButton* _tmp39_;
+ GtkSpinButton* _tmp36_;
+ GtkBox* _tmp37_;
+ GtkLabel* _tmp38_;
+ GtkLabel* _tmp39_;
GtkBox* _tmp40_;
- GtkLabel* _tmp41_;
- GtkLabel* _tmp42_;
- GtkBox* _tmp43_;
- GtkSpinButton* _tmp44_;
- GtkBox* _tmp45_;
- GtkComboBoxText* _tmp46_;
- GtkRadioButton* _tmp47_;
- GtkRadioButton* _tmp48_;
- ConfigFacade* _tmp49_;
- ConfigFacade* _tmp50_;
- gboolean _tmp51_;
- gboolean _tmp52_ = FALSE;
- gboolean _tmp53_;
- GtkRadioButton* _tmp55_;
- GtkRadioButton* _tmp56_;
- GSList* _tmp57_;
+ GtkSpinButton* _tmp41_;
+ GtkBox* _tmp42_;
+ GtkComboBoxText* _tmp43_;
+ GtkRadioButton* _tmp44_;
+ GtkRadioButton* _tmp45_;
+ ConfigFacade* _tmp46_;
+ ConfigFacade* _tmp47_;
+ gboolean _tmp48_ = FALSE;
+ GtkRadioButton* _tmp49_;
+ GtkRadioButton* _tmp50_;
+ GSList* _tmp51_;
+ GtkRadioButton* _tmp52_;
+ GtkRadioButton* _tmp53_;
+ ConfigFacade* _tmp54_;
+ ConfigFacade* _tmp55_;
+ gboolean _tmp56_ = FALSE;
+ GtkRadioButton* _tmp57_;
GtkRadioButton* _tmp58_;
- GtkRadioButton* _tmp59_;
- ConfigFacade* _tmp60_;
- ConfigFacade* _tmp61_;
- gboolean _tmp62_;
- gboolean _tmp63_ = FALSE;
- gboolean _tmp64_;
- GtkRadioButton* _tmp66_;
- GtkRadioButton* _tmp67_;
+ gboolean _tmp65_ = FALSE;
+ ConfigFacade* _tmp66_;
+ ConfigFacade* _tmp67_;
gboolean _tmp68_;
- gboolean _tmp77_ = FALSE;
- ConfigFacade* _tmp78_;
- ConfigFacade* _tmp79_;
- gboolean _tmp80_;
- gboolean _tmp81_;
- GtkCheckButton* _tmp83_;
- gboolean _tmp84_ = FALSE;
- gboolean _tmp85_;
- GtkCheckButton* _tmp92_;
+ GtkCheckButton* _tmp69_;
+ gboolean _tmp70_ = FALSE;
+ GtkCheckButton* _tmp75_;
GtkBox* time_content = NULL;
- GtkBox* _tmp93_;
+ GtkBox* _tmp76_;
GtkBox* picker = NULL;
- GtkBox* _tmp94_;
+ GtkBox* _tmp77_;
GtkComboBoxText* combo = NULL;
- GtkComboBoxText* _tmp95_;
- GtkBox* _tmp104_;
- GtkComboBoxText* _tmp105_;
+ GtkComboBoxText* _tmp78_;
+ GtkBox* _tmp87_;
+ GtkComboBoxText* _tmp88_;
GtkSpinButton* spin = NULL;
- GtkSpinButton* _tmp106_;
- GtkBox* _tmp107_;
- GtkSpinButton* _tmp108_;
- GtkSpinButton* _tmp109_;
- GtkCalendar* _tmp110_;
- GtkComboBoxText* _tmp111_;
- GtkCalendar* _tmp112_;
+ GtkSpinButton* _tmp89_;
+ GtkBox* _tmp90_;
+ GtkSpinButton* _tmp91_;
+ GtkSpinButton* _tmp92_;
+ GtkCalendar* _tmp93_;
+ GtkComboBoxText* _tmp94_;
+ GtkCalendar* _tmp95_;
+ GtkBox* _tmp96_;
+ GtkBox* _tmp97_;
+ GtkBox* _tmp98_;
+ GtkCalendar* _tmp99_;
+ GtkBox* _tmp100_;
+ GtkBox* _tmp101_;
+ GdkPixbuf* preview = NULL;
+ GtkBox* image_content = NULL;
GtkBox* _tmp113_;
GtkBox* _tmp114_;
GtkBox* _tmp115_;
- GtkCalendar* _tmp116_;
- GtkBox* _tmp117_;
- GtkBox* _tmp118_;
- gboolean _tmp119_;
- GdkPixbuf* preview = NULL;
- GtkBox* image_content = NULL;
+ GtkImage* _tmp116_ = NULL;
+ GdkPixbuf* _tmp117_;
+ GtkImage* image = NULL;
+ GtkImage* _tmp121_;
+ GtkLabel* _tmp122_;
+ GtkBox* _tmp123_;
+ GtkImage* _tmp124_;
+ GtkBox* _tmp125_;
+ GtkLabel* _tmp126_;
+ GtkBox* hbox = NULL;
+ GtkBox* _tmp127_;
+ GtkBox* _tmp128_;
+ GtkBox* _tmp129_;
+ GtkBox* _tmp130_;
+ GtkBox* _tmp131_;
+ GtkBox* _tmp132_;
GtkBox* _tmp133_;
GtkBox* _tmp134_;
GtkBox* _tmp135_;
- GtkImage* _tmp136_ = NULL;
- GdkPixbuf* _tmp137_;
- GtkImage* image = NULL;
- GtkImage* _tmp141_;
- GtkLabel* _tmp142_;
- GtkBox* _tmp143_;
- GtkImage* _tmp144_;
- GtkBox* _tmp145_;
- GtkLabel* _tmp146_;
- GtkBox* hbox = NULL;
- GtkBox* _tmp147_;
- GtkBox* _tmp148_;
- GtkBox* _tmp149_;
- GtkBox* _tmp150_;
- GtkBox* _tmp151_;
- GtkBox* _tmp152_;
- GtkBox* _tmp153_;
- GtkBox* _tmp154_;
- GtkBox* _tmp155_;
- GtkBox* _tmp156_;
- GtkBox* _tmp157_;
- GtkBox* _tmp158_;
- GtkLabel* _tmp159_;
- GtkLabel* _tmp160_;
- GtkLabel* _tmp161_;
- GtkBox* _tmp162_;
- GtkLabel* _tmp163_;
- Dateable* _tmp164_;
- time_t _tmp165_;
- time_t _tmp166_;
- time_t _tmp168_;
- struct tm _tmp169_ = {0};
- ConfigFacade* _tmp170_;
- ConfigFacade* _tmp171_;
- gboolean _tmp172_;
+ GtkBox* _tmp136_;
+ GtkBox* _tmp137_;
+ GtkBox* _tmp138_;
+ GtkLabel* _tmp139_;
+ GtkLabel* _tmp140_;
+ GtkLabel* _tmp141_;
+ GtkBox* _tmp142_;
+ GtkLabel* _tmp143_;
+ time_t _tmp144_;
+ time_t _tmp146_;
+ struct tm _tmp147_ = {0};
+ ConfigFacade* _tmp148_;
+ ConfigFacade* _tmp149_;
GError * _inner_error_ = NULL;
#line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
g_return_val_if_fail (IS_DATEABLE (source), NULL);
#line 39 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp0_ = source;
-#line 39 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _vala_assert (_tmp0_ != NULL, "source != null");
+ _vala_assert (source != NULL, "source != null");
#line 41 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp1_ = resources_use_header_bar ();
-#line 41 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- self = (AdjustDateTimeDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
+ self = (AdjustDateTimeDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL);
#line 43 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
#line 44 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
#line 45 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp2_ = app_window_get_instance ();
+ _tmp0_ = app_window_get_instance ();
#line 45 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp3_ = _tmp2_;
+ _tmp1_ = _tmp0_;
#line 45 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_window_get_type (), GtkWindow));
+ gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
#line 45 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_object_unref0 (_tmp3_);
+ _g_object_unref0 (_tmp1_);
#line 47 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
#line 49 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), RESOURCES_ADJUST_DATE_TIME_LABEL);
#line 51 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp4_ = (GtkCalendar*) gtk_calendar_new ();
+ _tmp2_ = (GtkCalendar*) gtk_calendar_new ();
#line 51 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp4_);
+ g_object_ref_sink (_tmp2_);
#line 51 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_g_object_unref0 (self->priv->calendar);
#line 51 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- self->priv->calendar = _tmp4_;
+ self->priv->calendar = _tmp2_;
#line 52 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp5_ = self->priv->calendar;
+ _tmp3_ = self->priv->calendar;
#line 52 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_set (_tmp5_, "show-heading", FALSE, NULL);
+ g_object_set (_tmp3_, "show-heading", FALSE, NULL);
#line 53 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp6_ = self->priv->calendar;
+ _tmp4_ = self->priv->calendar;
#line 53 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_signal_connect_object (_tmp6_, "day-selected", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected, self, 0);
+ g_signal_connect_object (_tmp4_, "day-selected", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected, self, 0);
#line 54 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp7_ = self->priv->calendar;
+ _tmp5_ = self->priv->calendar;
#line 54 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_signal_connect_object (_tmp7_, "month-changed", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed, self, 0);
+ g_signal_connect_object (_tmp5_, "month-changed", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed, self, 0);
#line 55 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp8_ = self->priv->calendar;
+ _tmp6_ = self->priv->calendar;
#line 55 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_signal_connect_object (_tmp8_, "next-year", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year, self, 0);
+ g_signal_connect_object (_tmp6_, "next-year", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year, self, 0);
#line 56 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp9_ = self->priv->calendar;
+ _tmp7_ = self->priv->calendar;
#line 56 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_signal_connect_object (_tmp9_, "prev-year", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year, self, 0);
+ g_signal_connect_object (_tmp7_, "prev-year", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year, self, 0);
#line 58 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp10_ = config_facade_get_instance ();
+ _tmp8_ = config_facade_get_instance ();
#line 58 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp11_ = _tmp10_;
+ _tmp9_ = _tmp8_;
#line 58 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp12_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp10_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 58 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp13_ = _tmp12_;
+ _g_object_unref0 (_tmp9_);
#line 58 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_object_unref0 (_tmp11_);
-#line 58 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp13_) {
-#line 579 "AdjustDateTimeDialog.c"
- GtkSpinButton* _tmp14_;
+ if (_tmp10_) {
+#line 627 "AdjustDateTimeDialog.c"
+ GtkSpinButton* _tmp11_;
#line 59 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp14_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 23, (gdouble) 1);
+ _tmp11_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 23, (gdouble) 1);
#line 59 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp14_);
+ g_object_ref_sink (_tmp11_);
#line 59 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_g_object_unref0 (self->priv->hour);
#line 59 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- self->priv->hour = _tmp14_;
-#line 589 "AdjustDateTimeDialog.c"
+ self->priv->hour = _tmp11_;
+#line 637 "AdjustDateTimeDialog.c"
} else {
- GtkSpinButton* _tmp15_;
+ GtkSpinButton* _tmp12_;
#line 61 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp15_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 1, (gdouble) 12, (gdouble) 1);
+ _tmp12_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 1, (gdouble) 12, (gdouble) 1);
#line 61 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp15_);
+ g_object_ref_sink (_tmp12_);
#line 61 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_g_object_unref0 (self->priv->hour);
#line 61 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- self->priv->hour = _tmp15_;
-#line 600 "AdjustDateTimeDialog.c"
+ self->priv->hour = _tmp12_;
+#line 648 "AdjustDateTimeDialog.c"
}
#line 63 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp16_ = self->priv->hour;
+ _tmp13_ = self->priv->hour;
#line 63 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_signal_connect_object (_tmp16_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
+ g_signal_connect_object (_tmp13_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
#line 64 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp17_ = self->priv->hour;
+ _tmp14_ = self->priv->hour;
#line 64 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_entry_get_type (), GtkEntry), 2);
+ gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_entry_get_type (), GtkEntry), 2);
#line 65 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp18_ = self->priv->hour;
+ _tmp15_ = self->priv->hour;
#line 65 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_entry_get_type (), GtkEntry), 2);
+ gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_entry_get_type (), GtkEntry), 2);
#line 67 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp19_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 59, (gdouble) 1);
+ _tmp16_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 59, (gdouble) 1);
#line 67 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp19_);
+ g_object_ref_sink (_tmp16_);
#line 67 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_g_object_unref0 (self->priv->minute);
#line 67 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- self->priv->minute = _tmp19_;
+ self->priv->minute = _tmp16_;
#line 68 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp20_ = self->priv->minute;
+ _tmp17_ = self->priv->minute;
#line 68 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_entry_get_type (), GtkEntry), 2);
+ gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_entry_get_type (), GtkEntry), 2);
#line 69 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp21_ = self->priv->minute;
+ _tmp18_ = self->priv->minute;
#line 69 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_entry_get_type (), GtkEntry), 2);
+ gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_entry_get_type (), GtkEntry), 2);
#line 70 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp22_ = self->priv->minute;
+ _tmp19_ = self->priv->minute;
#line 70 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_signal_connect_object (_tmp22_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
+ g_signal_connect_object (_tmp19_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
#line 72 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp23_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 59, (gdouble) 1);
+ _tmp20_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 59, (gdouble) 1);
#line 72 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp23_);
+ g_object_ref_sink (_tmp20_);
#line 72 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_g_object_unref0 (self->priv->second);
#line 72 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- self->priv->second = _tmp23_;
+ self->priv->second = _tmp20_;
#line 73 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp24_ = self->priv->second;
+ _tmp21_ = self->priv->second;
#line 73 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_entry_get_type (), GtkEntry), 2);
+ gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_entry_get_type (), GtkEntry), 2);
#line 74 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp25_ = self->priv->second;
+ _tmp22_ = self->priv->second;
#line 74 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_entry_get_type (), GtkEntry), 2);
+ gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_entry_get_type (), GtkEntry), 2);
#line 75 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp26_ = self->priv->second;
+ _tmp23_ = self->priv->second;
#line 75 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_signal_connect_object (_tmp26_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
+ g_signal_connect_object (_tmp23_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
#line 77 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp27_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+ _tmp24_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
#line 77 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp27_);
+ g_object_ref_sink (_tmp24_);
#line 77 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_g_object_unref0 (self->priv->system);
#line 77 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- self->priv->system = _tmp27_;
+ self->priv->system = _tmp24_;
#line 78 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp28_ = self->priv->system;
+ _tmp25_ = self->priv->system;
#line 78 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_combo_box_text_append_text (_tmp28_, _ ("AM"));
+ gtk_combo_box_text_append_text (_tmp25_, _ ("AM"));
#line 79 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp29_ = self->priv->system;
+ _tmp26_ = self->priv->system;
#line 79 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_combo_box_text_append_text (_tmp29_, _ ("PM"));
+ gtk_combo_box_text_append_text (_tmp26_, _ ("PM"));
#line 80 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp30_ = self->priv->system;
+ _tmp27_ = self->priv->system;
#line 80 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_combo_box_text_append_text (_tmp30_, _ ("24 Hr"));
+ gtk_combo_box_text_append_text (_tmp27_, _ ("24 Hr"));
#line 81 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp31_ = self->priv->system;
+ _tmp28_ = self->priv->system;
#line 81 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed, self, 0);
#line 83 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp32_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+ _tmp29_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
#line 83 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp32_);
+ g_object_ref_sink (_tmp29_);
#line 83 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- clock = _tmp32_;
+ clock = _tmp29_;
#line 85 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp33_ = clock;
+ _tmp30_ = clock;
#line 85 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp34_ = self->priv->hour;
+ _tmp31_ = self->priv->hour;
#line 85 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_box_pack_start (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+ gtk_box_pack_start (_tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
#line 86 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp35_ = clock;
+ _tmp32_ = clock;
#line 86 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp36_ = (GtkLabel*) gtk_label_new (":");
+ _tmp33_ = (GtkLabel*) gtk_label_new (":");
#line 86 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp36_);
+ g_object_ref_sink (_tmp33_);
#line 86 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp37_ = _tmp36_;
+ _tmp34_ = _tmp33_;
#line 86 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_box_pack_start (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+ gtk_box_pack_start (_tmp32_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
#line 86 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_object_unref0 (_tmp37_);
+ _g_object_unref0 (_tmp34_);
#line 87 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp38_ = clock;
+ _tmp35_ = clock;
#line 87 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp39_ = self->priv->minute;
+ _tmp36_ = self->priv->minute;
#line 87 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_box_pack_start (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+ gtk_box_pack_start (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
#line 88 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp40_ = clock;
+ _tmp37_ = clock;
#line 88 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp41_ = (GtkLabel*) gtk_label_new (":");
+ _tmp38_ = (GtkLabel*) gtk_label_new (":");
#line 88 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp41_);
+ g_object_ref_sink (_tmp38_);
#line 88 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp42_ = _tmp41_;
+ _tmp39_ = _tmp38_;
#line 88 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_box_pack_start (_tmp40_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+ gtk_box_pack_start (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
#line 88 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_object_unref0 (_tmp42_);
+ _g_object_unref0 (_tmp39_);
#line 89 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp43_ = clock;
+ _tmp40_ = clock;
#line 89 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp44_ = self->priv->second;
+ _tmp41_ = self->priv->second;
#line 89 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_box_pack_start (_tmp43_, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+ gtk_box_pack_start (_tmp40_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
#line 90 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp45_ = clock;
+ _tmp42_ = clock;
#line 90 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp46_ = self->priv->system;
+ _tmp43_ = self->priv->system;
#line 90 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_box_pack_start (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+ gtk_box_pack_start (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
#line 92 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
#line 94 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp47_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (NULL, _ ("_Shift photos/videos by the same amount"));
+ _tmp44_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (NULL, _ ("_Shift photos/videos by the same amount"));
#line 94 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp47_);
+ g_object_ref_sink (_tmp44_);
#line 94 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_g_object_unref0 (self->priv->relativity_radio_button);
#line 94 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- self->priv->relativity_radio_button = _tmp47_;
-#line 96 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp48_ = self->priv->relativity_radio_button;
+ self->priv->relativity_radio_button = _tmp44_;
#line 96 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp49_ = config_facade_get_instance ();
+ _tmp45_ = self->priv->relativity_radio_button;
#line 96 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp50_ = _tmp49_;
+ _tmp46_ = config_facade_get_instance ();
#line 96 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp51_ = configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp47_ = _tmp46_;
#line 96 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp51_);
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_toggle_button_get_type (), GtkToggleButton), configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
#line 96 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_object_unref0 (_tmp50_);
-#line 97 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp53_ = display_options;
-#line 97 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp53_) {
-#line 758 "AdjustDateTimeDialog.c"
- gint _tmp54_;
+ _g_object_unref0 (_tmp47_);
#line 97 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp54_ = photo_count;
+ if (display_options) {
#line 97 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp52_ = _tmp54_ > 1;
-#line 764 "AdjustDateTimeDialog.c"
+ _tmp48_ = photo_count > 1;
+#line 804 "AdjustDateTimeDialog.c"
} else {
#line 97 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp52_ = FALSE;
-#line 768 "AdjustDateTimeDialog.c"
+ _tmp48_ = FALSE;
+#line 808 "AdjustDateTimeDialog.c"
}
#line 97 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp55_ = self->priv->relativity_radio_button;
+ _tmp49_ = self->priv->relativity_radio_button;
#line 97 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget), _tmp52_);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget), _tmp48_);
#line 99 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp56_ = self->priv->relativity_radio_button;
+ _tmp50_ = self->priv->relativity_radio_button;
#line 99 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp57_ = gtk_radio_button_get_group (_tmp56_);
+ _tmp51_ = gtk_radio_button_get_group (_tmp50_);
#line 99 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp58_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (_tmp57_, _ ("Set _all photos/videos to this time"));
+ _tmp52_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (_tmp51_, _ ("Set _all photos/videos to this time"));
#line 99 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp58_);
+ g_object_ref_sink (_tmp52_);
#line 99 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_g_object_unref0 (self->priv->batch_radio_button);
#line 99 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- self->priv->batch_radio_button = _tmp58_;
-#line 101 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp59_ = self->priv->batch_radio_button;
+ self->priv->batch_radio_button = _tmp52_;
#line 101 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp60_ = config_facade_get_instance ();
+ _tmp53_ = self->priv->batch_radio_button;
#line 101 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp61_ = _tmp60_;
+ _tmp54_ = config_facade_get_instance ();
#line 101 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp62_ = configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp55_ = _tmp54_;
#line 101 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_toggle_button_get_type (), GtkToggleButton), !_tmp62_);
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_toggle_button_get_type (), GtkToggleButton), !configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
#line 101 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_object_unref0 (_tmp61_);
-#line 102 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp64_ = display_options;
+ _g_object_unref0 (_tmp55_);
#line 102 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp64_) {
-#line 802 "AdjustDateTimeDialog.c"
- gint _tmp65_;
+ if (display_options) {
#line 102 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp65_ = photo_count;
-#line 102 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp63_ = _tmp65_ > 1;
-#line 808 "AdjustDateTimeDialog.c"
+ _tmp56_ = photo_count > 1;
+#line 840 "AdjustDateTimeDialog.c"
} else {
#line 102 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp63_ = FALSE;
-#line 812 "AdjustDateTimeDialog.c"
+ _tmp56_ = FALSE;
+#line 844 "AdjustDateTimeDialog.c"
}
#line 102 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp66_ = self->priv->batch_radio_button;
+ _tmp57_ = self->priv->batch_radio_button;
#line 102 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), _tmp63_);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget), _tmp56_);
#line 103 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp67_ = self->priv->batch_radio_button;
+ _tmp58_ = self->priv->batch_radio_button;
#line 103 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled, self, 0);
-#line 105 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp68_ = contains_video;
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled, self, 0);
#line 105 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp68_) {
-#line 826 "AdjustDateTimeDialog.c"
+ if (contains_video) {
+#line 856 "AdjustDateTimeDialog.c"
gchar* text = NULL;
- gint _tmp69_;
- gchar* _tmp70_;
- const gchar* _tmp71_;
- GtkCheckButton* _tmp72_;
-#line 106 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp69_ = photo_count;
+ gchar* _tmp59_;
+ const gchar* _tmp60_;
+ GtkCheckButton* _tmp61_;
#line 106 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp70_ = g_strdup (ngettext ("_Modify original photo file", "_Modify original photo files", (gulong) _tmp69_));
+ _tmp59_ = g_strdup (ngettext ("_Modify original photo file", "_Modify original photo files", (gulong) photo_count));
#line 106 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- text = _tmp70_;
+ text = _tmp59_;
#line 108 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp71_ = text;
+ _tmp60_ = text;
#line 108 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp72_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp71_);
+ _tmp61_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp60_);
#line 108 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp72_);
+ g_object_ref_sink (_tmp61_);
#line 108 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_g_object_unref0 (self->priv->modify_originals_check_button);
#line 108 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- self->priv->modify_originals_check_button = _tmp72_;
+ self->priv->modify_originals_check_button = _tmp61_;
#line 105 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_g_free0 (text);
-#line 850 "AdjustDateTimeDialog.c"
+#line 877 "AdjustDateTimeDialog.c"
} else {
gchar* text = NULL;
- gint _tmp73_;
- gchar* _tmp74_;
- const gchar* _tmp75_;
- GtkCheckButton* _tmp76_;
-#line 110 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp73_ = photo_count;
+ gchar* _tmp62_;
+ const gchar* _tmp63_;
+ GtkCheckButton* _tmp64_;
#line 110 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp74_ = g_strdup (ngettext ("_Modify original file", "_Modify original files", (gulong) _tmp73_));
+ _tmp62_ = g_strdup (ngettext ("_Modify original file", "_Modify original files", (gulong) photo_count));
#line 110 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- text = _tmp74_;
+ text = _tmp62_;
#line 111 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp75_ = text;
+ _tmp63_ = text;
#line 111 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp76_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp75_);
+ _tmp64_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp63_);
#line 111 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp76_);
+ g_object_ref_sink (_tmp64_);
#line 111 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_g_object_unref0 (self->priv->modify_originals_check_button);
#line 111 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- self->priv->modify_originals_check_button = _tmp76_;
+ self->priv->modify_originals_check_button = _tmp64_;
#line 105 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_g_free0 (text);
-#line 875 "AdjustDateTimeDialog.c"
+#line 899 "AdjustDateTimeDialog.c"
}
#line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp78_ = config_facade_get_instance ();
-#line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp79_ = _tmp78_;
+ _tmp66_ = config_facade_get_instance ();
#line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp80_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp67_ = _tmp66_;
#line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp81_ = _tmp80_;
+ _tmp68_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_object_unref0 (_tmp79_);
+ _g_object_unref0 (_tmp67_);
#line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp81_) {
-#line 889 "AdjustDateTimeDialog.c"
- gboolean _tmp82_;
-#line 115 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp82_ = display_options;
+ if (_tmp68_) {
#line 115 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp77_ = _tmp82_;
-#line 895 "AdjustDateTimeDialog.c"
+ _tmp65_ = display_options;
+#line 913 "AdjustDateTimeDialog.c"
} else {
#line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp77_ = FALSE;
-#line 899 "AdjustDateTimeDialog.c"
+ _tmp65_ = FALSE;
+#line 917 "AdjustDateTimeDialog.c"
}
#line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp83_ = self->priv->modify_originals_check_button;
+ _tmp69_ = self->priv->modify_originals_check_button;
#line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp77_);
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp65_);
#line 116 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp85_ = only_video;
-#line 116 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (!_tmp85_) {
-#line 909 "AdjustDateTimeDialog.c"
- gboolean _tmp86_ = FALSE;
- ConfigFacade* _tmp87_;
- ConfigFacade* _tmp88_;
- gboolean _tmp89_;
- gboolean _tmp90_;
-#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp87_ = config_facade_get_instance ();
-#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp88_ = _tmp87_;
+ if (!only_video) {
+#line 925 "AdjustDateTimeDialog.c"
+ gboolean _tmp71_ = FALSE;
+ ConfigFacade* _tmp72_;
+ ConfigFacade* _tmp73_;
+ gboolean _tmp74_;
#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp89_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp72_ = config_facade_get_instance ();
#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp90_ = !_tmp89_;
+ _tmp73_ = _tmp72_;
#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_object_unref0 (_tmp88_);
+ _tmp74_ = !configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp90_) {
-#line 927 "AdjustDateTimeDialog.c"
- gboolean _tmp91_;
+ _g_object_unref0 (_tmp73_);
#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp91_ = display_options;
+ if (_tmp74_) {
#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp86_ = _tmp91_;
-#line 933 "AdjustDateTimeDialog.c"
+ _tmp71_ = display_options;
+#line 942 "AdjustDateTimeDialog.c"
} else {
#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp86_ = FALSE;
-#line 937 "AdjustDateTimeDialog.c"
+ _tmp71_ = FALSE;
+#line 946 "AdjustDateTimeDialog.c"
}
#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp84_ = _tmp86_;
-#line 941 "AdjustDateTimeDialog.c"
+ _tmp70_ = _tmp71_;
+#line 950 "AdjustDateTimeDialog.c"
} else {
#line 116 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp84_ = FALSE;
-#line 945 "AdjustDateTimeDialog.c"
+ _tmp70_ = FALSE;
+#line 954 "AdjustDateTimeDialog.c"
}
#line 116 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp92_ = self->priv->modify_originals_check_button;
+ _tmp75_ = self->priv->modify_originals_check_button;
#line 116 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, gtk_widget_get_type (), GtkWidget), _tmp84_);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_widget_get_type (), GtkWidget), _tmp70_);
#line 119 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp93_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+ _tmp76_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
#line 119 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp93_);
+ g_object_ref_sink (_tmp76_);
#line 119 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- time_content = _tmp93_;
+ time_content = _tmp76_;
#line 121 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp94_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
+ _tmp77_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
#line 121 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp94_);
+ g_object_ref_sink (_tmp77_);
#line 121 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- picker = _tmp94_;
+ picker = _tmp77_;
#line 122 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp95_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+ _tmp78_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
#line 122 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp95_);
+ g_object_ref_sink (_tmp78_);
#line 122 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- combo = _tmp95_;
-#line 969 "AdjustDateTimeDialog.c"
+ combo = _tmp78_;
+#line 978 "AdjustDateTimeDialog.c"
{
gint i = 0;
#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
i = 0;
-#line 974 "AdjustDateTimeDialog.c"
+#line 983 "AdjustDateTimeDialog.c"
{
- gboolean _tmp96_ = FALSE;
+ gboolean _tmp79_ = FALSE;
#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp96_ = TRUE;
+ _tmp79_ = TRUE;
#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
while (TRUE) {
-#line 981 "AdjustDateTimeDialog.c"
- gint _tmp98_;
- GtkComboBoxText* _tmp99_;
- gint _tmp100_;
- struct tm _tmp101_ = {0};
- gchar* _tmp102_;
- gchar* _tmp103_;
-#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (!_tmp96_) {
#line 990 "AdjustDateTimeDialog.c"
- gint _tmp97_;
+ gint _tmp81_;
+ GtkComboBoxText* _tmp82_;
+ gint _tmp83_;
+ struct tm _tmp84_ = {0};
+ gchar* _tmp85_;
+ gchar* _tmp86_;
+#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+ if (!_tmp79_) {
+#line 999 "AdjustDateTimeDialog.c"
+ gint _tmp80_;
#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp97_ = i;
+ _tmp80_ = i;
#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- i = _tmp97_ + 1;
-#line 996 "AdjustDateTimeDialog.c"
+ i = _tmp80_ + 1;
+#line 1005 "AdjustDateTimeDialog.c"
}
#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp96_ = FALSE;
+ _tmp79_ = FALSE;
#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp98_ = i;
+ _tmp81_ = i;
#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (!(_tmp98_ < 12)) {
+ if (!(_tmp81_ < 12)) {
#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
break;
-#line 1006 "AdjustDateTimeDialog.c"
+#line 1015 "AdjustDateTimeDialog.c"
}
#line 124 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp99_ = combo;
+ _tmp82_ = combo;
#line 124 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp100_ = i;
+ _tmp83_ = i;
#line 124 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_time_gm ((time_t) (_tmp100_ * 2764800), &_tmp101_);
+ g_time_gm ((time_t) (_tmp83_ * 2764800), &_tmp84_);
#line 124 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp102_ = g_time_format (&_tmp101_, "%B");
+ _tmp85_ = g_time_format (&_tmp84_, "%B");
#line 124 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp103_ = _tmp102_;
+ _tmp86_ = _tmp85_;
#line 124 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_combo_box_text_append_text (_tmp99_, _tmp103_);
+ gtk_combo_box_text_append_text (_tmp82_, _tmp86_);
#line 124 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_free0 (_tmp103_);
-#line 1022 "AdjustDateTimeDialog.c"
+ _g_free0 (_tmp86_);
+#line 1031 "AdjustDateTimeDialog.c"
}
}
}
#line 126 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp104_ = picker;
+ _tmp87_ = picker;
#line 126 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp105_ = combo;
+ _tmp88_ = combo;
#line 126 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_box_pack_start (_tmp104_, G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+ gtk_box_pack_start (_tmp87_, G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
#line 128 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp106_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) (G_MAXINT >> 9), (gdouble) 1);
+ _tmp89_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) (G_MAXINT >> 9), (gdouble) 1);
#line 128 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp106_);
+ g_object_ref_sink (_tmp89_);
#line 128 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- spin = _tmp106_;
+ spin = _tmp89_;
#line 129 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp107_ = picker;
+ _tmp90_ = picker;
#line 129 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp108_ = spin;
+ _tmp91_ = spin;
#line 129 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_box_pack_end (_tmp107_, G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+ gtk_box_pack_end (_tmp90_, G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
#line 130 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp109_ = spin;
+ _tmp92_ = spin;
#line 130 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp110_ = self->priv->calendar;
+ _tmp93_ = self->priv->calendar;
#line 130 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_bind_property_with_closures (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, G_TYPE_OBJECT, GObject), "value", G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, G_TYPE_OBJECT, GObject), "year", G_BINDING_BIDIRECTIONAL, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)));
+ g_object_bind_property_with_closures (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, G_TYPE_OBJECT, GObject), "value", G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, G_TYPE_OBJECT, GObject), "year", G_BINDING_BIDIRECTIONAL, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)));
#line 131 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp111_ = combo;
+ _tmp94_ = combo;
#line 131 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp112_ = self->priv->calendar;
+ _tmp95_ = self->priv->calendar;
#line 131 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_bind_property_with_closures (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, G_TYPE_OBJECT, GObject), "active", G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, G_TYPE_OBJECT, GObject), "month", G_BINDING_BIDIRECTIONAL, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)));
+ g_object_bind_property_with_closures (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, G_TYPE_OBJECT, GObject), "active", G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, G_TYPE_OBJECT, GObject), "month", G_BINDING_BIDIRECTIONAL, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)));
#line 133 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp113_ = time_content;
+ _tmp96_ = time_content;
#line 133 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp114_ = picker;
+ _tmp97_ = picker;
#line 133 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_box_pack_start (_tmp113_, G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+ gtk_box_pack_start (_tmp96_, G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
#line 134 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp115_ = time_content;
+ _tmp98_ = time_content;
#line 134 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp116_ = self->priv->calendar;
+ _tmp99_ = self->priv->calendar;
#line 134 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_box_pack_start (_tmp115_, G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+ gtk_box_pack_start (_tmp98_, G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
#line 135 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp117_ = time_content;
+ _tmp100_ = time_content;
#line 135 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp118_ = clock;
+ _tmp101_ = clock;
#line 135 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_box_pack_start (_tmp117_, G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 137 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp119_ = display_options;
+ gtk_box_pack_start (_tmp100_, G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
#line 137 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp119_) {
-#line 1078 "AdjustDateTimeDialog.c"
- GtkBox* _tmp120_;
- GtkRadioButton* _tmp121_;
- GtkBox* _tmp122_;
- GtkRadioButton* _tmp123_;
- GtkBox* _tmp124_;
- GtkCheckButton* _tmp125_;
+ if (display_options) {
+#line 1085 "AdjustDateTimeDialog.c"
+ GtkBox* _tmp102_;
+ GtkRadioButton* _tmp103_;
+ GtkBox* _tmp104_;
+ GtkRadioButton* _tmp105_;
+ GtkBox* _tmp106_;
+ GtkCheckButton* _tmp107_;
#line 138 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp120_ = time_content;
+ _tmp102_ = time_content;
#line 138 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp121_ = self->priv->relativity_radio_button;
+ _tmp103_ = self->priv->relativity_radio_button;
#line 138 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_box_pack_start (_tmp120_, G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+ gtk_box_pack_start (_tmp102_, G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
#line 139 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp122_ = time_content;
+ _tmp104_ = time_content;
#line 139 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp123_ = self->priv->batch_radio_button;
+ _tmp105_ = self->priv->batch_radio_button;
#line 139 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_box_pack_start (_tmp122_, G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+ gtk_box_pack_start (_tmp104_, G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
#line 140 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp124_ = time_content;
+ _tmp106_ = time_content;
#line 140 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp125_ = self->priv->modify_originals_check_button;
+ _tmp107_ = self->priv->modify_originals_check_button;
#line 140 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_box_pack_start (_tmp124_, G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1103 "AdjustDateTimeDialog.c"
+ gtk_box_pack_start (_tmp106_, G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+#line 1110 "AdjustDateTimeDialog.c"
}
#line 143 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
preview = NULL;
-#line 1107 "AdjustDateTimeDialog.c"
+#line 1114 "AdjustDateTimeDialog.c"
{
- GdkPixbuf* _tmp126_ = NULL;
- Dateable* _tmp127_;
- GdkPixbuf* _tmp128_;
- GdkPixbuf* _tmp129_;
+ GdkPixbuf* _tmp108_ = NULL;
+ GdkPixbuf* _tmp109_;
+ GdkPixbuf* _tmp110_;
#line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp127_ = source;
+ _tmp109_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), ADJUST_DATE_TIME_DIALOG_CALENDAR_THUMBNAIL_SCALE, &_inner_error_);
#line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp128_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), ADJUST_DATE_TIME_DIALOG_CALENDAR_THUMBNAIL_SCALE, &_inner_error_);
-#line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp126_ = _tmp128_;
+ _tmp108_ = _tmp109_;
#line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1121 "AdjustDateTimeDialog.c"
+#line 1125 "AdjustDateTimeDialog.c"
goto __catch25_g_error;
}
#line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp129_ = _tmp126_;
+ _tmp110_ = _tmp108_;
#line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp126_ = NULL;
+ _tmp108_ = NULL;
#line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_g_object_unref0 (preview);
#line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- preview = _tmp129_;
+ preview = _tmp110_;
#line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_object_unref0 (_tmp126_);
-#line 1134 "AdjustDateTimeDialog.c"
+ _g_object_unref0 (_tmp108_);
+#line 1138 "AdjustDateTimeDialog.c"
}
goto __finally25;
__catch25_g_error:
{
GError* err = NULL;
- Dateable* _tmp130_;
- gchar* _tmp131_;
- gchar* _tmp132_;
+ gchar* _tmp111_;
+ gchar* _tmp112_;
#line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
err = _inner_error_;
#line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_inner_error_ = NULL;
#line 149 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp130_ = source;
-#line 149 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp131_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, TYPE_DATA_OBJECT, DataObject));
+ _tmp111_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject));
#line 149 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp132_ = _tmp131_;
+ _tmp112_ = _tmp111_;
#line 149 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_warning ("AdjustDateTimeDialog.vala:149: Unable to fetch preview for %s", _tmp132_);
+ g_warning ("AdjustDateTimeDialog.vala:149: Unable to fetch preview for %s", _tmp112_);
#line 149 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_free0 (_tmp132_);
+ _g_free0 (_tmp112_);
#line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_g_error_free0 (err);
-#line 1159 "AdjustDateTimeDialog.c"
+#line 1160 "AdjustDateTimeDialog.c"
}
__finally25:
#line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
@@ -1178,184 +1179,178 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
g_clear_error (&_inner_error_);
#line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
return NULL;
-#line 1182 "AdjustDateTimeDialog.c"
+#line 1183 "AdjustDateTimeDialog.c"
}
#line 152 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp133_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ _tmp113_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
#line 152 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp133_);
+ g_object_ref_sink (_tmp113_);
#line 152 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- image_content = _tmp133_;
+ image_content = _tmp113_;
#line 153 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp134_ = image_content;
+ _tmp114_ = image_content;
#line 153 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+ gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
#line 154 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp135_ = image_content;
+ _tmp115_ = image_content;
#line 154 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_box_set_homogeneous (_tmp135_, TRUE);
+ gtk_box_set_homogeneous (_tmp115_, TRUE);
#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp137_ = preview;
+ _tmp117_ = preview;
#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp137_ != NULL) {
-#line 1202 "AdjustDateTimeDialog.c"
- GdkPixbuf* _tmp138_;
- GtkImage* _tmp139_;
+ if (_tmp117_ != NULL) {
+#line 1203 "AdjustDateTimeDialog.c"
+ GdkPixbuf* _tmp118_;
+ GtkImage* _tmp119_;
#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp138_ = preview;
+ _tmp118_ = preview;
#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp139_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp138_);
+ _tmp119_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp118_);
#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp139_);
+ g_object_ref_sink (_tmp119_);
#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_object_unref0 (_tmp136_);
+ _g_object_unref0 (_tmp116_);
#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp136_ = _tmp139_;
-#line 1215 "AdjustDateTimeDialog.c"
+ _tmp116_ = _tmp119_;
+#line 1216 "AdjustDateTimeDialog.c"
} else {
- GtkImage* _tmp140_;
+ GtkImage* _tmp120_;
#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp140_ = (GtkImage*) gtk_image_new ();
+ _tmp120_ = (GtkImage*) gtk_image_new ();
#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp140_);
+ g_object_ref_sink (_tmp120_);
#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_object_unref0 (_tmp136_);
+ _g_object_unref0 (_tmp116_);
#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp136_ = _tmp140_;
-#line 1226 "AdjustDateTimeDialog.c"
+ _tmp116_ = _tmp120_;
+#line 1227 "AdjustDateTimeDialog.c"
}
#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp141_ = _g_object_ref0 (_tmp136_);
+ _tmp121_ = _g_object_ref0 (_tmp116_);
#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- image = _tmp141_;
+ image = _tmp121_;
#line 156 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp142_ = (GtkLabel*) gtk_label_new (NULL);
+ _tmp122_ = (GtkLabel*) gtk_label_new (NULL);
#line 156 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp142_);
+ g_object_ref_sink (_tmp122_);
#line 156 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_g_object_unref0 (self->priv->original_time_label);
#line 156 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- self->priv->original_time_label = _tmp142_;
+ self->priv->original_time_label = _tmp122_;
#line 157 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp143_ = image_content;
+ _tmp123_ = image_content;
#line 157 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp144_ = image;
+ _tmp124_ = image;
#line 157 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_box_pack_start (_tmp143_, G_TYPE_CHECK_INSTANCE_CAST (_tmp144_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+ gtk_box_pack_start (_tmp123_, G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
#line 158 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp145_ = image_content;
+ _tmp125_ = image_content;
#line 158 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp146_ = self->priv->original_time_label;
+ _tmp126_ = self->priv->original_time_label;
#line 158 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_box_pack_start (_tmp145_, G_TYPE_CHECK_INSTANCE_CAST (_tmp146_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+ gtk_box_pack_start (_tmp125_, G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
#line 160 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp147_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+ _tmp127_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
#line 160 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp147_);
+ g_object_ref_sink (_tmp127_);
#line 160 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- hbox = _tmp147_;
+ hbox = _tmp127_;
#line 161 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp148_ = hbox;
+ _tmp128_ = hbox;
#line 161 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp148_, gtk_container_get_type (), GtkContainer), (guint) 3);
+ gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp128_, gtk_container_get_type (), GtkContainer), (guint) 3);
#line 162 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp149_ = hbox;
+ _tmp129_ = hbox;
#line 162 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp150_ = image_content;
+ _tmp130_ = image_content;
#line 162 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_box_pack_start (_tmp149_, G_TYPE_CHECK_INSTANCE_CAST (_tmp150_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+ gtk_box_pack_start (_tmp129_, G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
#line 163 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp151_ = hbox;
+ _tmp131_ = hbox;
#line 163 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp152_ = time_content;
+ _tmp132_ = time_content;
#line 163 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_box_pack_start (_tmp151_, G_TYPE_CHECK_INSTANCE_CAST (_tmp152_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+ gtk_box_pack_start (_tmp131_, G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
#line 164 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp153_ = hbox;
+ _tmp133_ = hbox;
#line 164 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp153_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+ gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
#line 165 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp154_ = hbox;
+ _tmp134_ = hbox;
#line 165 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp154_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
#line 166 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp155_ = hbox;
+ _tmp135_ = hbox;
#line 166 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp155_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 167 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp156_ = hbox;
+ _tmp136_ = hbox;
#line 167 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp156_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp136_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 169 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp157_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+ _tmp137_ = gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
#line 169 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp158_ = hbox;
+ _tmp138_ = hbox;
#line 169 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp157_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp158_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+ gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp138_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
#line 171 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp159_ = (GtkLabel*) gtk_label_new ("");
+ _tmp139_ = (GtkLabel*) gtk_label_new ("");
#line 171 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_ref_sink (_tmp159_);
+ g_object_ref_sink (_tmp139_);
#line 171 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_g_object_unref0 (self->priv->notification);
#line 171 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- self->priv->notification = _tmp159_;
+ self->priv->notification = _tmp139_;
#line 172 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp160_ = self->priv->notification;
+ _tmp140_ = self->priv->notification;
#line 172 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_label_set_line_wrap (_tmp160_, TRUE);
+ gtk_label_set_line_wrap (_tmp140_, TRUE);
#line 173 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp161_ = self->priv->notification;
+ _tmp141_ = self->priv->notification;
#line 173 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_label_set_justify (_tmp161_, GTK_JUSTIFY_CENTER);
+ gtk_label_set_justify (_tmp141_, GTK_JUSTIFY_CENTER);
#line 175 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp162_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+ _tmp142_ = gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
#line 175 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp163_ = self->priv->notification;
+ _tmp143_ = self->priv->notification;
#line 175 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp162_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp163_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+ gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
#line 177 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp164_ = source;
-#line 177 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp165_ = dateable_get_exposure_time (_tmp164_);
-#line 177 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- self->priv->original_time = _tmp165_;
+ self->priv->original_time = dateable_get_exposure_time (source);
#line 179 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp166_ = self->priv->original_time;
+ _tmp144_ = self->priv->original_time;
#line 179 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp166_ == ((time_t) 0)) {
-#line 1328 "AdjustDateTimeDialog.c"
- time_t _tmp167_;
+ if (_tmp144_ == ((time_t) 0)) {
+#line 1325 "AdjustDateTimeDialog.c"
+ time_t _tmp145_;
#line 180 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp167_ = time (NULL);
+ _tmp145_ = time (NULL);
#line 180 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- self->priv->original_time = _tmp167_;
+ self->priv->original_time = _tmp145_;
#line 181 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
self->priv->no_original_time = TRUE;
-#line 1336 "AdjustDateTimeDialog.c"
+#line 1333 "AdjustDateTimeDialog.c"
}
#line 184 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp168_ = self->priv->original_time;
+ _tmp146_ = self->priv->original_time;
#line 184 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_time_local (_tmp168_, &_tmp169_);
+ g_time_local (_tmp146_, &_tmp147_);
#line 184 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- adjust_date_time_dialog_set_time (self, &_tmp169_);
-#line 185 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp170_ = config_facade_get_instance ();
+ adjust_date_time_dialog_set_time (self, &_tmp147_);
#line 185 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp171_ = _tmp170_;
+ _tmp148_ = config_facade_get_instance ();
#line 185 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp172_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp171_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp149_ = _tmp148_;
#line 185 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- adjust_date_time_dialog_set_original_time_label (self, _tmp172_);
+ adjust_date_time_dialog_set_original_time_label (self, configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp149_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
#line 185 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_object_unref0 (_tmp171_);
+ _g_object_unref0 (_tmp149_);
#line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_g_object_unref0 (hbox);
#line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_g_object_unref0 (image);
#line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_object_unref0 (_tmp136_);
+ _g_object_unref0 (_tmp116_);
#line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_g_object_unref0 (image_content);
#line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
@@ -1372,18 +1367,27 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
_g_object_unref0 (clock);
#line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
return self;
-#line 1376 "AdjustDateTimeDialog.c"
+#line 1371 "AdjustDateTimeDialog.c"
}
-AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video) {
+AdjustDateTimeDialog*
+adjust_date_time_dialog_new (Dateable* source,
+ gint photo_count,
+ gboolean display_options,
+ gboolean contains_video,
+ gboolean only_video)
+{
#line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
return adjust_date_time_dialog_construct (TYPE_ADJUST_DATE_TIME_DIALOG, source, photo_count, display_options, contains_video, only_video);
-#line 1383 "AdjustDateTimeDialog.c"
+#line 1384 "AdjustDateTimeDialog.c"
}
-static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct tm* time) {
+static void
+adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self,
+ struct tm* time)
+{
GtkCalendar* _tmp0_;
struct tm _tmp1_;
gint _tmp2_;
@@ -1397,15 +1401,13 @@ static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct
ConfigFacade* _tmp10_;
ConfigFacade* _tmp11_;
gboolean _tmp12_;
- gboolean _tmp13_;
- GtkSpinButton* _tmp28_;
- struct tm _tmp29_;
- gint _tmp30_;
- GtkSpinButton* _tmp31_;
- struct tm _tmp32_;
- gint _tmp33_;
- GtkComboBoxText* _tmp34_;
- gint _tmp35_;
+ GtkSpinButton* _tmp27_;
+ struct tm _tmp28_;
+ gint _tmp29_;
+ GtkSpinButton* _tmp30_;
+ struct tm _tmp31_;
+ gint _tmp32_;
+ GtkComboBoxText* _tmp33_;
#line 188 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
#line 188 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
@@ -1445,122 +1447,120 @@ static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct
#line 194 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_tmp12_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 194 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp13_ = _tmp12_;
-#line 194 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_g_object_unref0 (_tmp11_);
#line 194 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp13_) {
+ if (_tmp12_) {
#line 1454 "AdjustDateTimeDialog.c"
- GtkComboBoxText* _tmp14_;
- GtkSpinButton* _tmp15_;
- struct tm _tmp16_;
- gint _tmp17_;
+ GtkComboBoxText* _tmp13_;
+ GtkSpinButton* _tmp14_;
+ struct tm _tmp15_;
+ gint _tmp16_;
#line 195 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp14_ = self->priv->system;
+ _tmp13_ = self->priv->system;
#line 195 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_combo_box_get_type (), GtkComboBox), (gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR);
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_combo_box_get_type (), GtkComboBox), (gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR);
#line 196 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp15_ = self->priv->hour;
+ _tmp14_ = self->priv->hour;
#line 196 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp16_ = *time;
+ _tmp15_ = *time;
#line 196 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp17_ = _tmp16_.tm_hour;
+ _tmp16_ = _tmp15_.tm_hour;
#line 196 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_spin_button_set_value (_tmp15_, (gdouble) _tmp17_);
+ gtk_spin_button_set_value (_tmp14_, (gdouble) _tmp16_);
#line 1471 "AdjustDateTimeDialog.c"
} else {
gint AMPM_hour = 0;
- struct tm _tmp18_;
- gint _tmp19_;
- gint _tmp20_ = 0;
- gint _tmp21_;
- GtkSpinButton* _tmp23_;
- AdjustDateTimeDialogTimeSystem _tmp24_ = 0;
- struct tm _tmp25_;
- gint _tmp26_;
- GtkComboBoxText* _tmp27_;
+ struct tm _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_ = 0;
+ gint _tmp20_;
+ GtkSpinButton* _tmp22_;
+ AdjustDateTimeDialogTimeSystem _tmp23_ = 0;
+ struct tm _tmp24_;
+ gint _tmp25_;
+ GtkComboBoxText* _tmp26_;
#line 198 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp18_ = *time;
+ _tmp17_ = *time;
#line 198 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp19_ = _tmp18_.tm_hour;
+ _tmp18_ = _tmp17_.tm_hour;
#line 198 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- AMPM_hour = _tmp19_ % 12;
+ AMPM_hour = _tmp18_ % 12;
#line 199 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp21_ = AMPM_hour;
+ _tmp20_ = AMPM_hour;
#line 199 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp21_ == 0) {
+ if (_tmp20_ == 0) {
#line 199 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp20_ = 12;
+ _tmp19_ = 12;
#line 1495 "AdjustDateTimeDialog.c"
} else {
- gint _tmp22_;
+ gint _tmp21_;
#line 199 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp22_ = AMPM_hour;
+ _tmp21_ = AMPM_hour;
#line 199 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp20_ = _tmp22_;
+ _tmp19_ = _tmp21_;
#line 1502 "AdjustDateTimeDialog.c"
}
#line 199 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp23_ = self->priv->hour;
+ _tmp22_ = self->priv->hour;
#line 199 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_spin_button_set_value (_tmp23_, (gdouble) _tmp20_);
+ gtk_spin_button_set_value (_tmp22_, (gdouble) _tmp19_);
#line 200 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp25_ = *time;
+ _tmp24_ = *time;
#line 200 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp26_ = _tmp25_.tm_hour;
+ _tmp25_ = _tmp24_.tm_hour;
#line 200 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp26_ >= 12) {
+ if (_tmp25_ >= 12) {
#line 200 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp24_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM;
+ _tmp23_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM;
#line 1516 "AdjustDateTimeDialog.c"
} else {
#line 200 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp24_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_AM;
+ _tmp23_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_AM;
#line 1520 "AdjustDateTimeDialog.c"
}
#line 200 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp27_ = self->priv->system;
+ _tmp26_ = self->priv->system;
#line 200 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp24_);
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp23_);
#line 1526 "AdjustDateTimeDialog.c"
}
#line 203 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp28_ = self->priv->minute;
+ _tmp27_ = self->priv->minute;
#line 203 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp29_ = *time;
+ _tmp28_ = *time;
#line 203 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp30_ = _tmp29_.tm_min;
+ _tmp29_ = _tmp28_.tm_min;
#line 203 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_spin_button_set_value (_tmp28_, (gdouble) _tmp30_);
+ gtk_spin_button_set_value (_tmp27_, (gdouble) _tmp29_);
#line 204 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp31_ = self->priv->second;
+ _tmp30_ = self->priv->second;
#line 204 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp32_ = *time;
+ _tmp31_ = *time;
#line 204 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp33_ = _tmp32_.tm_sec;
+ _tmp32_ = _tmp31_.tm_sec;
#line 204 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_spin_button_set_value (_tmp31_, (gdouble) _tmp33_);
+ gtk_spin_button_set_value (_tmp30_, (gdouble) _tmp32_);
#line 206 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp34_ = self->priv->system;
+ _tmp33_ = self->priv->system;
#line 206 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp35_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox));
-#line 206 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- self->priv->previous_time_system = (AdjustDateTimeDialogTimeSystem) _tmp35_;
-#line 1550 "AdjustDateTimeDialog.c"
+ self->priv->previous_time_system = (AdjustDateTimeDialogTimeSystem) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_combo_box_get_type (), GtkComboBox));
+#line 1548 "AdjustDateTimeDialog.c"
}
-static void adjust_date_time_dialog_set_original_time_label (AdjustDateTimeDialog* self, gboolean use_24_hr_format) {
+static void
+adjust_date_time_dialog_set_original_time_label (AdjustDateTimeDialog* self,
+ gboolean use_24_hr_format)
+{
gboolean _tmp0_;
const gchar* _tmp1_ = NULL;
- gboolean _tmp2_;
- GtkLabel* _tmp3_;
- time_t _tmp4_;
- struct tm _tmp5_ = {0};
+ GtkLabel* _tmp2_;
+ time_t _tmp3_;
+ struct tm _tmp4_ = {0};
+ gchar* _tmp5_;
gchar* _tmp6_;
gchar* _tmp7_;
gchar* _tmp8_;
- gchar* _tmp9_;
#line 209 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
#line 210 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
@@ -1572,66 +1572,61 @@ static void adjust_date_time_dialog_set_original_time_label (AdjustDateTimeDialo
#line 1573 "AdjustDateTimeDialog.c"
}
#line 214 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp2_ = use_24_hr_format;
-#line 214 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp2_) {
+ if (use_24_hr_format) {
#line 214 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_tmp1_ = _ ("%m/%d/%Y, %H:%M:%S");
-#line 1581 "AdjustDateTimeDialog.c"
+#line 1579 "AdjustDateTimeDialog.c"
} else {
#line 215 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_tmp1_ = _ ("%m/%d/%Y, %I:%M:%S %p");
-#line 1585 "AdjustDateTimeDialog.c"
+#line 1583 "AdjustDateTimeDialog.c"
}
#line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp3_ = self->priv->original_time_label;
+ _tmp2_ = self->priv->original_time_label;
#line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp4_ = self->priv->original_time;
+ _tmp3_ = self->priv->original_time;
#line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_time_local (_tmp4_, &_tmp5_);
+ g_time_local (_tmp3_, &_tmp4_);
#line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp6_ = g_time_format (&_tmp5_, _tmp1_);
+ _tmp5_ = g_time_format (&_tmp4_, _tmp1_);
#line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp8_ = g_strconcat (_ ("Original: "), _tmp7_, NULL);
+ _tmp7_ = g_strconcat (_ ("Original: "), _tmp6_, NULL);
#line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_label_set_text (_tmp3_, _tmp9_);
+ gtk_label_set_text (_tmp2_, _tmp8_);
#line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp8_);
#line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_free0 (_tmp7_);
-#line 1607 "AdjustDateTimeDialog.c"
+ _g_free0 (_tmp6_);
+#line 1605 "AdjustDateTimeDialog.c"
}
-static time_t adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self) {
+static time_t
+adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self)
+{
time_t result = 0;
struct tm time = {0};
GtkSpinButton* _tmp0_;
- gdouble _tmp1_;
- GtkSpinButton* _tmp2_;
- gdouble _tmp3_;
+ GtkSpinButton* _tmp1_;
gint hour = 0;
- GtkSpinButton* _tmp4_;
- gdouble _tmp5_;
- gint _tmp6_ = 0;
- gboolean _tmp7_ = FALSE;
- gint _tmp8_;
- gint _tmp12_ = 0;
- GtkComboBoxText* _tmp13_;
- gint _tmp14_;
- gint _tmp15_;
+ GtkSpinButton* _tmp2_;
+ gint _tmp3_ = 0;
+ gboolean _tmp4_ = FALSE;
+ gint _tmp5_;
+ gint _tmp8_ = 0;
+ GtkComboBoxText* _tmp9_;
+ gint _tmp10_;
guint year = 0U;
guint month = 0U;
guint day = 0U;
- GtkCalendar* _tmp16_;
- guint _tmp17_ = 0U;
- guint _tmp18_ = 0U;
- guint _tmp19_ = 0U;
- time_t _tmp20_;
+ GtkCalendar* _tmp11_;
+ guint _tmp12_ = 0U;
+ guint _tmp13_ = 0U;
+ guint _tmp14_ = 0U;
#line 218 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), 0);
#line 219 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
@@ -1639,83 +1634,72 @@ static time_t adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self) {
#line 221 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_tmp0_ = self->priv->second;
#line 221 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp1_ = gtk_spin_button_get_value (_tmp0_);
-#line 221 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- time.tm_sec = (gint) _tmp1_;
-#line 222 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp2_ = self->priv->minute;
+ time.tm_sec = (gint) gtk_spin_button_get_value (_tmp0_);
#line 222 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp3_ = gtk_spin_button_get_value (_tmp2_);
+ _tmp1_ = self->priv->minute;
#line 222 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- time.tm_min = (gint) _tmp3_;
+ time.tm_min = (gint) gtk_spin_button_get_value (_tmp1_);
#line 225 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp4_ = self->priv->hour;
+ _tmp2_ = self->priv->hour;
#line 225 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp5_ = gtk_spin_button_get_value (_tmp4_);
-#line 225 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- hour = (gint) _tmp5_;
-#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp8_ = hour;
+ hour = (gint) gtk_spin_button_get_value (_tmp2_);
#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp8_ == 12) {
-#line 1662 "AdjustDateTimeDialog.c"
- GtkComboBoxText* _tmp9_;
- gint _tmp10_;
+ _tmp5_ = hour;
#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp9_ = self->priv->system;
+ if (_tmp5_ == 12) {
+#line 1651 "AdjustDateTimeDialog.c"
+ GtkComboBoxText* _tmp6_;
#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp10_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox));
+ _tmp6_ = self->priv->system;
#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp7_ = _tmp10_ != ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR);
-#line 1671 "AdjustDateTimeDialog.c"
+ _tmp4_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox)) != ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR);
+#line 1657 "AdjustDateTimeDialog.c"
} else {
#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp7_ = FALSE;
-#line 1675 "AdjustDateTimeDialog.c"
+ _tmp4_ = FALSE;
+#line 1661 "AdjustDateTimeDialog.c"
}
#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp7_) {
+ if (_tmp4_) {
#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp6_ = 0;
-#line 1681 "AdjustDateTimeDialog.c"
+ _tmp3_ = 0;
+#line 1667 "AdjustDateTimeDialog.c"
} else {
- gint _tmp11_;
+ gint _tmp7_;
#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp11_ = hour;
+ _tmp7_ = hour;
#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp6_ = _tmp11_;
-#line 1688 "AdjustDateTimeDialog.c"
+ _tmp3_ = _tmp7_;
+#line 1674 "AdjustDateTimeDialog.c"
}
#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- time.tm_hour = _tmp6_;
-#line 227 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp13_ = self->priv->system;
+ time.tm_hour = _tmp3_;
#line 227 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp14_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_combo_box_get_type (), GtkComboBox));
+ _tmp9_ = self->priv->system;
#line 227 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp14_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM)) {
+ if (gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox)) == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM)) {
#line 227 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp12_ = 12;
-#line 1700 "AdjustDateTimeDialog.c"
+ _tmp8_ = 12;
+#line 1684 "AdjustDateTimeDialog.c"
} else {
#line 227 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp12_ = 0;
-#line 1704 "AdjustDateTimeDialog.c"
+ _tmp8_ = 0;
+#line 1688 "AdjustDateTimeDialog.c"
}
#line 227 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp15_ = time.tm_hour;
+ _tmp10_ = time.tm_hour;
#line 227 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- time.tm_hour = _tmp15_ + _tmp12_;
+ time.tm_hour = _tmp10_ + _tmp8_;
#line 230 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp16_ = self->priv->calendar;
+ _tmp11_ = self->priv->calendar;
#line 230 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_calendar_get_date (_tmp16_, &_tmp17_, &_tmp18_, &_tmp19_);
+ gtk_calendar_get_date (_tmp11_, &_tmp12_, &_tmp13_, &_tmp14_);
#line 230 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- year = _tmp17_;
+ year = _tmp12_;
#line 230 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- month = _tmp18_;
+ month = _tmp13_;
#line 230 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- day = _tmp19_;
+ day = _tmp14_;
#line 231 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
time.tm_year = ((gint) year) - ADJUST_DATE_TIME_DIALOG_YEAR_OFFSET;
#line 232 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
@@ -1725,22 +1709,24 @@ static time_t adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self) {
#line 235 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
time.tm_isdst = -1;
#line 237 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp20_ = mktime (&time);
-#line 237 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- result = _tmp20_;
+ result = mktime (&time);
#line 237 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
return result;
-#line 1734 "AdjustDateTimeDialog.c"
+#line 1716 "AdjustDateTimeDialog.c"
}
-gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* time_shift, gboolean* keep_relativity, gboolean* modify_originals) {
+gboolean
+adjust_date_time_dialog_execute (AdjustDateTimeDialog* self,
+ gint64* time_shift,
+ gboolean* keep_relativity,
+ gboolean* modify_originals)
+{
gint64 _vala_time_shift = 0LL;
gboolean _vala_keep_relativity = FALSE;
gboolean _vala_modify_originals = FALSE;
gboolean result = FALSE;
gboolean response = FALSE;
- gint _tmp0_;
#line 240 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), FALSE);
#line 242 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
@@ -1748,106 +1734,91 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti
#line 244 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
response = FALSE;
#line 246 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 246 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 1755 "AdjustDateTimeDialog.c"
- gboolean _tmp1_;
- GtkRadioButton* _tmp5_;
- gboolean _tmp6_;
- GtkRadioButton* _tmp7_;
- gboolean _tmp8_;
- gboolean _tmp9_;
- GtkCheckButton* _tmp13_;
- gboolean _tmp14_;
- GtkCheckButton* _tmp15_;
- gboolean _tmp16_;
- gboolean _tmp17_;
+ if (gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)) == ((gint) GTK_RESPONSE_OK)) {
+#line 1739 "AdjustDateTimeDialog.c"
+ gboolean _tmp0_;
+ GtkRadioButton* _tmp2_;
+ GtkRadioButton* _tmp3_;
+ gboolean _tmp4_;
+ gboolean _tmp5_;
+ GtkCheckButton* _tmp9_;
+ GtkCheckButton* _tmp10_;
+ gboolean _tmp11_;
+ gboolean _tmp12_;
#line 247 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp1_ = self->priv->no_original_time;
+ _tmp0_ = self->priv->no_original_time;
#line 247 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp1_) {
-#line 1771 "AdjustDateTimeDialog.c"
- time_t _tmp2_;
-#line 248 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp2_ = adjust_date_time_dialog_get_time (self);
+ if (_tmp0_) {
#line 248 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _vala_time_shift = (gint64) _tmp2_;
-#line 1777 "AdjustDateTimeDialog.c"
+ _vala_time_shift = (gint64) adjust_date_time_dialog_get_time (self);
+#line 1755 "AdjustDateTimeDialog.c"
} else {
- time_t _tmp3_;
- time_t _tmp4_;
-#line 250 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp3_ = adjust_date_time_dialog_get_time (self);
+ time_t _tmp1_;
#line 250 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp4_ = self->priv->original_time;
+ _tmp1_ = self->priv->original_time;
#line 250 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _vala_time_shift = (gint64) (_tmp3_ - _tmp4_);
-#line 1787 "AdjustDateTimeDialog.c"
+ _vala_time_shift = (gint64) (adjust_date_time_dialog_get_time (self) - _tmp1_);
+#line 1762 "AdjustDateTimeDialog.c"
}
#line 252 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp5_ = self->priv->relativity_radio_button;
+ _tmp2_ = self->priv->relativity_radio_button;
#line 252 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp6_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 252 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _vala_keep_relativity = _tmp6_;
+ _vala_keep_relativity = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton));
#line 254 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp7_ = self->priv->relativity_radio_button;
+ _tmp3_ = self->priv->relativity_radio_button;
#line 254 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp8_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
+ _tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
#line 254 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp9_ = _tmp8_;
+ _tmp5_ = _tmp4_;
#line 254 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp9_) {
-#line 1803 "AdjustDateTimeDialog.c"
- ConfigFacade* _tmp10_;
- ConfigFacade* _tmp11_;
- gboolean _tmp12_;
+ if (_tmp5_) {
+#line 1776 "AdjustDateTimeDialog.c"
+ ConfigFacade* _tmp6_;
+ ConfigFacade* _tmp7_;
+ gboolean _tmp8_;
#line 255 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp10_ = config_facade_get_instance ();
+ _tmp6_ = config_facade_get_instance ();
#line 255 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp11_ = _tmp10_;
+ _tmp7_ = _tmp6_;
#line 255 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp12_ = _vala_keep_relativity;
+ _tmp8_ = _vala_keep_relativity;
#line 255 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- configuration_facade_set_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_);
+ configuration_facade_set_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp8_);
#line 255 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_object_unref0 (_tmp11_);
-#line 1817 "AdjustDateTimeDialog.c"
+ _g_object_unref0 (_tmp7_);
+#line 1790 "AdjustDateTimeDialog.c"
}
#line 257 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp13_ = self->priv->modify_originals_check_button;
-#line 257 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp14_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_toggle_button_get_type (), GtkToggleButton));
+ _tmp9_ = self->priv->modify_originals_check_button;
#line 257 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _vala_modify_originals = _tmp14_;
+ _vala_modify_originals = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton));
#line 259 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp15_ = self->priv->modify_originals_check_button;
+ _tmp10_ = self->priv->modify_originals_check_button;
#line 259 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp16_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget));
+ _tmp11_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
#line 259 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp17_ = _tmp16_;
+ _tmp12_ = _tmp11_;
#line 259 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp17_) {
-#line 1833 "AdjustDateTimeDialog.c"
- ConfigFacade* _tmp18_;
- ConfigFacade* _tmp19_;
- gboolean _tmp20_;
+ if (_tmp12_) {
+#line 1804 "AdjustDateTimeDialog.c"
+ ConfigFacade* _tmp13_;
+ ConfigFacade* _tmp14_;
+ gboolean _tmp15_;
#line 260 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp18_ = config_facade_get_instance ();
+ _tmp13_ = config_facade_get_instance ();
#line 260 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp19_ = _tmp18_;
+ _tmp14_ = _tmp13_;
#line 260 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp20_ = _vala_modify_originals;
+ _tmp15_ = _vala_modify_originals;
#line 260 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- configuration_facade_set_modify_originals (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp20_);
+ configuration_facade_set_modify_originals (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp15_);
#line 260 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_object_unref0 (_tmp19_);
-#line 1847 "AdjustDateTimeDialog.c"
+ _g_object_unref0 (_tmp14_);
+#line 1818 "AdjustDateTimeDialog.c"
}
#line 262 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
response = TRUE;
-#line 1851 "AdjustDateTimeDialog.c"
+#line 1822 "AdjustDateTimeDialog.c"
} else {
#line 264 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_vala_time_shift = (gint64) 0;
@@ -1855,7 +1826,7 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti
_vala_keep_relativity = TRUE;
#line 266 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_vala_modify_originals = FALSE;
-#line 1859 "AdjustDateTimeDialog.c"
+#line 1830 "AdjustDateTimeDialog.c"
}
#line 269 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
@@ -1865,288 +1836,271 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti
if (time_shift) {
#line 271 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
*time_shift = _vala_time_shift;
-#line 1869 "AdjustDateTimeDialog.c"
+#line 1840 "AdjustDateTimeDialog.c"
}
#line 271 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
if (keep_relativity) {
#line 271 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
*keep_relativity = _vala_keep_relativity;
-#line 1875 "AdjustDateTimeDialog.c"
+#line 1846 "AdjustDateTimeDialog.c"
}
#line 271 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
if (modify_originals) {
#line 271 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
*modify_originals = _vala_modify_originals;
-#line 1881 "AdjustDateTimeDialog.c"
+#line 1852 "AdjustDateTimeDialog.c"
}
#line 271 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
return result;
-#line 1885 "AdjustDateTimeDialog.c"
+#line 1856 "AdjustDateTimeDialog.c"
}
-static gboolean adjust_date_time_dialog_on_spin_button_output (AdjustDateTimeDialog* self, GtkSpinButton* button) {
+static gboolean
+adjust_date_time_dialog_on_spin_button_output (AdjustDateTimeDialog* self,
+ GtkSpinButton* button)
+{
gboolean result = FALSE;
- GtkSpinButton* _tmp0_;
- GtkSpinButton* _tmp1_;
- gdouble _tmp2_;
- gchar* _tmp3_;
- gchar* _tmp4_;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
#line 274 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), FALSE);
#line 274 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (button), FALSE);
#line 275 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp0_ = button;
+ _tmp0_ = g_strdup_printf ("%02d", (gint) gtk_spin_button_get_value (button));
#line 275 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp1_ = button;
+ _tmp1_ = _tmp0_;
#line 275 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp2_ = gtk_spin_button_get_value (_tmp1_);
+ gtk_entry_set_text (G_TYPE_CHECK_INSTANCE_CAST (button, gtk_entry_get_type (), GtkEntry), _tmp1_);
#line 275 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp3_ = g_strdup_printf ("%02d", (gint) _tmp2_);
-#line 275 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp4_ = _tmp3_;
-#line 275 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_entry_set_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_entry_get_type (), GtkEntry), _tmp4_);
-#line 275 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_free0 (_tmp4_);
+ _g_free0 (_tmp1_);
#line 277 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
adjust_date_time_dialog_on_time_changed (self);
#line 279 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
result = TRUE;
#line 279 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
return result;
-#line 1920 "AdjustDateTimeDialog.c"
+#line 1885 "AdjustDateTimeDialog.c"
}
-static void adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self) {
+static void
+adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self)
+{
gint64 time_shift = 0LL;
time_t _tmp0_;
- time_t _tmp1_;
+ GtkCalendar* _tmp1_;
GtkCalendar* _tmp2_;
- GtkCalendar* _tmp3_;
- GtkComboBoxText* _tmp4_;
- gint _tmp5_;
- gboolean _tmp6_ = FALSE;
- gboolean _tmp7_ = FALSE;
- gint64 _tmp8_;
+ GtkComboBoxText* _tmp3_;
+ gboolean _tmp4_ = FALSE;
+ gboolean _tmp5_ = FALSE;
+ gint64 _tmp6_;
#line 282 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
#line 283 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp0_ = adjust_date_time_dialog_get_time (self);
-#line 283 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp1_ = self->priv->original_time;
+ _tmp0_ = self->priv->original_time;
#line 283 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- time_shift = ((gint64) _tmp0_) - ((gint64) _tmp1_);
+ time_shift = ((gint64) adjust_date_time_dialog_get_time (self)) - ((gint64) _tmp0_);
#line 284 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp2_ = self->priv->calendar;
+ _tmp1_ = self->priv->calendar;
#line 284 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_notify (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, G_TYPE_OBJECT, GObject), "year");
+ g_object_notify (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_OBJECT, GObject), "year");
#line 285 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp3_ = self->priv->calendar;
+ _tmp2_ = self->priv->calendar;
#line 285 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- g_object_notify (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_OBJECT, GObject), "month");
+ g_object_notify (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, G_TYPE_OBJECT, GObject), "month");
#line 287 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp4_ = self->priv->system;
-#line 287 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp5_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox));
+ _tmp3_ = self->priv->system;
#line 287 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- self->priv->previous_time_system = (AdjustDateTimeDialogTimeSystem) _tmp5_;
+ self->priv->previous_time_system = (AdjustDateTimeDialogTimeSystem) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox));
#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp8_ = time_shift;
+ _tmp6_ = time_shift;
#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp8_ == ((gint64) 0)) {
+ if (_tmp6_ == ((gint64) 0)) {
#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp7_ = TRUE;
-#line 1963 "AdjustDateTimeDialog.c"
+ _tmp5_ = TRUE;
+#line 1924 "AdjustDateTimeDialog.c"
} else {
- gboolean _tmp9_;
+ gboolean _tmp7_;
#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp9_ = self->priv->no_original_time;
+ _tmp7_ = self->priv->no_original_time;
#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp7_ = _tmp9_;
-#line 1970 "AdjustDateTimeDialog.c"
+ _tmp5_ = _tmp7_;
+#line 1931 "AdjustDateTimeDialog.c"
}
#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp7_) {
+ if (_tmp5_) {
#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp6_ = TRUE;
-#line 1976 "AdjustDateTimeDialog.c"
+ _tmp4_ = TRUE;
+#line 1937 "AdjustDateTimeDialog.c"
} else {
- gboolean _tmp10_ = FALSE;
- GtkRadioButton* _tmp11_;
- gboolean _tmp12_;
+ gboolean _tmp8_ = FALSE;
+ GtkRadioButton* _tmp9_;
#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp11_ = self->priv->batch_radio_button;
+ _tmp9_ = self->priv->batch_radio_button;
#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp12_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp12_) {
-#line 1987 "AdjustDateTimeDialog.c"
- GtkRadioButton* _tmp13_;
- gboolean _tmp14_;
- gboolean _tmp15_;
+ if (gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton))) {
+#line 1945 "AdjustDateTimeDialog.c"
+ GtkRadioButton* _tmp10_;
+ gboolean _tmp11_;
+ gboolean _tmp12_;
#line 290 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp13_ = self->priv->batch_radio_button;
+ _tmp10_ = self->priv->batch_radio_button;
#line 290 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp14_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
+ _tmp11_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
#line 290 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp15_ = _tmp14_;
+ _tmp12_ = _tmp11_;
#line 290 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp10_ = _tmp15_;
-#line 1999 "AdjustDateTimeDialog.c"
+ _tmp8_ = _tmp12_;
+#line 1957 "AdjustDateTimeDialog.c"
} else {
#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp10_ = FALSE;
-#line 2003 "AdjustDateTimeDialog.c"
+ _tmp8_ = FALSE;
+#line 1961 "AdjustDateTimeDialog.c"
}
#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp6_ = _tmp10_;
-#line 2007 "AdjustDateTimeDialog.c"
+ _tmp4_ = _tmp8_;
+#line 1965 "AdjustDateTimeDialog.c"
}
#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp6_) {
-#line 2011 "AdjustDateTimeDialog.c"
- GtkLabel* _tmp16_;
+ if (_tmp4_) {
+#line 1969 "AdjustDateTimeDialog.c"
+ GtkLabel* _tmp13_;
#line 291 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp16_ = self->priv->notification;
+ _tmp13_ = self->priv->notification;
#line 291 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget));
-#line 2017 "AdjustDateTimeDialog.c"
+ gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
+#line 1975 "AdjustDateTimeDialog.c"
} else {
gboolean forward = FALSE;
- gint64 _tmp17_;
+ gint64 _tmp14_;
gint days = 0;
gint hours = 0;
gint minutes = 0;
gint seconds = 0;
+ gint64 _tmp15_;
+ gint64 _tmp16_;
+ gint64 _tmp17_;
gint64 _tmp18_;
gint64 _tmp19_;
gint64 _tmp20_;
gint64 _tmp21_;
- gint64 _tmp22_;
- gint64 _tmp23_;
- gint64 _tmp24_;
- gint64 _tmp25_;
- const gchar* _tmp26_ = NULL;
- gboolean _tmp27_;
+ const gchar* _tmp22_ = NULL;
+ gboolean _tmp23_;
gchar* shift_status = NULL;
- gchar* _tmp28_;
- GtkLabel* _tmp29_;
- const gchar* _tmp30_;
+ gchar* _tmp24_;
+ GtkLabel* _tmp25_;
+ const gchar* _tmp26_;
+ gint _tmp27_;
+ gint _tmp28_;
+ gint _tmp29_;
+ gint _tmp30_;
gint _tmp31_;
gint _tmp32_;
gint _tmp33_;
gint _tmp34_;
- gint _tmp35_;
- gint _tmp36_;
- gint _tmp37_;
- gint _tmp38_;
- gchar* _tmp39_;
- gchar* _tmp40_;
- GtkLabel* _tmp41_;
+ gchar* _tmp35_;
+ gchar* _tmp36_;
+ GtkLabel* _tmp37_;
#line 293 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp17_ = time_shift;
+ _tmp14_ = time_shift;
#line 293 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- forward = _tmp17_ > ((gint64) 0);
-#line 296 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp18_ = time_shift;
+ forward = _tmp14_ > ((gint64) 0);
#line 296 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp19_ = llabs (_tmp18_);
+ _tmp15_ = time_shift;
#line 296 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- time_shift = _tmp19_;
+ time_shift = llabs (_tmp15_);
#line 298 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp20_ = time_shift;
+ _tmp16_ = time_shift;
#line 298 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- days = (gint) (_tmp20_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY);
+ days = (gint) (_tmp16_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY);
#line 299 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp21_ = time_shift;
+ _tmp17_ = time_shift;
#line 299 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- time_shift = _tmp21_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY;
+ time_shift = _tmp17_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY;
#line 300 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp22_ = time_shift;
+ _tmp18_ = time_shift;
#line 300 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- hours = (gint) (_tmp22_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR);
+ hours = (gint) (_tmp18_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR);
#line 301 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp23_ = time_shift;
+ _tmp19_ = time_shift;
#line 301 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- time_shift = _tmp23_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR;
+ time_shift = _tmp19_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR;
#line 302 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp24_ = time_shift;
+ _tmp20_ = time_shift;
#line 302 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- minutes = (gint) (_tmp24_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE);
+ minutes = (gint) (_tmp20_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE);
#line 303 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp25_ = time_shift;
+ _tmp21_ = time_shift;
#line 303 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- seconds = (gint) (_tmp25_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE);
+ seconds = (gint) (_tmp21_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE);
#line 305 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp27_ = forward;
+ _tmp23_ = forward;
#line 305 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp27_) {
+ if (_tmp23_) {
#line 306 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp26_ = _ ("Exposure time will be shifted forward by\n" \
+ _tmp22_ = _ ("Exposure time will be shifted forward by\n" \
"%d %s, %d %s, %d %s, and %d %s.");
-#line 2090 "AdjustDateTimeDialog.c"
+#line 2045 "AdjustDateTimeDialog.c"
} else {
#line 307 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp26_ = _ ("Exposure time will be shifted backward by\n" \
+ _tmp22_ = _ ("Exposure time will be shifted backward by\n" \
"%d %s, %d %s, %d %s, and %d %s.");
-#line 2094 "AdjustDateTimeDialog.c"
+#line 2049 "AdjustDateTimeDialog.c"
}
#line 305 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp28_ = g_strdup (_tmp26_);
+ _tmp24_ = g_strdup (_tmp22_);
#line 305 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- shift_status = _tmp28_;
+ shift_status = _tmp24_;
#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp29_ = self->priv->notification;
+ _tmp25_ = self->priv->notification;
#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp30_ = shift_status;
+ _tmp26_ = shift_status;
#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp31_ = days;
+ _tmp27_ = days;
#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp32_ = days;
+ _tmp28_ = days;
#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp33_ = hours;
+ _tmp29_ = hours;
#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp34_ = hours;
+ _tmp30_ = hours;
#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp35_ = minutes;
+ _tmp31_ = minutes;
#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp36_ = minutes;
+ _tmp32_ = minutes;
#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp37_ = seconds;
+ _tmp33_ = seconds;
#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp38_ = seconds;
+ _tmp34_ = seconds;
#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp39_ = g_strdup_printf (_tmp30_, _tmp31_, ngettext ("day", "days", (gulong) _tmp32_), _tmp33_, ngettext ("hour", "hours", (gulong) _tmp34_), _tmp35_, ngettext ("minute", "minutes", (gulong) _tmp36_), _tmp37_, ngettext ("second", "seconds", (gulong) _tmp38_));
+ _tmp35_ = g_strdup_printf (_tmp26_, _tmp27_, ngettext ("day", "days", (gulong) _tmp28_), _tmp29_, ngettext ("hour", "hours", (gulong) _tmp30_), _tmp31_, ngettext ("minute", "minutes", (gulong) _tmp32_), _tmp33_, ngettext ("second", "seconds", (gulong) _tmp34_));
#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp40_ = _tmp39_;
+ _tmp36_ = _tmp35_;
#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_label_set_text (_tmp29_, _tmp40_);
+ gtk_label_set_text (_tmp25_, _tmp36_);
#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_free0 (_tmp40_);
+ _g_free0 (_tmp36_);
#line 314 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp41_ = self->priv->notification;
+ _tmp37_ = self->priv->notification;
#line 314 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget));
+ gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget));
#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_g_free0 (shift_status);
-#line 2134 "AdjustDateTimeDialog.c"
+#line 2089 "AdjustDateTimeDialog.c"
}
}
-static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog* self) {
+static void
+adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog* self)
+{
AdjustDateTimeDialogTimeSystem _tmp0_;
GtkComboBoxText* _tmp1_;
- gint _tmp2_;
+ ConfigFacade* _tmp2_;
ConfigFacade* _tmp3_;
- ConfigFacade* _tmp4_;
+ GtkComboBoxText* _tmp4_;
GtkComboBoxText* _tmp5_;
- gint _tmp6_;
- GtkComboBoxText* _tmp7_;
- gint _tmp8_;
#line 318 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
#line 319 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
@@ -2154,161 +2108,152 @@ static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog
#line 319 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
_tmp1_ = self->priv->system;
#line 319 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 319 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp0_ == _tmp2_) {
+ if (_tmp0_ == gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox))) {
#line 320 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
return;
-#line 2161 "AdjustDateTimeDialog.c"
+#line 2113 "AdjustDateTimeDialog.c"
}
#line 322 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp3_ = config_facade_get_instance ();
-#line 322 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp4_ = _tmp3_;
+ _tmp2_ = config_facade_get_instance ();
#line 322 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp5_ = self->priv->system;
+ _tmp3_ = _tmp2_;
#line 322 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp6_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox));
+ _tmp4_ = self->priv->system;
#line 322 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- configuration_facade_set_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR));
+ configuration_facade_set_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox)) == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR));
#line 322 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _g_object_unref0 (_tmp4_);
-#line 324 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp7_ = self->priv->system;
+ _g_object_unref0 (_tmp3_);
#line 324 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp8_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox));
+ _tmp5_ = self->priv->system;
#line 324 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp8_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR)) {
-#line 2181 "AdjustDateTimeDialog.c"
- gint _tmp9_ = 0;
- GtkSpinButton* _tmp10_;
- gdouble _tmp11_;
+ if (gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox)) == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR)) {
+#line 2129 "AdjustDateTimeDialog.c"
+ gint _tmp6_ = 0;
+ GtkSpinButton* _tmp7_;
gint time = 0;
- gint _tmp14_ = 0;
- AdjustDateTimeDialogTimeSystem _tmp15_;
- gint _tmp16_;
- GtkSpinButton* _tmp17_;
- GtkSpinButton* _tmp18_;
- gint _tmp19_;
-#line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp10_ = self->priv->hour;
+ gint _tmp9_ = 0;
+ AdjustDateTimeDialogTimeSystem _tmp10_;
+ gint _tmp11_;
+ GtkSpinButton* _tmp12_;
+ GtkSpinButton* _tmp13_;
+ gint _tmp14_;
#line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp11_ = gtk_spin_button_get_value (_tmp10_);
+ _tmp7_ = self->priv->hour;
#line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp11_ == 12.0) {
+ if (gtk_spin_button_get_value (_tmp7_) == 12.0) {
#line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp9_ = 0;
-#line 2200 "AdjustDateTimeDialog.c"
+ _tmp6_ = 0;
+#line 2145 "AdjustDateTimeDialog.c"
} else {
- GtkSpinButton* _tmp12_;
- gdouble _tmp13_;
-#line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp12_ = self->priv->hour;
+ GtkSpinButton* _tmp8_;
#line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp13_ = gtk_spin_button_get_value (_tmp12_);
+ _tmp8_ = self->priv->hour;
#line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp9_ = (gint) _tmp13_;
-#line 2210 "AdjustDateTimeDialog.c"
+ _tmp6_ = (gint) gtk_spin_button_get_value (_tmp8_);
+#line 2152 "AdjustDateTimeDialog.c"
}
#line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- time = _tmp9_;
+ time = _tmp6_;
#line 326 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp15_ = self->priv->previous_time_system;
+ _tmp10_ = self->priv->previous_time_system;
#line 326 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp15_ == ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM) {
+ if (_tmp10_ == ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM) {
#line 326 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp14_ = 12;
-#line 2220 "AdjustDateTimeDialog.c"
+ _tmp9_ = 12;
+#line 2162 "AdjustDateTimeDialog.c"
} else {
#line 326 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp14_ = 0;
-#line 2224 "AdjustDateTimeDialog.c"
+ _tmp9_ = 0;
+#line 2166 "AdjustDateTimeDialog.c"
}
#line 326 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp16_ = time;
+ _tmp11_ = time;
#line 326 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- time = _tmp16_ + _tmp14_;
+ time = _tmp11_ + _tmp9_;
#line 328 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp17_ = self->priv->hour;
+ _tmp12_ = self->priv->hour;
#line 328 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_spin_button_set_range (_tmp17_, (gdouble) 0, (gdouble) 23);
+ gtk_spin_button_set_range (_tmp12_, (gdouble) 0, (gdouble) 23);
#line 329 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
adjust_date_time_dialog_set_original_time_label (self, TRUE);
#line 331 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp18_ = self->priv->hour;
+ _tmp13_ = self->priv->hour;
#line 331 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp19_ = time;
+ _tmp14_ = time;
#line 331 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_spin_button_set_value (_tmp18_, (gdouble) _tmp19_);
-#line 2242 "AdjustDateTimeDialog.c"
+ gtk_spin_button_set_value (_tmp13_, (gdouble) _tmp14_);
+#line 2184 "AdjustDateTimeDialog.c"
} else {
gint AMPM_hour = 0;
+ GtkSpinButton* _tmp15_;
+ GtkSpinButton* _tmp16_;
+ gint _tmp17_ = 0;
+ gint _tmp18_;
GtkSpinButton* _tmp20_;
- gdouble _tmp21_;
- GtkSpinButton* _tmp22_;
- gint _tmp23_ = 0;
- gint _tmp24_;
- GtkSpinButton* _tmp26_;
#line 333 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp20_ = self->priv->hour;
-#line 333 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp21_ = gtk_spin_button_get_value (_tmp20_);
+ _tmp15_ = self->priv->hour;
#line 333 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- AMPM_hour = ((gint) _tmp21_) % 12;
+ AMPM_hour = ((gint) gtk_spin_button_get_value (_tmp15_)) % 12;
#line 335 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp22_ = self->priv->hour;
+ _tmp16_ = self->priv->hour;
#line 335 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_spin_button_set_range (_tmp22_, (gdouble) 1, (gdouble) 12);
+ gtk_spin_button_set_range (_tmp16_, (gdouble) 1, (gdouble) 12);
#line 336 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
adjust_date_time_dialog_set_original_time_label (self, FALSE);
#line 338 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp24_ = AMPM_hour;
+ _tmp18_ = AMPM_hour;
#line 338 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- if (_tmp24_ == 0) {
+ if (_tmp18_ == 0) {
#line 338 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp23_ = 12;
-#line 2269 "AdjustDateTimeDialog.c"
+ _tmp17_ = 12;
+#line 2208 "AdjustDateTimeDialog.c"
} else {
- gint _tmp25_;
+ gint _tmp19_;
#line 338 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp25_ = AMPM_hour;
+ _tmp19_ = AMPM_hour;
#line 338 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp23_ = _tmp25_;
-#line 2276 "AdjustDateTimeDialog.c"
+ _tmp17_ = _tmp19_;
+#line 2215 "AdjustDateTimeDialog.c"
}
#line 338 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- _tmp26_ = self->priv->hour;
+ _tmp20_ = self->priv->hour;
#line 338 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
- gtk_spin_button_set_value (_tmp26_, (gdouble) _tmp23_);
-#line 2282 "AdjustDateTimeDialog.c"
+ gtk_spin_button_set_value (_tmp20_, (gdouble) _tmp17_);
+#line 2221 "AdjustDateTimeDialog.c"
}
#line 341 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
adjust_date_time_dialog_on_time_changed (self);
-#line 2286 "AdjustDateTimeDialog.c"
+#line 2225 "AdjustDateTimeDialog.c"
}
-static void adjust_date_time_dialog_class_init (AdjustDateTimeDialogClass * klass) {
+static void
+adjust_date_time_dialog_class_init (AdjustDateTimeDialogClass * klass)
+{
#line 8 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
adjust_date_time_dialog_parent_class = g_type_class_peek_parent (klass);
#line 8 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
g_type_class_add_private (klass, sizeof (AdjustDateTimeDialogPrivate));
#line 8 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
G_OBJECT_CLASS (klass)->finalize = adjust_date_time_dialog_finalize;
-#line 2297 "AdjustDateTimeDialog.c"
+#line 2238 "AdjustDateTimeDialog.c"
}
-static void adjust_date_time_dialog_instance_init (AdjustDateTimeDialog * self) {
+static void
+adjust_date_time_dialog_instance_init (AdjustDateTimeDialog * self)
+{
#line 8 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
self->priv = ADJUST_DATE_TIME_DIALOG_GET_PRIVATE (self);
#line 13 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
self->priv->no_original_time = FALSE;
-#line 2306 "AdjustDateTimeDialog.c"
+#line 2249 "AdjustDateTimeDialog.c"
}
-static void adjust_date_time_dialog_finalize (GObject * obj) {
+static void
+adjust_date_time_dialog_finalize (GObject * obj)
+{
AdjustDateTimeDialog * self;
#line 8 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADJUST_DATE_TIME_DIALOG, AdjustDateTimeDialog);
@@ -2334,11 +2279,13 @@ static void adjust_date_time_dialog_finalize (GObject * obj) {
_g_object_unref0 (self->priv->notification);
#line 8 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
G_OBJECT_CLASS (adjust_date_time_dialog_parent_class)->finalize (obj);
-#line 2336 "AdjustDateTimeDialog.c"
+#line 2281 "AdjustDateTimeDialog.c"
}
-GType adjust_date_time_dialog_get_type (void) {
+GType
+adjust_date_time_dialog_get_type (void)
+{
static volatile gsize adjust_date_time_dialog_type_id__volatile = 0;
if (g_once_init_enter (&adjust_date_time_dialog_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (AdjustDateTimeDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) adjust_date_time_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (AdjustDateTimeDialog), 0, (GInstanceInitFunc) adjust_date_time_dialog_instance_init, NULL };
diff --git a/src/dialogs/EntryMultiCompletion.c b/src/dialogs/EntryMultiCompletion.c
index 9dd3cd1..4006725 100644
--- a/src/dialogs/EntryMultiCompletion.c
+++ b/src/dialogs/EntryMultiCompletion.c
@@ -1,4 +1,4 @@
-/* EntryMultiCompletion.c generated by valac 0.36.6, the Vala compiler
+/* EntryMultiCompletion.c generated by valac 0.40.4, the Vala compiler
* generated from EntryMultiCompletion.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -10,6 +10,7 @@
/* Entry completion for values separated by separators (e.g. comma in the case of tags)*/
/* Partly inspired by the class of the same name in gtkmm-utils by Marko Anastasov*/
+
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
@@ -28,6 +29,11 @@
typedef struct _EntryMultiCompletion EntryMultiCompletion;
typedef struct _EntryMultiCompletionClass EntryMultiCompletionClass;
typedef struct _EntryMultiCompletionPrivate EntryMultiCompletionPrivate;
+enum {
+ ENTRY_MULTI_COMPLETION_0_PROPERTY,
+ ENTRY_MULTI_COMPLETION_NUM_PROPERTIES
+};
+static GParamSpec* entry_multi_completion_properties[ENTRY_MULTI_COMPLETION_NUM_PROPERTIES];
#define _g_free0(var) (var = (g_free (var), NULL))
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
@@ -53,110 +59,124 @@ static gpointer entry_multi_completion_parent_class = NULL;
GType entry_multi_completion_get_type (void) G_GNUC_CONST;
#define ENTRY_MULTI_COMPLETION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletionPrivate))
-enum {
- ENTRY_MULTI_COMPLETION_DUMMY_PROPERTY
-};
-EntryMultiCompletion* entry_multi_completion_new (GeeCollection* completion_list, const gchar* delimiter);
-EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCollection* completion_list, const gchar* delimiter);
+EntryMultiCompletion* entry_multi_completion_new (GeeCollection* completion_list,
+ const gchar* delimiter);
+EntryMultiCompletion* entry_multi_completion_construct (GType object_type,
+ GeeCollection* completion_list,
+ const gchar* delimiter);
static GtkListStore* entry_multi_completion_create_completion_store (GeeCollection* completion_list);
-static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter);
-static gboolean _entry_multi_completion_match_func_gtk_entry_completion_match_func (GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter, gpointer self);
-static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar* delimiter);
-static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion* base, GtkTreeModel* model, GtkTreeIter* iter);
+static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self,
+ GtkEntryCompletion* completion,
+ const gchar* key,
+ GtkTreeIter* iter);
+static gboolean _entry_multi_completion_match_func_gtk_entry_completion_match_func (GtkEntryCompletion* completion,
+ const gchar* key,
+ GtkTreeIter* iter,
+ gpointer self);
+static gchar* entry_multi_completion_get_last_part (const gchar* s,
+ const gchar* delimiter);
+static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion* base,
+ GtkTreeModel* model,
+ GtkTreeIter* iter);
static void entry_multi_completion_finalize (GObject * obj);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static void _vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
static gint _vala_array_length (gpointer array);
-static gboolean _entry_multi_completion_match_func_gtk_entry_completion_match_func (GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter, gpointer self) {
+static gboolean
+_entry_multi_completion_match_func_gtk_entry_completion_match_func (GtkEntryCompletion* completion,
+ const gchar* key,
+ GtkTreeIter* iter,
+ gpointer self)
+{
gboolean result;
result = entry_multi_completion_match_func ((EntryMultiCompletion*) self, completion, key, iter);
#line 19 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
return result;
-#line 78 "EntryMultiCompletion.c"
+#line 102 "EntryMultiCompletion.c"
}
-EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCollection* completion_list, const gchar* delimiter) {
+EntryMultiCompletion*
+entry_multi_completion_construct (GType object_type,
+ GeeCollection* completion_list,
+ const gchar* delimiter)
+{
EntryMultiCompletion * self = NULL;
gboolean _tmp0_ = FALSE;
- const gchar* _tmp1_;
- const gchar* _tmp5_;
- gchar* _tmp6_;
- GeeCollection* _tmp7_;
- GtkListStore* _tmp8_;
- GtkListStore* _tmp9_;
+ gchar* _tmp3_;
+ GtkListStore* _tmp4_;
+ GtkListStore* _tmp5_;
#line 13 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
g_return_val_if_fail (GEE_IS_COLLECTION (completion_list), NULL);
#line 13 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
self = (EntryMultiCompletion*) g_object_new (object_type, NULL);
#line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp1_ = delimiter;
-#line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- if (_tmp1_ == NULL) {
+ if (delimiter == NULL) {
#line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
_tmp0_ = TRUE;
-#line 101 "EntryMultiCompletion.c"
+#line 124 "EntryMultiCompletion.c"
} else {
- const gchar* _tmp2_;
- gint _tmp3_;
- gint _tmp4_;
-#line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp2_ = delimiter;
+ gint _tmp1_;
+ gint _tmp2_;
#line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp3_ = strlen (_tmp2_);
+ _tmp1_ = strlen (delimiter);
#line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp4_ = _tmp3_;
+ _tmp2_ = _tmp1_;
#line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp0_ = _tmp4_ == 1;
-#line 114 "EntryMultiCompletion.c"
+ _tmp0_ = _tmp2_ == 1;
+#line 134 "EntryMultiCompletion.c"
}
#line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
_vala_assert (_tmp0_, "delimiter == null || delimiter.length == 1");
#line 15 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp5_ = delimiter;
-#line 15 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp6_ = g_strdup (_tmp5_);
+ _tmp3_ = g_strdup (delimiter);
#line 15 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
_g_free0 (self->priv->delimiter);
#line 15 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- self->priv->delimiter = _tmp6_;
+ self->priv->delimiter = _tmp3_;
#line 17 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp7_ = completion_list;
+ _tmp4_ = entry_multi_completion_create_completion_store (completion_list);
#line 17 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp8_ = entry_multi_completion_create_completion_store (_tmp7_);
+ _tmp5_ = _tmp4_;
#line 17 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp9_ = _tmp8_;
+ gtk_entry_completion_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_tree_model_get_type (), GtkTreeModel));
#line 17 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- gtk_entry_completion_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 17 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _g_object_unref0 (_tmp9_);
+ _g_object_unref0 (_tmp5_);
#line 18 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
gtk_entry_completion_set_text_column (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion), 0);
#line 19 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
gtk_entry_completion_set_match_func (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion), _entry_multi_completion_match_func_gtk_entry_completion_match_func, g_object_ref (self), g_object_unref);
#line 13 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
return self;
-#line 142 "EntryMultiCompletion.c"
+#line 158 "EntryMultiCompletion.c"
}
-EntryMultiCompletion* entry_multi_completion_new (GeeCollection* completion_list, const gchar* delimiter) {
+EntryMultiCompletion*
+entry_multi_completion_new (GeeCollection* completion_list,
+ const gchar* delimiter)
+{
#line 13 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
return entry_multi_completion_construct (TYPE_ENTRY_MULTI_COMPLETION, completion_list, delimiter);
-#line 149 "EntryMultiCompletion.c"
+#line 168 "EntryMultiCompletion.c"
}
-static GtkListStore* entry_multi_completion_create_completion_store (GeeCollection* completion_list) {
+static GtkListStore*
+entry_multi_completion_create_completion_store (GeeCollection* completion_list)
+{
GtkListStore* result = NULL;
GtkListStore* completion_store = NULL;
GtkListStore* _tmp0_;
GtkTreeIter store_iter = {0};
GeeIterator* completion_iter = NULL;
- GeeCollection* _tmp1_;
- GeeIterator* _tmp2_;
+ GeeIterator* _tmp1_;
#line 22 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
g_return_val_if_fail (GEE_IS_COLLECTION (completion_list), NULL);
#line 23 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
@@ -164,54 +184,49 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti
#line 23 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
completion_store = _tmp0_;
#line 25 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp1_ = completion_list;
-#line 25 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (completion_list, GEE_TYPE_ITERABLE, GeeIterable));
#line 25 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- completion_iter = _tmp2_;
+ completion_iter = _tmp1_;
#line 26 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
while (TRUE) {
-#line 175 "EntryMultiCompletion.c"
- GeeIterator* _tmp3_;
- gboolean _tmp4_;
+#line 193 "EntryMultiCompletion.c"
+ GeeIterator* _tmp2_;
+ GtkListStore* _tmp3_;
+ GtkTreeIter _tmp4_ = {0};
GtkListStore* _tmp5_;
- GtkTreeIter _tmp6_ = {0};
- GtkListStore* _tmp7_;
- GtkTreeIter _tmp8_;
- GeeIterator* _tmp9_;
- gpointer _tmp10_;
- gchar* _tmp11_;
+ GtkTreeIter _tmp6_;
+ GeeIterator* _tmp7_;
+ gpointer _tmp8_;
+ gchar* _tmp9_;
#line 26 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp3_ = completion_iter;
+ _tmp2_ = completion_iter;
#line 26 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp4_ = gee_iterator_next (_tmp3_);
-#line 26 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- if (!_tmp4_) {
+ if (!gee_iterator_next (_tmp2_)) {
#line 26 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
break;
-#line 193 "EntryMultiCompletion.c"
+#line 208 "EntryMultiCompletion.c"
}
#line 27 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp5_ = completion_store;
+ _tmp3_ = completion_store;
#line 27 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- gtk_list_store_append (_tmp5_, &_tmp6_);
+ gtk_list_store_append (_tmp3_, &_tmp4_);
#line 27 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- store_iter = _tmp6_;
+ store_iter = _tmp4_;
#line 28 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp7_ = completion_store;
+ _tmp5_ = completion_store;
#line 28 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp8_ = store_iter;
+ _tmp6_ = store_iter;
#line 28 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp9_ = completion_iter;
+ _tmp7_ = completion_iter;
#line 28 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp10_ = gee_iterator_get (_tmp9_);
+ _tmp8_ = gee_iterator_get (_tmp7_);
#line 28 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp11_ = (gchar*) _tmp10_;
+ _tmp9_ = (gchar*) _tmp8_;
#line 28 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- gtk_list_store_set (_tmp7_, &_tmp8_, 0, _tmp11_, -1, -1);
+ gtk_list_store_set (_tmp5_, &_tmp6_, 0, _tmp9_, -1, -1);
#line 28 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _g_free0 (_tmp11_);
-#line 215 "EntryMultiCompletion.c"
+ _g_free0 (_tmp9_);
+#line 230 "EntryMultiCompletion.c"
}
#line 31 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
result = completion_store;
@@ -219,135 +234,140 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti
_g_object_unref0 (completion_iter);
#line 31 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
return result;
-#line 223 "EntryMultiCompletion.c"
+#line 238 "EntryMultiCompletion.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 35 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
return self ? g_object_ref (self) : NULL;
-#line 230 "EntryMultiCompletion.c"
+#line 247 "EntryMultiCompletion.c"
}
-static gchar* string_strip (const gchar* self) {
+static gchar*
+string_strip (const gchar* self)
+{
gchar* result = NULL;
gchar* _result_ = NULL;
gchar* _tmp0_;
const gchar* _tmp1_;
-#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1248 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_strstrip (_tmp1_);
-#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = _result_;
-#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 253 "EntryMultiCompletion.c"
+#line 272 "EntryMultiCompletion.c"
}
-static gboolean string_contains (const gchar* self, const gchar* needle) {
+static gboolean
+string_contains (const gchar* self,
+ const gchar* needle)
+{
gboolean result = FALSE;
- const gchar* _tmp0_;
- gchar* _tmp1_;
-#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, FALSE);
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = needle;
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp1_ != NULL;
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = strstr ((gchar*) self, (gchar*) needle);
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp0_ != NULL;
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 273 "EntryMultiCompletion.c"
+#line 292 "EntryMultiCompletion.c"
}
-static gint string_last_index_of_char (const gchar* self, gunichar c, gint start_index) {
+static gint
+string_last_index_of_char (const gchar* self,
+ gunichar c,
+ gint start_index)
+{
gint result = 0;
gchar* _result_ = NULL;
- gint _tmp0_;
- gunichar _tmp1_;
- gchar* _tmp2_;
- gchar* _tmp3_;
-#line 1041 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+#line 1055 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = start_index;
-#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = c;
-#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _result_ = _tmp2_;
-#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = _result_;
-#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp3_ != NULL) {
-#line 298 "EntryMultiCompletion.c"
- gchar* _tmp4_;
-#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = _result_;
-#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1056 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = g_utf8_strrchr (((gchar*) self) + start_index, (gssize) -1, c);
+#line 1056 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _result_ = _tmp0_;
+#line 1058 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = _result_;
+#line 1058 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp1_ != NULL) {
+#line 315 "EntryMultiCompletion.c"
+ gchar* _tmp2_;
+#line 1059 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = _result_;
+#line 1059 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = (gint) (_tmp2_ - ((gchar*) self));
+#line 1059 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 306 "EntryMultiCompletion.c"
+#line 323 "EntryMultiCompletion.c"
} else {
-#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = -1;
-#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 312 "EntryMultiCompletion.c"
+#line 329 "EntryMultiCompletion.c"
}
}
-static gchar string_get (const gchar* self, glong index) {
+static gchar
+string_get (const gchar* self,
+ glong index)
+{
gchar result = '\0';
- glong _tmp0_;
- gchar _tmp1_;
-#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar _tmp0_;
+#line 1124 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = index;
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp1_;
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = ((gchar*) self)[index];
+#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp0_;
+#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 331 "EntryMultiCompletion.c"
+#line 348 "EntryMultiCompletion.c"
}
-static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter) {
+static gboolean
+entry_multi_completion_match_func (EntryMultiCompletion* self,
+ GtkEntryCompletion* completion,
+ const gchar* key,
+ GtkTreeIter* iter)
+{
gboolean result = FALSE;
GtkTreeModel* model = NULL;
- GtkEntryCompletion* _tmp0_;
+ GtkTreeModel* _tmp0_;
GtkTreeModel* _tmp1_;
- GtkTreeModel* _tmp2_;
gchar* possible_match = NULL;
- GtkTreeModel* _tmp3_;
- GtkTreeIter _tmp4_;
- const gchar* _tmp5_;
+ GtkTreeModel* _tmp2_;
+ GtkTreeIter _tmp3_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
gchar* _tmp6_;
gchar* _tmp7_;
- gchar* _tmp8_;
gchar* normed_key = NULL;
+ gchar* _tmp8_;
const gchar* _tmp9_;
- gchar* _tmp10_;
- const gchar* _tmp11_;
#line 34 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
g_return_val_if_fail (IS_ENTRY_MULTI_COMPLETION (self), FALSE);
#line 34 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
@@ -357,66 +377,59 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
#line 34 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
g_return_val_if_fail (iter != NULL, FALSE);
#line 35 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp0_ = completion;
-#line 35 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp1_ = gtk_entry_completion_get_model (_tmp0_);
+ _tmp0_ = gtk_entry_completion_get_model (completion);
#line 35 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp2_ = _g_object_ref0 (_tmp1_);
+ _tmp1_ = _g_object_ref0 (_tmp0_);
#line 35 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- model = _tmp2_;
+ model = _tmp1_;
#line 37 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp3_ = model;
+ _tmp2_ = model;
#line 37 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp4_ = *iter;
+ _tmp3_ = *iter;
#line 37 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- gtk_tree_model_get (_tmp3_, &_tmp4_, 0, &possible_match, -1);
+ gtk_tree_model_get (_tmp2_, &_tmp3_, 0, &possible_match, -1);
#line 43 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp5_ = possible_match;
+ _tmp4_ = possible_match;
#line 43 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp6_ = g_utf8_casefold (_tmp5_, (gssize) -1);
+ _tmp5_ = g_utf8_casefold (_tmp4_, (gssize) -1);
#line 43 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 43 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp8_ = g_utf8_normalize (_tmp7_, (gssize) -1, G_NORMALIZE_ALL_COMPOSE);
+ _tmp7_ = g_utf8_normalize (_tmp6_, (gssize) -1, G_NORMALIZE_ALL_COMPOSE);
#line 43 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
_g_free0 (possible_match);
#line 43 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- possible_match = _tmp8_;
+ possible_match = _tmp7_;
#line 43 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp6_);
#line 44 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp9_ = key;
+ _tmp8_ = g_utf8_normalize (key, (gssize) -1, G_NORMALIZE_ALL_COMPOSE);
#line 44 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp10_ = g_utf8_normalize (_tmp9_, (gssize) -1, G_NORMALIZE_ALL_COMPOSE);
-#line 44 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- normed_key = _tmp10_;
+ normed_key = _tmp8_;
#line 46 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp11_ = self->priv->delimiter;
+ _tmp9_ = self->priv->delimiter;
#line 46 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- if (_tmp11_ == NULL) {
-#line 398 "EntryMultiCompletion.c"
- const gchar* _tmp12_;
- const gchar* _tmp13_;
- gchar* _tmp14_;
- gchar* _tmp15_;
- gboolean _tmp16_;
- gboolean _tmp17_;
-#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp12_ = possible_match;
+ if (_tmp9_ == NULL) {
+#line 414 "EntryMultiCompletion.c"
+ const gchar* _tmp10_;
+ const gchar* _tmp11_;
+ gchar* _tmp12_;
+ gchar* _tmp13_;
+ gboolean _tmp14_;
#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp13_ = normed_key;
+ _tmp10_ = possible_match;
#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp14_ = string_strip (_tmp13_);
+ _tmp11_ = normed_key;
#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp15_ = _tmp14_;
+ _tmp12_ = string_strip (_tmp11_);
#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp16_ = g_str_has_prefix (_tmp12_, _tmp15_);
+ _tmp13_ = _tmp12_;
#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp17_ = _tmp16_;
+ _tmp14_ = g_str_has_prefix (_tmp10_, _tmp13_);
#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _g_free0 (_tmp15_);
+ _g_free0 (_tmp13_);
#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- result = _tmp17_;
+ result = _tmp14_;
#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
_g_free0 (normed_key);
#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
@@ -425,74 +438,58 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
_g_object_unref0 (model);
#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
return result;
-#line 429 "EntryMultiCompletion.c"
+#line 442 "EntryMultiCompletion.c"
} else {
- const gchar* _tmp18_;
- const gchar* _tmp19_;
- gboolean _tmp20_;
+ const gchar* _tmp15_;
+ const gchar* _tmp16_;
gchar* last_part = NULL;
- const gchar* _tmp31_;
- gchar* _tmp32_;
- gchar* _tmp33_;
- const gchar* _tmp34_;
+ const gchar* _tmp23_;
+ gchar* _tmp24_;
+ gchar* _tmp25_;
+ const gchar* _tmp26_;
+ gchar* _tmp27_;
+ gchar* _tmp28_;
+ const gchar* _tmp29_;
+ gint _tmp30_;
+ gint _tmp31_;
+ const gchar* _tmp32_;
+ const gchar* _tmp33_;
+ gchar* _tmp34_;
gchar* _tmp35_;
- gchar* _tmp36_;
- const gchar* _tmp37_;
- gint _tmp38_;
- gint _tmp39_;
- const gchar* _tmp40_;
- const gchar* _tmp41_;
- gchar* _tmp42_;
- gchar* _tmp43_;
- gboolean _tmp44_;
- gboolean _tmp45_;
-#line 49 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp18_ = normed_key;
+ gboolean _tmp36_;
#line 49 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp19_ = self->priv->delimiter;
+ _tmp15_ = normed_key;
#line 49 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp20_ = string_contains (_tmp18_, _tmp19_);
+ _tmp16_ = self->priv->delimiter;
#line 49 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- if (_tmp20_) {
-#line 458 "EntryMultiCompletion.c"
+ if (string_contains (_tmp15_, _tmp16_)) {
+#line 467 "EntryMultiCompletion.c"
gint offset = 0;
- const gchar* _tmp21_;
- const gchar* _tmp22_;
- const gchar* _tmp23_;
- gchar _tmp24_;
- gint _tmp25_;
- gint _tmp26_;
+ const gchar* _tmp17_;
+ const gchar* _tmp18_;
+ const gchar* _tmp19_;
gint position = 0;
- GtkWidget* _tmp27_;
- gint _tmp28_;
- gint _tmp29_;
- gint _tmp30_;
-#line 51 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp21_ = normed_key;
-#line 51 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp22_ = normed_key;
+ GtkWidget* _tmp20_;
+ gint _tmp21_;
+ gint _tmp22_;
#line 51 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp23_ = self->priv->delimiter;
+ _tmp17_ = normed_key;
#line 51 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp24_ = string_get (_tmp23_, (glong) 0);
+ _tmp18_ = normed_key;
#line 51 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp25_ = string_last_index_of_char (_tmp22_, (gunichar) _tmp24_, 0);
+ _tmp19_ = self->priv->delimiter;
#line 51 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp26_ = g_utf8_strlen (_tmp21_, (gssize) _tmp25_);
-#line 51 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- offset = _tmp26_;
-#line 52 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp27_ = gtk_entry_completion_get_entry (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion));
+ offset = g_utf8_strlen (_tmp17_, (gssize) string_last_index_of_char (_tmp18_, (gunichar) string_get (_tmp19_, (glong) 0), 0));
#line 52 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp28_ = gtk_editable_get_position (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_entry_get_type (), GtkEntry), GTK_TYPE_EDITABLE, GtkEditable));
+ _tmp20_ = gtk_entry_completion_get_entry (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion));
#line 52 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- position = _tmp28_;
+ position = gtk_editable_get_position (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_entry_get_type (), GtkEntry), gtk_editable_get_type (), GtkEditable));
#line 53 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp29_ = position;
+ _tmp21_ = position;
#line 53 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp30_ = offset;
+ _tmp22_ = offset;
#line 53 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- if (_tmp29_ <= _tmp30_) {
+ if (_tmp21_ <= _tmp22_) {
#line 54 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
result = FALSE;
#line 54 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
@@ -503,33 +500,33 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
_g_object_unref0 (model);
#line 54 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
return result;
-#line 507 "EntryMultiCompletion.c"
+#line 504 "EntryMultiCompletion.c"
}
}
#line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp31_ = normed_key;
+ _tmp23_ = normed_key;
#line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp32_ = string_strip (_tmp31_);
+ _tmp24_ = string_strip (_tmp23_);
#line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp33_ = _tmp32_;
+ _tmp25_ = _tmp24_;
#line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp34_ = self->priv->delimiter;
+ _tmp26_ = self->priv->delimiter;
#line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp35_ = entry_multi_completion_get_last_part (_tmp33_, _tmp34_);
+ _tmp27_ = entry_multi_completion_get_last_part (_tmp25_, _tmp26_);
#line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp36_ = _tmp35_;
+ _tmp28_ = _tmp27_;
#line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _g_free0 (_tmp33_);
+ _g_free0 (_tmp25_);
#line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- last_part = _tmp36_;
+ last_part = _tmp28_;
#line 59 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp37_ = last_part;
+ _tmp29_ = last_part;
#line 59 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp38_ = strlen (_tmp37_);
+ _tmp30_ = strlen (_tmp29_);
#line 59 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp39_ = _tmp38_;
+ _tmp31_ = _tmp30_;
#line 59 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- if (_tmp39_ == 0) {
+ if (_tmp31_ == 0) {
#line 60 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
result = FALSE;
#line 60 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
@@ -542,24 +539,22 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
_g_object_unref0 (model);
#line 60 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
return result;
-#line 546 "EntryMultiCompletion.c"
+#line 543 "EntryMultiCompletion.c"
}
#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp40_ = possible_match;
+ _tmp32_ = possible_match;
#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp41_ = last_part;
+ _tmp33_ = last_part;
#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp42_ = string_strip (_tmp41_);
+ _tmp34_ = string_strip (_tmp33_);
#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp43_ = _tmp42_;
+ _tmp35_ = _tmp34_;
#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp44_ = g_str_has_prefix (_tmp40_, _tmp43_);
+ _tmp36_ = g_str_has_prefix (_tmp32_, _tmp35_);
#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp45_ = _tmp44_;
+ _g_free0 (_tmp35_);
#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _g_free0 (_tmp43_);
-#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- result = _tmp45_;
+ result = _tmp36_;
#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
_g_free0 (last_part);
#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
@@ -570,7 +565,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
_g_object_unref0 (model);
#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
return result;
-#line 574 "EntryMultiCompletion.c"
+#line 569 "EntryMultiCompletion.c"
}
#line 34 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
_g_free0 (normed_key);
@@ -578,210 +573,160 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
_g_free0 (possible_match);
#line 34 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
_g_object_unref0 (model);
-#line 582 "EntryMultiCompletion.c"
+#line 577 "EntryMultiCompletion.c"
}
-static glong string_strnlen (gchar* str, glong maxlen) {
+static glong
+string_strnlen (gchar* str,
+ glong maxlen)
+{
glong result = 0L;
gchar* end = NULL;
gchar* _tmp0_;
- glong _tmp1_;
- gchar* _tmp2_;
- gchar* _tmp3_;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = str;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = maxlen;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- end = _tmp2_;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = end;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp3_ == NULL) {
-#line 605 "EntryMultiCompletion.c"
- glong _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = maxlen;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp1_;
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = memchr (str, 0, (gsize) maxlen);
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ end = _tmp0_;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = end;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp1_ == NULL) {
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = maxlen;
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 613 "EntryMultiCompletion.c"
+#line 601 "EntryMultiCompletion.c"
} else {
- gchar* _tmp5_;
- gchar* _tmp6_;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = end;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = str;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = (glong) (_tmp5_ - _tmp6_);
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp2_;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = end;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = (glong) (_tmp2_ - str);
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 625 "EntryMultiCompletion.c"
+#line 610 "EntryMultiCompletion.c"
}
}
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
+static gchar*
+string_substring (const gchar* self,
+ glong offset,
+ glong len)
+{
gchar* result = NULL;
glong string_length = 0L;
gboolean _tmp0_ = FALSE;
- glong _tmp1_;
- glong _tmp8_;
- glong _tmp14_;
- glong _tmp17_;
- glong _tmp18_;
- glong _tmp19_;
- glong _tmp20_;
- glong _tmp21_;
- gchar* _tmp22_;
-#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ glong _tmp6_;
+ gchar* _tmp7_;
+#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = offset;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp1_ >= ((glong) 0)) {
-#line 649 "EntryMultiCompletion.c"
- glong _tmp2_;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = len;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = _tmp2_ >= ((glong) 0);
-#line 655 "EntryMultiCompletion.c"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (offset >= ((glong) 0)) {
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = len >= ((glong) 0);
+#line 631 "EntryMultiCompletion.c"
} else {
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 659 "EntryMultiCompletion.c"
+#line 635 "EntryMultiCompletion.c"
}
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 663 "EntryMultiCompletion.c"
- glong _tmp3_;
- glong _tmp4_;
- glong _tmp5_;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = offset;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = len;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- string_length = _tmp5_;
-#line 675 "EntryMultiCompletion.c"
+#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ string_length = string_strnlen ((gchar*) self, offset + len);
+#line 641 "EntryMultiCompletion.c"
} else {
- gint _tmp6_;
- gint _tmp7_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = strlen (self);
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = _tmp6_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- string_length = (glong) _tmp7_;
-#line 685 "EntryMultiCompletion.c"
+ gint _tmp1_;
+ gint _tmp2_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = strlen (self);
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = _tmp1_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ string_length = (glong) _tmp2_;
+#line 651 "EntryMultiCompletion.c"
}
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = offset;
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp8_ < ((glong) 0)) {
-#line 691 "EntryMultiCompletion.c"
- glong _tmp9_;
- glong _tmp10_;
- glong _tmp11_;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = string_length;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = offset;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- offset = _tmp9_ + _tmp10_;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = offset;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 705 "EntryMultiCompletion.c"
+#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (offset < ((glong) 0)) {
+#line 655 "EntryMultiCompletion.c"
+ glong _tmp3_;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = string_length;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ offset = _tmp3_ + offset;
+#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (offset >= ((glong) 0), NULL);
+#line 663 "EntryMultiCompletion.c"
} else {
- glong _tmp12_;
- glong _tmp13_;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = offset;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = string_length;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 715 "EntryMultiCompletion.c"
+ glong _tmp4_;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = string_length;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (offset <= _tmp4_, NULL);
+#line 670 "EntryMultiCompletion.c"
}
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = len;
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp14_ < ((glong) 0)) {
-#line 721 "EntryMultiCompletion.c"
- glong _tmp15_;
- glong _tmp16_;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = string_length;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp16_ = offset;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- len = _tmp15_ - _tmp16_;
-#line 730 "EntryMultiCompletion.c"
+#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (len < ((glong) 0)) {
+#line 674 "EntryMultiCompletion.c"
+ glong _tmp5_;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = string_length;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ len = _tmp5_ - offset;
+#line 680 "EntryMultiCompletion.c"
}
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp17_ = offset;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp18_ = len;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp19_ = string_length;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp20_ = offset;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp21_ = len;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp22_;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = string_length;
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail ((offset + len) <= _tmp6_, NULL);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp7_;
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 750 "EntryMultiCompletion.c"
+#line 692 "EntryMultiCompletion.c"
}
-static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion* base, GtkTreeModel* model, GtkTreeIter* iter) {
+static gboolean
+entry_multi_completion_real_match_selected (GtkEntryCompletion* base,
+ GtkTreeModel* model,
+ GtkTreeIter* iter)
+{
EntryMultiCompletion * self;
gboolean result = FALSE;
gchar* match = NULL;
- GtkTreeModel* _tmp0_;
- GtkTreeIter _tmp1_;
+ GtkTreeIter _tmp0_;
GtkEntry* entry = NULL;
- GtkWidget* _tmp2_;
- GtkEntry* _tmp3_;
+ GtkWidget* _tmp1_;
+ GtkEntry* _tmp2_;
gchar* old_text = NULL;
- GtkEntry* _tmp4_;
- const gchar* _tmp5_;
- gchar* _tmp6_;
- const gchar* _tmp7_;
+ GtkEntry* _tmp3_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
+ const gchar* _tmp6_;
+ gint _tmp7_;
gint _tmp8_;
- gint _tmp9_;
- const gchar* _tmp24_ = NULL;
- const gchar* _tmp25_;
+ const gchar* _tmp20_ = NULL;
+ const gchar* _tmp21_;
gchar* new_text = NULL;
+ const gchar* _tmp22_;
+ const gchar* _tmp23_;
+ gchar* _tmp24_;
+ gchar* _tmp25_;
const gchar* _tmp26_;
- const gchar* _tmp27_;
+ gchar* _tmp27_;
gchar* _tmp28_;
gchar* _tmp29_;
- const gchar* _tmp30_;
- gchar* _tmp31_;
- gchar* _tmp32_;
- gchar* _tmp33_;
- gchar* _tmp34_;
- GtkEntry* _tmp35_;
- GtkEntry* _tmp36_;
- gint _tmp37_;
- gint _tmp38_;
+ gchar* _tmp30_;
+ GtkEntry* _tmp31_;
+ GtkEntry* _tmp32_;
+ gint _tmp33_;
+ gint _tmp34_;
#line 66 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletion);
#line 66 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
@@ -789,150 +734,139 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
#line 66 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
g_return_val_if_fail (iter != NULL, FALSE);
#line 68 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp0_ = model;
-#line 68 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp1_ = *iter;
+ _tmp0_ = *iter;
#line 68 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- gtk_tree_model_get (_tmp0_, &_tmp1_, 0, &match, -1);
+ gtk_tree_model_get (model, &_tmp0_, 0, &match, -1);
#line 70 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp2_ = gtk_entry_completion_get_entry (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion));
+ _tmp1_ = gtk_entry_completion_get_entry (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion));
#line 70 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_entry_get_type (), GtkEntry));
+ _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_entry_get_type (), GtkEntry));
#line 70 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- entry = _tmp3_;
+ entry = _tmp2_;
#line 72 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp4_ = entry;
+ _tmp3_ = entry;
#line 72 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp5_ = gtk_entry_get_text (_tmp4_);
+ _tmp4_ = gtk_entry_get_text (_tmp3_);
#line 72 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp6_ = g_utf8_normalize (_tmp5_, (gssize) -1, G_NORMALIZE_ALL_COMPOSE);
+ _tmp5_ = g_utf8_normalize (_tmp4_, (gssize) -1, G_NORMALIZE_ALL_COMPOSE);
#line 72 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- old_text = _tmp6_;
+ old_text = _tmp5_;
#line 73 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp7_ = old_text;
+ _tmp6_ = old_text;
#line 73 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp8_ = strlen (_tmp7_);
+ _tmp7_ = strlen (_tmp6_);
#line 73 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 73 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- if (_tmp9_ > 0) {
-#line 820 "EntryMultiCompletion.c"
+ if (_tmp8_ > 0) {
+#line 763 "EntryMultiCompletion.c"
+ const gchar* _tmp9_;
const gchar* _tmp10_;
- const gchar* _tmp11_;
- gboolean _tmp12_;
#line 74 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp10_ = old_text;
+ _tmp9_ = old_text;
#line 74 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp11_ = self->priv->delimiter;
+ _tmp10_ = self->priv->delimiter;
#line 74 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp12_ = string_contains (_tmp10_, _tmp11_);
-#line 74 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- if (_tmp12_) {
-#line 832 "EntryMultiCompletion.c"
- const gchar* _tmp13_ = NULL;
+ if (string_contains (_tmp9_, _tmp10_)) {
+#line 772 "EntryMultiCompletion.c"
+ const gchar* _tmp11_ = NULL;
+ const gchar* _tmp12_;
+ const gchar* _tmp13_;
const gchar* _tmp14_;
const gchar* _tmp15_;
- const gchar* _tmp16_;
- const gchar* _tmp17_;
- gchar _tmp18_;
- gint _tmp19_;
- gchar* _tmp20_;
- gchar* _tmp21_;
- gchar* _tmp22_;
+ gchar* _tmp16_;
+ gchar* _tmp17_;
+ gchar* _tmp18_;
#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp14_ = self->priv->delimiter;
+ _tmp12_ = self->priv->delimiter;
#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- if (g_strcmp0 (_tmp14_, " ") != 0) {
+ if (g_strcmp0 (_tmp12_, " ") != 0) {
#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp13_ = " ";
-#line 849 "EntryMultiCompletion.c"
+ _tmp11_ = " ";
+#line 787 "EntryMultiCompletion.c"
} else {
#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp13_ = "";
-#line 853 "EntryMultiCompletion.c"
+ _tmp11_ = "";
+#line 791 "EntryMultiCompletion.c"
}
#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp15_ = old_text;
-#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp16_ = old_text;
+ _tmp13_ = old_text;
#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp17_ = self->priv->delimiter;
+ _tmp14_ = old_text;
#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp18_ = string_get (_tmp17_, (glong) 0);
+ _tmp15_ = self->priv->delimiter;
#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp19_ = string_last_index_of_char (_tmp16_, (gunichar) _tmp18_, 0);
+ _tmp16_ = string_substring (_tmp13_, (glong) 0, (glong) (string_last_index_of_char (_tmp14_, (gunichar) string_get (_tmp15_, (glong) 0), 0) + 1));
#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp20_ = string_substring (_tmp15_, (glong) 0, (glong) (_tmp19_ + 1));
+ _tmp17_ = _tmp16_;
#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp21_ = _tmp20_;
-#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp22_ = g_strconcat (_tmp21_, _tmp13_, NULL);
+ _tmp18_ = g_strconcat (_tmp17_, _tmp11_, NULL);
#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
_g_free0 (old_text);
#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- old_text = _tmp22_;
+ old_text = _tmp18_;
#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _g_free0 (_tmp21_);
-#line 877 "EntryMultiCompletion.c"
+ _g_free0 (_tmp17_);
+#line 811 "EntryMultiCompletion.c"
} else {
- gchar* _tmp23_;
+ gchar* _tmp19_;
#line 77 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp23_ = g_strdup ("");
+ _tmp19_ = g_strdup ("");
#line 77 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
_g_free0 (old_text);
#line 77 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- old_text = _tmp23_;
-#line 886 "EntryMultiCompletion.c"
+ old_text = _tmp19_;
+#line 820 "EntryMultiCompletion.c"
}
}
#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp25_ = self->priv->delimiter;
+ _tmp21_ = self->priv->delimiter;
#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- if (g_strcmp0 (_tmp25_, " ") != 0) {
+ if (g_strcmp0 (_tmp21_, " ") != 0) {
#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp24_ = " ";
-#line 895 "EntryMultiCompletion.c"
+ _tmp20_ = " ";
+#line 829 "EntryMultiCompletion.c"
} else {
#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp24_ = "";
-#line 899 "EntryMultiCompletion.c"
+ _tmp20_ = "";
+#line 833 "EntryMultiCompletion.c"
}
#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp26_ = old_text;
+ _tmp22_ = old_text;
#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp27_ = match;
+ _tmp23_ = match;
#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp28_ = g_strconcat (_tmp26_, _tmp27_, NULL);
+ _tmp24_ = g_strconcat (_tmp22_, _tmp23_, NULL);
#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp29_ = _tmp28_;
+ _tmp25_ = _tmp24_;
#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp30_ = self->priv->delimiter;
+ _tmp26_ = self->priv->delimiter;
#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp31_ = g_strconcat (_tmp29_, _tmp30_, NULL);
+ _tmp27_ = g_strconcat (_tmp25_, _tmp26_, NULL);
#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp32_ = _tmp31_;
+ _tmp28_ = _tmp27_;
#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp33_ = g_strconcat (_tmp32_, _tmp24_, NULL);
+ _tmp29_ = g_strconcat (_tmp28_, _tmp20_, NULL);
#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp34_ = _tmp33_;
+ _tmp30_ = _tmp29_;
#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _g_free0 (_tmp32_);
+ _g_free0 (_tmp28_);
#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _g_free0 (_tmp29_);
+ _g_free0 (_tmp25_);
#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- new_text = _tmp34_;
+ new_text = _tmp30_;
#line 81 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp35_ = entry;
+ _tmp31_ = entry;
#line 81 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- gtk_entry_set_text (_tmp35_, new_text);
+ gtk_entry_set_text (_tmp31_, new_text);
#line 82 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp36_ = entry;
+ _tmp32_ = entry;
#line 82 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp37_ = strlen (new_text);
+ _tmp33_ = strlen (new_text);
#line 82 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp38_ = _tmp37_;
+ _tmp34_ = _tmp33_;
#line 82 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- gtk_editable_set_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GTK_TYPE_EDITABLE, GtkEditable), (gint) _tmp38_);
+ gtk_editable_set_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_editable_get_type (), GtkEditable), (gint) _tmp34_);
#line 84 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
result = TRUE;
#line 84 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
@@ -945,109 +879,108 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
_g_free0 (match);
#line 84 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
return result;
-#line 949 "EntryMultiCompletion.c"
+#line 883 "EntryMultiCompletion.c"
}
-static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar* delimiter) {
+static gchar*
+entry_multi_completion_get_last_part (const gchar* s,
+ const gchar* delimiter)
+{
gchar* result = NULL;
gchar** split = NULL;
- const gchar* _tmp0_;
- const gchar* _tmp1_;
- gchar** _tmp2_;
- gchar** _tmp3_;
+ gchar** _tmp0_;
+ gchar** _tmp1_;
gint split_length1;
gint _split_size_;
- gboolean _tmp4_ = FALSE;
- gchar** _tmp5_;
- gint _tmp5__length1;
+ gboolean _tmp2_ = FALSE;
+ gchar** _tmp3_;
+ gint _tmp3__length1;
#line 88 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
g_return_val_if_fail (s != NULL, NULL);
#line 88 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
g_return_val_if_fail (delimiter != NULL, NULL);
#line 89 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp0_ = s;
-#line 89 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp1_ = delimiter;
-#line 89 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp3_ = _tmp2_ = g_strsplit (_tmp0_, _tmp1_, 0);
+ _tmp1_ = _tmp0_ = g_strsplit (s, delimiter, 0);
#line 89 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- split = _tmp3_;
+ split = _tmp1_;
#line 89 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- split_length1 = _vala_array_length (_tmp2_);
+ split_length1 = _vala_array_length (_tmp0_);
#line 89 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
_split_size_ = split_length1;
#line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp5_ = split;
+ _tmp3_ = split;
#line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp5__length1 = split_length1;
+ _tmp3__length1 = split_length1;
#line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- if (_tmp5_ != NULL) {
-#line 987 "EntryMultiCompletion.c"
- gchar** _tmp6_;
- gint _tmp6__length1;
- const gchar* _tmp7_;
+ if (_tmp3_ != NULL) {
+#line 918 "EntryMultiCompletion.c"
+ gchar** _tmp4_;
+ gint _tmp4__length1;
+ const gchar* _tmp5_;
#line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp6_ = split;
+ _tmp4_ = split;
#line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp6__length1 = split_length1;
+ _tmp4__length1 = split_length1;
#line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp7_ = _tmp6_[0];
+ _tmp5_ = _tmp4_[0];
#line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp4_ = _tmp7_ != NULL;
-#line 999 "EntryMultiCompletion.c"
+ _tmp2_ = _tmp5_ != NULL;
+#line 930 "EntryMultiCompletion.c"
} else {
#line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp4_ = FALSE;
-#line 1003 "EntryMultiCompletion.c"
+ _tmp2_ = FALSE;
+#line 934 "EntryMultiCompletion.c"
}
#line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- if (_tmp4_) {
-#line 1007 "EntryMultiCompletion.c"
- gchar** _tmp8_;
- gint _tmp8__length1;
- gchar** _tmp9_;
- gint _tmp9__length1;
- const gchar* _tmp10_;
- gchar* _tmp11_;
+ if (_tmp2_) {
+#line 938 "EntryMultiCompletion.c"
+ gchar** _tmp6_;
+ gint _tmp6__length1;
+ gchar** _tmp7_;
+ gint _tmp7__length1;
+ const gchar* _tmp8_;
+ gchar* _tmp9_;
#line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp8_ = split;
+ _tmp6_ = split;
#line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp8__length1 = split_length1;
+ _tmp6__length1 = split_length1;
#line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp9_ = split;
+ _tmp7_ = split;
#line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp9__length1 = split_length1;
+ _tmp7__length1 = split_length1;
#line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp10_ = _tmp8_[_tmp9__length1 - 1];
+ _tmp8_ = _tmp6_[_tmp7__length1 - 1];
#line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp11_ = g_strdup (_tmp10_);
+ _tmp9_ = g_strdup (_tmp8_);
#line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- result = _tmp11_;
+ result = _tmp9_;
#line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
#line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
return result;
-#line 1032 "EntryMultiCompletion.c"
+#line 963 "EntryMultiCompletion.c"
} else {
- gchar* _tmp12_;
+ gchar* _tmp10_;
#line 94 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- _tmp12_ = g_strdup ("");
+ _tmp10_ = g_strdup ("");
#line 94 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
- result = _tmp12_;
+ result = _tmp10_;
#line 94 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
#line 94 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
return result;
-#line 1043 "EntryMultiCompletion.c"
+#line 974 "EntryMultiCompletion.c"
}
#line 88 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
-#line 1047 "EntryMultiCompletion.c"
+#line 978 "EntryMultiCompletion.c"
}
-static void entry_multi_completion_class_init (EntryMultiCompletionClass * klass) {
+static void
+entry_multi_completion_class_init (EntryMultiCompletionClass * klass)
+{
#line 10 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
entry_multi_completion_parent_class = g_type_class_peek_parent (klass);
#line 10 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
@@ -1056,18 +989,22 @@ static void entry_multi_completion_class_init (EntryMultiCompletionClass * klass
((GtkEntryCompletionClass *) klass)->match_selected = (gboolean (*) (GtkEntryCompletion *, GtkTreeModel*, GtkTreeIter*)) entry_multi_completion_real_match_selected;
#line 10 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
G_OBJECT_CLASS (klass)->finalize = entry_multi_completion_finalize;
-#line 1060 "EntryMultiCompletion.c"
+#line 993 "EntryMultiCompletion.c"
}
-static void entry_multi_completion_instance_init (EntryMultiCompletion * self) {
+static void
+entry_multi_completion_instance_init (EntryMultiCompletion * self)
+{
#line 10 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
self->priv = ENTRY_MULTI_COMPLETION_GET_PRIVATE (self);
-#line 1067 "EntryMultiCompletion.c"
+#line 1002 "EntryMultiCompletion.c"
}
-static void entry_multi_completion_finalize (GObject * obj) {
+static void
+entry_multi_completion_finalize (GObject * obj)
+{
EntryMultiCompletion * self;
#line 10 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletion);
@@ -1075,11 +1012,13 @@ static void entry_multi_completion_finalize (GObject * obj) {
_g_free0 (self->priv->delimiter);
#line 10 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
G_OBJECT_CLASS (entry_multi_completion_parent_class)->finalize (obj);
-#line 1079 "EntryMultiCompletion.c"
+#line 1016 "EntryMultiCompletion.c"
}
-GType entry_multi_completion_get_type (void) {
+GType
+entry_multi_completion_get_type (void)
+{
static volatile gsize entry_multi_completion_type_id__volatile = 0;
if (g_once_init_enter (&entry_multi_completion_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (EntryMultiCompletionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) entry_multi_completion_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EntryMultiCompletion), 0, (GInstanceInitFunc) entry_multi_completion_instance_init, NULL };
@@ -1091,7 +1030,11 @@ GType entry_multi_completion_get_type (void) {
}
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
if ((array != NULL) && (destroy_func != NULL)) {
int i;
for (i = 0; i < array_length; i = i + 1) {
@@ -1103,13 +1046,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
}
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
_vala_array_destroy (array, array_length, destroy_func);
g_free (array);
}
-static gint _vala_array_length (gpointer array) {
+static gint
+_vala_array_length (gpointer array)
+{
int length;
length = 0;
if (array) {
diff --git a/src/dialogs/ExportDialog.c b/src/dialogs/ExportDialog.c
index f74f962..f20dd78 100644
--- a/src/dialogs/ExportDialog.c
+++ b/src/dialogs/ExportDialog.c
@@ -1,4 +1,4 @@
-/* ExportDialog.c generated by valac 0.36.6, the Vala compiler
+/* ExportDialog.c generated by valac 0.40.4, the Vala compiler
* generated from ExportDialog.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8,6 +8,7 @@
* See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
@@ -27,6 +28,11 @@
typedef struct _ExportDialog ExportDialog;
typedef struct _ExportDialogClass ExportDialogClass;
typedef struct _ExportDialogPrivate ExportDialogPrivate;
+enum {
+ EXPORT_DIALOG_0_PROPERTY,
+ EXPORT_DIALOG_NUM_PROPERTIES
+};
+static GParamSpec* export_dialog_properties[EXPORT_DIALOG_NUM_PROPERTIES];
#define TYPE_SCALE_CONSTRAINT (scale_constraint_get_type ())
@@ -146,9 +152,6 @@ static gint export_dialog_current_scale = 0;
GType export_dialog_get_type (void) G_GNUC_CONST;
#define EXPORT_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EXPORT_DIALOG, ExportDialogPrivate))
-enum {
- EXPORT_DIALOG_DUMMY_PROPERTY
-};
GType scale_constraint_get_type (void) G_GNUC_CONST;
GType export_format_parameters_get_type (void) G_GNUC_CONST;
GType export_format_mode_get_type (void) G_GNUC_CONST;
@@ -162,7 +165,8 @@ void export_format_parameters_current (ExportFormatParameters* result);
#define EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL _ ("Unmodified")
#define EXPORT_DIALOG_CURRENT_FORMAT_LABEL _ ("Current")
ExportDialog* export_dialog_new (const gchar* title);
-ExportDialog* export_dialog_construct (GType object_type, const gchar* title);
+ExportDialog* export_dialog_construct (GType object_type,
+ const gchar* title);
gint resources_use_header_bar (void);
GType configuration_facade_get_type (void) G_GNUC_CONST;
GType config_facade_get_type (void) G_GNUC_CONST;
@@ -175,213 +179,248 @@ ScaleConstraint configuration_facade_get_export_constraint (ConfigurationFacade*
gint configuration_facade_get_export_scale (ConfigurationFacade* self);
gchar* jpeg_quality_to_string (JpegQuality self);
gchar* scale_constraint_to_string (ScaleConstraint self);
-static void export_dialog_format_add_option (ExportDialog* self, const gchar* format_name);
+static void export_dialog_format_add_option (ExportDialog* self,
+ const gchar* format_name);
PhotoFileFormat* photo_file_format_get_writeable (int* result_length1);
gpointer photo_file_format_properties_ref (gpointer instance);
void photo_file_format_properties_unref (gpointer instance);
-GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_photo_file_format_properties (GValue* value, gpointer v_object);
-void value_take_photo_file_format_properties (GValue* value, gpointer v_object);
+GParamSpec* param_spec_photo_file_format_properties (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_photo_file_format_properties (GValue* value,
+ gpointer v_object);
+void value_take_photo_file_format_properties (GValue* value,
+ gpointer v_object);
gpointer value_get_photo_file_format_properties (const GValue* value);
GType photo_file_format_properties_get_type (void) G_GNUC_CONST;
PhotoFileFormatProperties* photo_file_format_get_properties (PhotoFileFormat self);
gchar* photo_file_format_properties_get_user_visible_name (PhotoFileFormatProperties* self);
static void export_dialog_on_constraint_changed (ExportDialog* self);
-static void _export_dialog_on_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _export_dialog_on_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self);
static void export_dialog_on_format_changed (ExportDialog* self);
-static void _export_dialog_on_format_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _export_dialog_on_format_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self);
static void export_dialog_on_pixels_changed (ExportDialog* self);
-static void _export_dialog_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
-static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar* text, gint length, gint* position);
-static void _export_dialog_on_pixels_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self);
+static void _export_dialog_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self);
+static void export_dialog_on_pixels_insert_text (ExportDialog* self,
+ const gchar* text,
+ gint length,
+ gint* position);
+static void _export_dialog_on_pixels_insert_text_gtk_editable_insert_text (GtkEditable* _sender,
+ const gchar* new_text,
+ gint new_text_length,
+ gint* position,
+ gpointer self);
static void export_dialog_on_activate (ExportDialog* self);
-static void _export_dialog_on_activate_gtk_entry_activate (GtkEntry* _sender, gpointer self);
-static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint x, gint y, GtkWidget* widget);
-static void export_dialog_add_control (ExportDialog* self, GtkWidget* widget, gint x, gint y);
+static void _export_dialog_on_activate_gtk_entry_activate (GtkEntry* _sender,
+ gpointer self);
+static void export_dialog_add_label (ExportDialog* self,
+ const gchar* text,
+ gint x,
+ gint y,
+ GtkWidget* widget);
+static void export_dialog_add_control (ExportDialog* self,
+ GtkWidget* widget,
+ gint x,
+ gint y);
#define RESOURCES_CANCEL_LABEL _ ("_Cancel")
#define RESOURCES_OK_LABEL _ ("_OK")
-static void export_dialog_format_set_active_text (ExportDialog* self, const gchar* text);
+static void export_dialog_format_set_active_text (ExportDialog* self,
+ const gchar* text);
static PhotoFileFormat export_dialog_get_specified_format (ExportDialog* self);
-static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, ExportFormatParameters* params);
-gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint* constraint, ExportFormatParameters* parameters);
+static gchar* export_dialog_get_label_for_parameters (ExportDialog* self,
+ ExportFormatParameters* params);
+gboolean export_dialog_execute (ExportDialog* self,
+ gint* scale,
+ ScaleConstraint* constraint,
+ ExportFormatParameters* parameters);
gboolean photo_file_format_can_write (PhotoFileFormat self);
PhotoFileFormat photo_file_format_get_system_default_format (void);
-void configuration_facade_set_export_export_format_mode (ConfigurationFacade* self, ExportFormatMode export_format_mode);
-void configuration_facade_set_export_photo_file_format (ConfigurationFacade* self, PhotoFileFormat photo_file_format);
-void configuration_facade_set_export_quality (ConfigurationFacade* self, JpegQuality quality);
-void configuration_facade_set_export_export_metadata (ConfigurationFacade* self, gboolean export_metadata);
-void configuration_facade_set_export_constraint (ConfigurationFacade* self, ScaleConstraint constraint);
-void configuration_facade_set_export_scale (ConfigurationFacade* self, gint scale);
+void configuration_facade_set_export_export_format_mode (ConfigurationFacade* self,
+ ExportFormatMode export_format_mode);
+void configuration_facade_set_export_photo_file_format (ConfigurationFacade* self,
+ PhotoFileFormat photo_file_format);
+void configuration_facade_set_export_quality (ConfigurationFacade* self,
+ JpegQuality quality);
+void configuration_facade_set_export_export_metadata (ConfigurationFacade* self,
+ gboolean export_metadata);
+void configuration_facade_set_export_constraint (ConfigurationFacade* self,
+ ScaleConstraint constraint);
+void configuration_facade_set_export_scale (ConfigurationFacade* self,
+ gint scale);
static void export_dialog_finalize (GObject * obj);
const ScaleConstraint EXPORT_DIALOG_CONSTRAINT_ARRAY[4] = {SCALE_CONSTRAINT_ORIGINAL, SCALE_CONSTRAINT_DIMENSIONS, SCALE_CONSTRAINT_WIDTH, SCALE_CONSTRAINT_HEIGHT};
const JpegQuality EXPORT_DIALOG_QUALITY_ARRAY[4] = {JPEG_QUALITY_LOW, JPEG_QUALITY_MEDIUM, JPEG_QUALITY_HIGH, JPEG_QUALITY_MAXIMUM};
-static void _export_dialog_on_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_export_dialog_on_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self)
+{
#line 83 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
export_dialog_on_constraint_changed ((ExportDialog*) self);
-#line 224 "ExportDialog.c"
+#line 267 "ExportDialog.c"
}
-static void _export_dialog_on_format_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_export_dialog_on_format_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self)
+{
#line 84 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
export_dialog_on_format_changed ((ExportDialog*) self);
-#line 231 "ExportDialog.c"
+#line 277 "ExportDialog.c"
}
-static void _export_dialog_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_export_dialog_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self)
+{
#line 85 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
export_dialog_on_pixels_changed ((ExportDialog*) self);
-#line 238 "ExportDialog.c"
+#line 287 "ExportDialog.c"
}
-static void _export_dialog_on_pixels_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
+static void
+_export_dialog_on_pixels_insert_text_gtk_editable_insert_text (GtkEditable* _sender,
+ const gchar* new_text,
+ gint new_text_length,
+ gint* position,
+ gpointer self)
+{
#line 86 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
export_dialog_on_pixels_insert_text ((ExportDialog*) self, new_text, new_text_length, position);
-#line 245 "ExportDialog.c"
+#line 300 "ExportDialog.c"
}
-static void _export_dialog_on_activate_gtk_entry_activate (GtkEntry* _sender, gpointer self) {
+static void
+_export_dialog_on_activate_gtk_entry_activate (GtkEntry* _sender,
+ gpointer self)
+{
#line 87 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
export_dialog_on_activate ((ExportDialog*) self);
-#line 252 "ExportDialog.c"
+#line 310 "ExportDialog.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 116 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
return self ? g_object_ref (self) : NULL;
-#line 259 "ExportDialog.c"
+#line 319 "ExportDialog.c"
}
-ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
+ExportDialog*
+export_dialog_construct (GType object_type,
+ const gchar* title)
+{
ExportDialog * self = NULL;
- gint _tmp0_;
- const gchar* _tmp1_;
ConfigFacade* config = NULL;
+ ConfigFacade* _tmp0_;
+ ConfigFacade* _tmp1_;
ConfigFacade* _tmp2_;
ConfigFacade* _tmp3_;
- ExportFormatMode _tmp4_;
+ ConfigFacade* _tmp4_;
ConfigFacade* _tmp5_;
- PhotoFileFormat _tmp6_;
- ConfigFacade* _tmp7_;
- JpegQuality _tmp8_;
- ConfigFacade* _tmp9_;
- gboolean _tmp10_;
- ConfigFacade* _tmp11_;
- ScaleConstraint _tmp12_;
- ConfigFacade* _tmp13_;
- gint _tmp14_;
- GtkComboBoxText* _tmp15_;
+ ConfigFacade* _tmp6_;
+ GtkComboBoxText* _tmp7_;
gint ctr = 0;
- GtkComboBoxText* _tmp26_;
- GtkComboBoxText* _tmp36_;
- gint _tmp37_;
- PhotoFileFormat* _tmp38_;
+ GtkComboBoxText* _tmp18_;
+ GtkComboBoxText* _tmp28_;
+ gint _tmp29_;
+ PhotoFileFormat* _tmp30_;
+ GtkEntry* _tmp36_;
+ GtkEntry* _tmp37_;
+ GtkEntry* _tmp38_;
+ gint _tmp39_;
+ gchar* _tmp40_;
+ gchar* _tmp41_;
+ GtkComboBoxText* _tmp42_;
+ GtkComboBoxText* _tmp43_;
GtkEntry* _tmp44_;
GtkEntry* _tmp45_;
GtkEntry* _tmp46_;
- gint _tmp47_;
- gchar* _tmp48_;
- gchar* _tmp49_;
+ GtkComboBoxText* _tmp47_;
+ GtkComboBoxText* _tmp48_;
+ GtkComboBoxText* _tmp49_;
GtkComboBoxText* _tmp50_;
GtkComboBoxText* _tmp51_;
- GtkEntry* _tmp52_;
+ GtkComboBoxText* _tmp52_;
GtkEntry* _tmp53_;
GtkEntry* _tmp54_;
- GtkComboBoxText* _tmp55_;
- GtkComboBoxText* _tmp56_;
- GtkComboBoxText* _tmp57_;
- GtkComboBoxText* _tmp58_;
- GtkComboBoxText* _tmp59_;
- GtkComboBoxText* _tmp60_;
- GtkEntry* _tmp61_;
- GtkEntry* _tmp62_;
- GtkSwitch* _tmp63_;
- GtkSwitch* _tmp64_;
- GtkSwitch* _tmp65_;
- GtkSwitch* _tmp66_;
- GtkSwitch* _tmp67_;
- GtkGrid* _tmp68_;
- GtkGrid* _tmp69_;
- GtkGrid* _tmp70_;
- GtkBox* _tmp71_;
- GtkGrid* _tmp72_;
+ GtkSwitch* _tmp55_;
+ GtkSwitch* _tmp56_;
+ GtkSwitch* _tmp57_;
+ GtkSwitch* _tmp58_;
+ GtkSwitch* _tmp59_;
+ GtkGrid* _tmp60_;
+ GtkGrid* _tmp61_;
+ GtkGrid* _tmp62_;
+ GtkBox* _tmp63_;
+ GtkGrid* _tmp64_;
+ GtkWidget* _tmp65_;
+ GtkWidget* _tmp66_;
+ GtkWidget* _tmp67_;
+ GtkWidget* _tmp68_;
+ GtkWidget* _tmp69_;
+ ScaleConstraint _tmp70_;
GtkWidget* _tmp73_;
- GtkWidget* _tmp74_;
- GtkWidget* _tmp75_;
- GtkWidget* _tmp76_;
- GtkWidget* _tmp77_;
- ScaleConstraint _tmp78_;
- GtkWidget* _tmp81_;
#line 38 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
g_return_val_if_fail (title != NULL, NULL);
#line 39 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp0_ = resources_use_header_bar ();
-#line 39 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- self = (ExportDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
+ self = (ExportDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL);
#line 41 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp1_ = title;
-#line 41 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp1_);
+ gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), title);
#line 42 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
#line 45 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp2_ = config_facade_get_instance ();
+ _tmp0_ = config_facade_get_instance ();
#line 45 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- config = _tmp2_;
-#line 46 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp3_ = config;
+ config = _tmp0_;
#line 46 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp4_ = configuration_facade_get_export_export_format_mode (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp1_ = config;
#line 46 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_current_parameters.mode = _tmp4_;
-#line 47 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp5_ = config;
+ export_dialog_current_parameters.mode = configuration_facade_get_export_export_format_mode (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 47 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp6_ = configuration_facade_get_export_photo_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp2_ = config;
#line 47 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_current_parameters.specified_format = _tmp6_;
+ export_dialog_current_parameters.specified_format = configuration_facade_get_export_photo_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 48 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp7_ = config;
-#line 48 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp8_ = configuration_facade_get_export_quality (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp3_ = config;
#line 48 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_current_parameters.quality = _tmp8_;
+ export_dialog_current_parameters.quality = configuration_facade_get_export_quality (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 49 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp9_ = config;
+ _tmp4_ = config;
#line 49 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp10_ = configuration_facade_get_export_export_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 49 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_current_parameters.export_metadata = _tmp10_;
-#line 50 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp11_ = config;
+ export_dialog_current_parameters.export_metadata = configuration_facade_get_export_export_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 50 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp12_ = configuration_facade_get_export_constraint (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp5_ = config;
#line 50 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_current_constraint = _tmp12_;
-#line 51 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp13_ = config;
+ export_dialog_current_constraint = configuration_facade_get_export_constraint (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 51 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp14_ = configuration_facade_get_export_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp6_ = config;
#line 51 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_current_scale = _tmp14_;
+ export_dialog_current_scale = configuration_facade_get_export_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 53 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp15_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+ _tmp7_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
#line 53 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- g_object_ref_sink (_tmp15_);
+ g_object_ref_sink (_tmp7_);
#line 53 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_g_object_unref0 (self->priv->quality_combo);
#line 53 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- self->priv->quality_combo = _tmp15_;
+ self->priv->quality_combo = _tmp7_;
#line 54 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
ctr = 0;
-#line 385 "ExportDialog.c"
+#line 424 "ExportDialog.c"
{
JpegQuality* quality_collection = NULL;
gint quality_collection_length1 = 0;
@@ -393,70 +432,70 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
quality_collection_length1 = G_N_ELEMENTS (EXPORT_DIALOG_QUALITY_ARRAY);
#line 55 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
for (quality_it = 0; quality_it < G_N_ELEMENTS (EXPORT_DIALOG_QUALITY_ARRAY); quality_it = quality_it + 1) {
-#line 397 "ExportDialog.c"
+#line 436 "ExportDialog.c"
JpegQuality quality = 0;
#line 55 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
quality = quality_collection[quality_it];
-#line 401 "ExportDialog.c"
+#line 440 "ExportDialog.c"
{
- GtkComboBoxText* _tmp16_;
- JpegQuality _tmp17_;
- gchar* _tmp18_;
- gchar* _tmp19_;
- JpegQuality _tmp20_;
- ExportFormatParameters _tmp21_;
- JpegQuality _tmp22_;
- gint _tmp25_;
+ GtkComboBoxText* _tmp8_;
+ JpegQuality _tmp9_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ JpegQuality _tmp12_;
+ ExportFormatParameters _tmp13_;
+ JpegQuality _tmp14_;
+ gint _tmp17_;
#line 56 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp16_ = self->priv->quality_combo;
+ _tmp8_ = self->priv->quality_combo;
#line 56 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp17_ = quality;
+ _tmp9_ = quality;
#line 56 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp18_ = jpeg_quality_to_string (_tmp17_);
+ _tmp10_ = jpeg_quality_to_string (_tmp9_);
#line 56 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp19_ = _tmp18_;
+ _tmp11_ = _tmp10_;
#line 56 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_combo_box_text_append_text (_tmp16_, _tmp19_);
+ gtk_combo_box_text_append_text (_tmp8_, _tmp11_);
#line 56 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _g_free0 (_tmp19_);
+ _g_free0 (_tmp11_);
#line 57 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp20_ = quality;
+ _tmp12_ = quality;
#line 57 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp21_ = export_dialog_current_parameters;
+ _tmp13_ = export_dialog_current_parameters;
#line 57 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp22_ = _tmp21_.quality;
+ _tmp14_ = _tmp13_.quality;
#line 57 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (_tmp20_ == _tmp22_) {
-#line 431 "ExportDialog.c"
- GtkComboBoxText* _tmp23_;
- gint _tmp24_;
+ if (_tmp12_ == _tmp14_) {
+#line 470 "ExportDialog.c"
+ GtkComboBoxText* _tmp15_;
+ gint _tmp16_;
#line 58 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp23_ = self->priv->quality_combo;
+ _tmp15_ = self->priv->quality_combo;
#line 58 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp24_ = ctr;
+ _tmp16_ = ctr;
#line 58 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox), _tmp24_);
-#line 440 "ExportDialog.c"
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_combo_box_get_type (), GtkComboBox), _tmp16_);
+#line 479 "ExportDialog.c"
}
#line 59 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp25_ = ctr;
+ _tmp17_ = ctr;
#line 59 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- ctr = _tmp25_ + 1;
-#line 446 "ExportDialog.c"
+ ctr = _tmp17_ + 1;
+#line 485 "ExportDialog.c"
}
}
}
#line 62 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp26_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+ _tmp18_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
#line 62 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- g_object_ref_sink (_tmp26_);
+ g_object_ref_sink (_tmp18_);
#line 62 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_g_object_unref0 (self->priv->constraint_combo);
#line 62 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- self->priv->constraint_combo = _tmp26_;
+ self->priv->constraint_combo = _tmp18_;
#line 63 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
ctr = 0;
-#line 460 "ExportDialog.c"
+#line 499 "ExportDialog.c"
{
ScaleConstraint* constraint_collection = NULL;
gint constraint_collection_length1 = 0;
@@ -468,299 +507,302 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
constraint_collection_length1 = G_N_ELEMENTS (EXPORT_DIALOG_CONSTRAINT_ARRAY);
#line 64 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
for (constraint_it = 0; constraint_it < G_N_ELEMENTS (EXPORT_DIALOG_CONSTRAINT_ARRAY); constraint_it = constraint_it + 1) {
-#line 472 "ExportDialog.c"
+#line 511 "ExportDialog.c"
ScaleConstraint constraint = 0;
#line 64 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
constraint = constraint_collection[constraint_it];
-#line 476 "ExportDialog.c"
+#line 515 "ExportDialog.c"
{
- GtkComboBoxText* _tmp27_;
- ScaleConstraint _tmp28_;
- gchar* _tmp29_;
- gchar* _tmp30_;
- ScaleConstraint _tmp31_;
- ScaleConstraint _tmp32_;
- gint _tmp35_;
+ GtkComboBoxText* _tmp19_;
+ ScaleConstraint _tmp20_;
+ gchar* _tmp21_;
+ gchar* _tmp22_;
+ ScaleConstraint _tmp23_;
+ ScaleConstraint _tmp24_;
+ gint _tmp27_;
#line 65 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp27_ = self->priv->constraint_combo;
+ _tmp19_ = self->priv->constraint_combo;
#line 65 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp28_ = constraint;
+ _tmp20_ = constraint;
#line 65 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp29_ = scale_constraint_to_string (_tmp28_);
+ _tmp21_ = scale_constraint_to_string (_tmp20_);
#line 65 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp30_ = _tmp29_;
+ _tmp22_ = _tmp21_;
#line 65 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_combo_box_text_append_text (_tmp27_, _tmp30_);
+ gtk_combo_box_text_append_text (_tmp19_, _tmp22_);
#line 65 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _g_free0 (_tmp30_);
+ _g_free0 (_tmp22_);
#line 66 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp31_ = constraint;
+ _tmp23_ = constraint;
#line 66 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp32_ = export_dialog_current_constraint;
+ _tmp24_ = export_dialog_current_constraint;
#line 66 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (_tmp31_ == _tmp32_) {
-#line 503 "ExportDialog.c"
- GtkComboBoxText* _tmp33_;
- gint _tmp34_;
+ if (_tmp23_ == _tmp24_) {
+#line 542 "ExportDialog.c"
+ GtkComboBoxText* _tmp25_;
+ gint _tmp26_;
#line 67 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp33_ = self->priv->constraint_combo;
+ _tmp25_ = self->priv->constraint_combo;
#line 67 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp34_ = ctr;
+ _tmp26_ = ctr;
#line 67 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_combo_box_get_type (), GtkComboBox), _tmp34_);
-#line 512 "ExportDialog.c"
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_combo_box_get_type (), GtkComboBox), _tmp26_);
+#line 551 "ExportDialog.c"
}
#line 68 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp35_ = ctr;
+ _tmp27_ = ctr;
#line 68 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- ctr = _tmp35_ + 1;
-#line 518 "ExportDialog.c"
+ ctr = _tmp27_ + 1;
+#line 557 "ExportDialog.c"
}
}
}
#line 71 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp36_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+ _tmp28_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
#line 71 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- g_object_ref_sink (_tmp36_);
+ g_object_ref_sink (_tmp28_);
#line 71 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_g_object_unref0 (self->priv->format_combo);
#line 71 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- self->priv->format_combo = _tmp36_;
+ self->priv->format_combo = _tmp28_;
#line 72 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
export_dialog_format_add_option (self, EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL);
#line 73 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
export_dialog_format_add_option (self, EXPORT_DIALOG_CURRENT_FORMAT_LABEL);
#line 74 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp38_ = photo_file_format_get_writeable (&_tmp37_);
-#line 536 "ExportDialog.c"
+ _tmp30_ = photo_file_format_get_writeable (&_tmp29_);
+#line 575 "ExportDialog.c"
{
PhotoFileFormat* format_collection = NULL;
gint format_collection_length1 = 0;
gint _format_collection_size_ = 0;
gint format_it = 0;
#line 74 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- format_collection = _tmp38_;
+ format_collection = _tmp30_;
#line 74 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- format_collection_length1 = _tmp37_;
+ format_collection_length1 = _tmp29_;
#line 74 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- for (format_it = 0; format_it < _tmp37_; format_it = format_it + 1) {
-#line 548 "ExportDialog.c"
+ for (format_it = 0; format_it < _tmp29_; format_it = format_it + 1) {
+#line 587 "ExportDialog.c"
PhotoFileFormat format = 0;
#line 74 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
format = format_collection[format_it];
-#line 552 "ExportDialog.c"
+#line 591 "ExportDialog.c"
{
- PhotoFileFormat _tmp39_;
- PhotoFileFormatProperties* _tmp40_;
- PhotoFileFormatProperties* _tmp41_;
- gchar* _tmp42_;
- gchar* _tmp43_;
+ PhotoFileFormat _tmp31_;
+ PhotoFileFormatProperties* _tmp32_;
+ PhotoFileFormatProperties* _tmp33_;
+ gchar* _tmp34_;
+ gchar* _tmp35_;
#line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp39_ = format;
+ _tmp31_ = format;
#line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp40_ = photo_file_format_get_properties (_tmp39_);
+ _tmp32_ = photo_file_format_get_properties (_tmp31_);
#line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp41_ = _tmp40_;
+ _tmp33_ = _tmp32_;
#line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp42_ = photo_file_format_properties_get_user_visible_name (_tmp41_);
+ _tmp34_ = photo_file_format_properties_get_user_visible_name (_tmp33_);
#line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp43_ = _tmp42_;
+ _tmp35_ = _tmp34_;
#line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_format_add_option (self, _tmp43_);
+ export_dialog_format_add_option (self, _tmp35_);
#line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _g_free0 (_tmp43_);
+ _g_free0 (_tmp35_);
#line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _photo_file_format_properties_unref0 (_tmp41_);
-#line 575 "ExportDialog.c"
+ _photo_file_format_properties_unref0 (_tmp33_);
+#line 614 "ExportDialog.c"
}
}
#line 74 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
format_collection = (g_free (format_collection), NULL);
-#line 580 "ExportDialog.c"
+#line 619 "ExportDialog.c"
}
#line 78 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp44_ = (GtkEntry*) gtk_entry_new ();
+ _tmp36_ = (GtkEntry*) gtk_entry_new ();
#line 78 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- g_object_ref_sink (_tmp44_);
+ g_object_ref_sink (_tmp36_);
#line 78 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_g_object_unref0 (self->priv->pixels_entry);
#line 78 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- self->priv->pixels_entry = _tmp44_;
+ self->priv->pixels_entry = _tmp36_;
#line 79 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp45_ = self->priv->pixels_entry;
+ _tmp37_ = self->priv->pixels_entry;
#line 79 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_entry_set_max_length (_tmp45_, 6);
+ gtk_entry_set_max_length (_tmp37_, 6);
#line 80 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp46_ = self->priv->pixels_entry;
+ _tmp38_ = self->priv->pixels_entry;
#line 80 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp47_ = export_dialog_current_scale;
+ _tmp39_ = export_dialog_current_scale;
#line 80 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp48_ = g_strdup_printf ("%d", _tmp47_);
+ _tmp40_ = g_strdup_printf ("%d", _tmp39_);
#line 80 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp49_ = _tmp48_;
+ _tmp41_ = _tmp40_;
#line 80 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_entry_set_text (_tmp46_, _tmp49_);
+ gtk_entry_set_text (_tmp38_, _tmp41_);
#line 80 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _g_free0 (_tmp49_);
+ _g_free0 (_tmp41_);
#line 83 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp50_ = self->priv->constraint_combo;
+ _tmp42_ = self->priv->constraint_combo;
#line 83 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _export_dialog_on_constraint_changed_gtk_combo_box_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _export_dialog_on_constraint_changed_gtk_combo_box_changed, self, 0);
#line 84 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp51_ = self->priv->format_combo;
+ _tmp43_ = self->priv->format_combo;
#line 84 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _export_dialog_on_format_changed_gtk_combo_box_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _export_dialog_on_format_changed_gtk_combo_box_changed, self, 0);
#line 85 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp52_ = self->priv->pixels_entry;
+ _tmp44_ = self->priv->pixels_entry;
#line 85 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _export_dialog_on_pixels_changed_gtk_editable_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _export_dialog_on_pixels_changed_gtk_editable_changed, self, 0);
#line 86 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp53_ = self->priv->pixels_entry;
+ _tmp45_ = self->priv->pixels_entry;
#line 86 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _export_dialog_on_pixels_insert_text_gtk_editable_insert_text, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_editable_get_type (), GtkEditable), "insert-text", (GCallback) _export_dialog_on_pixels_insert_text_gtk_editable_insert_text, self, 0);
#line 87 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp54_ = self->priv->pixels_entry;
+ _tmp46_ = self->priv->pixels_entry;
#line 87 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- g_signal_connect_object (_tmp54_, "activate", (GCallback) _export_dialog_on_activate_gtk_entry_activate, self, 0);
+ g_signal_connect_object (_tmp46_, "activate", (GCallback) _export_dialog_on_activate_gtk_entry_activate, self, 0);
#line 90 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp55_ = self->priv->format_combo;
+ _tmp47_ = self->priv->format_combo;
#line 90 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_add_label (self, _ ("_Format:"), 0, 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget));
+ export_dialog_add_label (self, _ ("_Format:"), 0, 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget));
#line 91 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp56_ = self->priv->format_combo;
+ _tmp48_ = self->priv->format_combo;
#line 91 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_widget_get_type (), GtkWidget), 1, 0);
+ export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget), 1, 0);
#line 93 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp57_ = self->priv->quality_combo;
+ _tmp49_ = self->priv->quality_combo;
#line 93 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_add_label (self, _ ("_Quality:"), 0, 1, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget));
+ export_dialog_add_label (self, _ ("_Quality:"), 0, 1, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget));
#line 94 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp58_ = self->priv->quality_combo;
+ _tmp50_ = self->priv->quality_combo;
#line 94 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), 1, 1);
+ export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), 1, 1);
#line 96 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp59_ = self->priv->constraint_combo;
+ _tmp51_ = self->priv->constraint_combo;
#line 96 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_add_label (self, _ ("_Scaling constraint:"), 0, 2, G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget));
+ export_dialog_add_label (self, _ ("_Scaling constraint:"), 0, 2, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget));
#line 97 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp60_ = self->priv->constraint_combo;
+ _tmp52_ = self->priv->constraint_combo;
#line 97 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), 1, 2);
+ export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), 1, 2);
#line 99 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp61_ = self->priv->pixels_entry;
+ _tmp53_ = self->priv->pixels_entry;
#line 99 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_add_label (self, _ ("_Pixels:"), 0, 3, G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget));
+ export_dialog_add_label (self, _ ("_Pixels:"), 0, 3, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_widget_get_type (), GtkWidget));
#line 100 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp62_ = self->priv->pixels_entry;
+ _tmp54_ = self->priv->pixels_entry;
#line 100 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), 1, 3);
+ export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), 1, 3);
#line 102 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp63_ = (GtkSwitch*) gtk_switch_new ();
+ _tmp55_ = (GtkSwitch*) gtk_switch_new ();
#line 102 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- g_object_ref_sink (_tmp63_);
+ g_object_ref_sink (_tmp55_);
#line 102 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_g_object_unref0 (self->priv->export_metadata);
#line 102 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- self->priv->export_metadata = _tmp63_;
+ self->priv->export_metadata = _tmp55_;
#line 103 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp64_ = self->priv->export_metadata;
+ _tmp56_ = self->priv->export_metadata;
#line 103 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_add_label (self, _ ("Export _metadata:"), 0, 4, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget));
+ export_dialog_add_label (self, _ ("Export _metadata:"), 0, 4, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_widget_get_type (), GtkWidget));
#line 104 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp65_ = self->priv->export_metadata;
+ _tmp57_ = self->priv->export_metadata;
#line 104 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget), 1, 4);
+ export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget), 1, 4);
#line 105 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp66_ = self->priv->export_metadata;
+ _tmp58_ = self->priv->export_metadata;
#line 105 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_switch_set_active (_tmp66_, TRUE);
+ gtk_switch_set_active (_tmp58_, TRUE);
#line 106 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp67_ = self->priv->export_metadata;
+ _tmp59_ = self->priv->export_metadata;
#line 106 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+ gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
#line 108 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp68_ = self->priv->table;
+ _tmp60_ = self->priv->table;
#line 108 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_grid_set_row_spacing (_tmp68_, (guint) 6);
+ gtk_grid_set_row_spacing (_tmp60_, (guint) 6);
#line 109 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp69_ = self->priv->table;
+ _tmp61_ = self->priv->table;
#line 109 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_grid_set_column_spacing (_tmp69_, (guint) 12);
+ gtk_grid_set_column_spacing (_tmp61_, (guint) 12);
#line 110 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp70_ = self->priv->table;
+ _tmp62_ = self->priv->table;
#line 110 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_container_get_type (), GtkContainer), (guint) 18);
+ gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_container_get_type (), GtkContainer), (guint) 18);
#line 112 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp71_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+ _tmp63_ = gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
#line 112 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp72_ = self->priv->table;
+ _tmp64_ = self->priv->table;
#line 112 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget));
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget));
#line 115 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, (gint) GTK_RESPONSE_CANCEL);
#line 116 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp73_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_OK);
+ _tmp65_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_OK);
#line 116 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp74_ = _g_object_ref0 (_tmp73_);
+ _tmp66_ = _g_object_ref0 (_tmp65_);
#line 116 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_g_object_unref0 (self->priv->ok_button);
#line 116 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- self->priv->ok_button = _tmp74_;
+ self->priv->ok_button = _tmp66_;
#line 117 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
#line 119 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp75_ = self->priv->ok_button;
+ _tmp67_ = self->priv->ok_button;
#line 119 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_can_default (_tmp75_, TRUE);
+ gtk_widget_set_can_default (_tmp67_, TRUE);
#line 120 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp76_ = self->priv->ok_button;
+ _tmp68_ = self->priv->ok_button;
#line 120 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- g_object_set (_tmp76_, "has-default", TRUE, NULL);
+ g_object_set (_tmp68_, "has-default", TRUE, NULL);
#line 121 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp77_ = self->priv->ok_button;
+ _tmp69_ = self->priv->ok_button;
#line 121 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp77_);
+ gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp69_);
#line 123 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp78_ = export_dialog_current_constraint;
+ _tmp70_ = export_dialog_current_constraint;
#line 123 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (_tmp78_ == SCALE_CONSTRAINT_ORIGINAL) {
-#line 728 "ExportDialog.c"
- GtkEntry* _tmp79_;
- GtkComboBoxText* _tmp80_;
+ if (_tmp70_ == SCALE_CONSTRAINT_ORIGINAL) {
+#line 767 "ExportDialog.c"
+ GtkEntry* _tmp71_;
+ GtkComboBoxText* _tmp72_;
#line 124 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp79_ = self->priv->pixels_entry;
+ _tmp71_ = self->priv->pixels_entry;
#line 124 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 125 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp80_ = self->priv->quality_combo;
+ _tmp72_ = self->priv->quality_combo;
#line 125 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 739 "ExportDialog.c"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 778 "ExportDialog.c"
}
#line 128 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp81_ = self->priv->ok_button;
+ _tmp73_ = self->priv->ok_button;
#line 128 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_grab_focus (_tmp81_);
+ gtk_widget_grab_focus (_tmp73_);
#line 38 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_g_object_unref0 (config);
#line 38 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
return self;
-#line 749 "ExportDialog.c"
+#line 788 "ExportDialog.c"
}
-ExportDialog* export_dialog_new (const gchar* title) {
+ExportDialog*
+export_dialog_new (const gchar* title)
+{
#line 38 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
return export_dialog_construct (TYPE_EXPORT_DIALOG, title);
-#line 756 "ExportDialog.c"
+#line 797 "ExportDialog.c"
}
-static void export_dialog_format_add_option (ExportDialog* self, const gchar* format_name) {
+static void
+export_dialog_format_add_option (ExportDialog* self,
+ const gchar* format_name)
+{
GeeArrayList* _tmp0_;
- const gchar* _tmp1_;
- GtkComboBoxText* _tmp2_;
- const gchar* _tmp3_;
+ GtkComboBoxText* _tmp1_;
#line 131 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
g_return_if_fail (IS_EXPORT_DIALOG (self));
#line 131 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
@@ -768,29 +810,27 @@ static void export_dialog_format_add_option (ExportDialog* self, const gchar* fo
#line 132 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_tmp0_ = self->priv->format_options;
#line 132 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp1_ = format_name;
-#line 132 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 133 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp2_ = self->priv->format_combo;
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), format_name);
#line 133 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp3_ = format_name;
+ _tmp1_ = self->priv->format_combo;
#line 133 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_combo_box_text_append_text (_tmp2_, _tmp3_);
-#line 781 "ExportDialog.c"
+ gtk_combo_box_text_append_text (_tmp1_, format_name);
+#line 819 "ExportDialog.c"
}
-static void export_dialog_format_set_active_text (ExportDialog* self, const gchar* text) {
+static void
+export_dialog_format_set_active_text (ExportDialog* self,
+ const gchar* text)
+{
gint selection_ticker = 0;
- const gchar* _tmp16_;
#line 136 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
g_return_if_fail (IS_EXPORT_DIALOG (self));
#line 136 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
g_return_if_fail (text != NULL);
#line 137 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
selection_ticker = 0;
-#line 794 "ExportDialog.c"
+#line 834 "ExportDialog.c"
{
GeeArrayList* _current_text_list = NULL;
GeeArrayList* _tmp0_;
@@ -818,7 +858,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
_current_text_index = -1;
#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
while (TRUE) {
-#line 822 "ExportDialog.c"
+#line 862 "ExportDialog.c"
gint _tmp5_;
gint _tmp6_;
gint _tmp7_;
@@ -827,8 +867,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
gint _tmp9_;
gpointer _tmp10_;
const gchar* _tmp11_;
- const gchar* _tmp12_;
- gint _tmp15_;
+ gint _tmp14_;
#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_tmp5_ = _current_text_index;
#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
@@ -841,7 +880,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
if (!(_tmp6_ < _tmp7_)) {
#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
break;
-#line 845 "ExportDialog.c"
+#line 884 "ExportDialog.c"
}
#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_tmp8_ = _current_text_list;
@@ -854,104 +893,102 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
#line 140 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_tmp11_ = current_text;
#line 140 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp12_ = text;
-#line 140 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (g_strcmp0 (_tmp11_, _tmp12_) == 0) {
-#line 861 "ExportDialog.c"
- GtkComboBoxText* _tmp13_;
- gint _tmp14_;
+ if (g_strcmp0 (_tmp11_, text) == 0) {
+#line 898 "ExportDialog.c"
+ GtkComboBoxText* _tmp12_;
+ gint _tmp13_;
#line 141 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp13_ = self->priv->format_combo;
+ _tmp12_ = self->priv->format_combo;
#line 141 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp14_ = selection_ticker;
+ _tmp13_ = selection_ticker;
#line 141 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_combo_box_get_type (), GtkComboBox), _tmp14_);
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), _tmp13_);
#line 142 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_g_free0 (current_text);
#line 142 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_g_object_unref0 (_current_text_list);
#line 142 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
return;
-#line 876 "ExportDialog.c"
+#line 913 "ExportDialog.c"
}
#line 144 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp15_ = selection_ticker;
+ _tmp14_ = selection_ticker;
#line 144 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- selection_ticker = _tmp15_ + 1;
+ selection_ticker = _tmp14_ + 1;
#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_g_free0 (current_text);
-#line 884 "ExportDialog.c"
+#line 921 "ExportDialog.c"
}
#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_g_object_unref0 (_current_text_list);
-#line 888 "ExportDialog.c"
+#line 925 "ExportDialog.c"
}
#line 147 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp16_ = text;
-#line 147 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
g_error ("ExportDialog.vala:147: format_set_active_text: text '%s' isn't in comb" \
-"o box", _tmp16_);
-#line 894 "ExportDialog.c"
+"o box", text);
+#line 929 "ExportDialog.c"
}
-static PhotoFileFormat export_dialog_get_specified_format (ExportDialog* self) {
+static PhotoFileFormat
+export_dialog_get_specified_format (ExportDialog* self)
+{
PhotoFileFormat result = 0;
gint index = 0;
GtkComboBoxText* _tmp0_;
gint _tmp1_;
gint _tmp2_;
- gint _tmp3_;
PhotoFileFormat* writeable_formats = NULL;
- gint _tmp4_;
- PhotoFileFormat* _tmp5_;
+ gint _tmp3_;
+ PhotoFileFormat* _tmp4_;
gint writeable_formats_length1;
gint _writeable_formats_size_;
- gint _tmp6_;
- PhotoFileFormat _tmp7_;
+ gint _tmp5_;
+ PhotoFileFormat _tmp6_;
#line 150 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
g_return_val_if_fail (IS_EXPORT_DIALOG (self), 0);
#line 151 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_tmp0_ = self->priv->format_combo;
#line 151 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 151 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- index = _tmp1_;
+ index = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
#line 152 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp2_ = index;
+ _tmp1_ = index;
#line 152 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (_tmp2_ < EXPORT_DIALOG_NUM_SPECIAL_FORMATS) {
+ if (_tmp1_ < EXPORT_DIALOG_NUM_SPECIAL_FORMATS) {
#line 153 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
index = EXPORT_DIALOG_NUM_SPECIAL_FORMATS;
-#line 926 "ExportDialog.c"
+#line 960 "ExportDialog.c"
}
#line 155 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp3_ = index;
+ _tmp2_ = index;
#line 155 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- index = _tmp3_ - EXPORT_DIALOG_NUM_SPECIAL_FORMATS;
+ index = _tmp2_ - EXPORT_DIALOG_NUM_SPECIAL_FORMATS;
#line 156 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp5_ = photo_file_format_get_writeable (&_tmp4_);
+ _tmp4_ = photo_file_format_get_writeable (&_tmp3_);
#line 156 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- writeable_formats = _tmp5_;
+ writeable_formats = _tmp4_;
#line 156 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- writeable_formats_length1 = _tmp4_;
+ writeable_formats_length1 = _tmp3_;
#line 156 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_writeable_formats_size_ = writeable_formats_length1;
#line 157 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp6_ = index;
+ _tmp5_ = index;
#line 157 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp7_ = writeable_formats[_tmp6_];
+ _tmp6_ = writeable_formats[_tmp5_];
#line 157 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- result = _tmp7_;
+ result = _tmp6_;
#line 157 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
writeable_formats = (g_free (writeable_formats), NULL);
#line 157 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
return result;
-#line 950 "ExportDialog.c"
+#line 984 "ExportDialog.c"
}
-static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, ExportFormatParameters* params) {
+static gchar*
+export_dialog_get_label_for_parameters (ExportDialog* self,
+ ExportFormatParameters* params)
+{
gchar* result = NULL;
ExportFormatParameters _tmp0_;
ExportFormatMode _tmp1_;
@@ -967,7 +1004,7 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export
switch (_tmp1_) {
#line 161 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
case EXPORT_FORMAT_MODE_UNMODIFIED:
-#line 970 "ExportDialog.c"
+#line 1007 "ExportDialog.c"
{
gchar* _tmp2_;
#line 163 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
@@ -976,11 +1013,11 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export
result = _tmp2_;
#line 163 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
return result;
-#line 979 "ExportDialog.c"
+#line 1016 "ExportDialog.c"
}
#line 161 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
case EXPORT_FORMAT_MODE_CURRENT:
-#line 983 "ExportDialog.c"
+#line 1020 "ExportDialog.c"
{
gchar* _tmp3_;
#line 166 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
@@ -989,11 +1026,11 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export
result = _tmp3_;
#line 166 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
return result;
-#line 992 "ExportDialog.c"
+#line 1029 "ExportDialog.c"
}
#line 161 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
case EXPORT_FORMAT_MODE_SPECIFIED:
-#line 996 "ExportDialog.c"
+#line 1033 "ExportDialog.c"
{
ExportFormatParameters _tmp4_;
PhotoFileFormat _tmp5_;
@@ -1019,20 +1056,25 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export
result = _tmp9_;
#line 169 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
return result;
-#line 1022 "ExportDialog.c"
+#line 1059 "ExportDialog.c"
}
default:
{
#line 172 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
g_error ("ExportDialog.vala:172: get_label_for_parameters: unrecognized export f" \
"ormat mode");
-#line 1028 "ExportDialog.c"
+#line 1065 "ExportDialog.c"
}
}
}
-gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint* constraint, ExportFormatParameters* parameters) {
+gboolean
+export_dialog_execute (ExportDialog* self,
+ gint* scale,
+ ScaleConstraint* constraint,
+ ExportFormatParameters* parameters)
+{
gint _vala_scale = 0;
ScaleConstraint _vala_constraint = 0;
gboolean result = FALSE;
@@ -1040,12 +1082,11 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
ExportFormatMode _tmp1_;
ExportFormatParameters _tmp4_;
ExportFormatMode _tmp5_;
- ExportFormatParameters _tmp14_;
- gchar* _tmp15_;
- gchar* _tmp16_;
+ ExportFormatParameters _tmp12_;
+ gchar* _tmp13_;
+ gchar* _tmp14_;
gboolean ok = FALSE;
- gint _tmp17_;
- gboolean _tmp18_;
+ gboolean _tmp15_;
#line 179 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
g_return_val_if_fail (IS_EXPORT_DIALOG (self), FALSE);
#line 179 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
@@ -1058,7 +1099,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
_tmp1_ = _tmp0_.mode;
#line 185 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
if (_tmp1_ != EXPORT_FORMAT_MODE_LAST) {
-#line 1060 "ExportDialog.c"
+#line 1101 "ExportDialog.c"
ScaleConstraint _tmp2_;
GtkComboBoxText* _tmp3_;
#line 186 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
@@ -1071,7 +1112,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
_tmp3_ = self->priv->constraint_combo;
#line 187 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 1073 "ExportDialog.c"
+#line 1114 "ExportDialog.c"
}
#line 190 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_tmp4_ = *parameters;
@@ -1079,13 +1120,13 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
_tmp5_ = _tmp4_.mode;
#line 190 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
if (_tmp5_ == EXPORT_FORMAT_MODE_LAST) {
-#line 1081 "ExportDialog.c"
+#line 1122 "ExportDialog.c"
ExportFormatParameters _tmp6_;
#line 191 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_tmp6_ = export_dialog_current_parameters;
#line 191 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
*parameters = _tmp6_;
-#line 1087 "ExportDialog.c"
+#line 1128 "ExportDialog.c"
} else {
gboolean _tmp7_ = FALSE;
ExportFormatParameters _tmp8_;
@@ -1096,317 +1137,296 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
_tmp9_ = _tmp8_.mode;
#line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
if (_tmp9_ == EXPORT_FORMAT_MODE_SPECIFIED) {
-#line 1098 "ExportDialog.c"
+#line 1139 "ExportDialog.c"
ExportFormatParameters _tmp10_;
PhotoFileFormat _tmp11_;
- gboolean _tmp12_;
#line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_tmp10_ = *parameters;
#line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_tmp11_ = _tmp10_.specified_format;
#line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp12_ = photo_file_format_can_write (_tmp11_);
-#line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp7_ = !_tmp12_;
-#line 1110 "ExportDialog.c"
+ _tmp7_ = !photo_file_format_can_write (_tmp11_);
+#line 1148 "ExportDialog.c"
} else {
#line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_tmp7_ = FALSE;
-#line 1114 "ExportDialog.c"
+#line 1152 "ExportDialog.c"
}
#line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
if (_tmp7_) {
-#line 1118 "ExportDialog.c"
- PhotoFileFormat _tmp13_;
-#line 193 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp13_ = photo_file_format_get_system_default_format ();
#line 193 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- (*parameters).specified_format = _tmp13_;
-#line 1124 "ExportDialog.c"
+ (*parameters).specified_format = photo_file_format_get_system_default_format ();
+#line 1158 "ExportDialog.c"
}
}
#line 195 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp14_ = *parameters;
+ _tmp12_ = *parameters;
#line 195 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp15_ = export_dialog_get_label_for_parameters (self, &_tmp14_);
+ _tmp13_ = export_dialog_get_label_for_parameters (self, &_tmp12_);
#line 195 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp16_ = _tmp15_;
+ _tmp14_ = _tmp13_;
#line 195 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_format_set_active_text (self, _tmp16_);
+ export_dialog_format_set_active_text (self, _tmp14_);
#line 195 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _g_free0 (_tmp16_);
+ _g_free0 (_tmp14_);
#line 196 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
export_dialog_on_format_changed (self);
#line 198 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 198 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- ok = _tmp17_ == ((gint) GTK_RESPONSE_OK);
+ ok = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)) == ((gint) GTK_RESPONSE_OK);
#line 199 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp18_ = ok;
+ _tmp15_ = ok;
#line 199 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (_tmp18_) {
-#line 1147 "ExportDialog.c"
+ if (_tmp15_) {
+#line 1179 "ExportDialog.c"
gint index = 0;
- GtkComboBoxText* _tmp19_;
- gint _tmp20_;
- gint _tmp21_;
- gint _tmp22_;
+ GtkComboBoxText* _tmp16_;
+ gint _tmp17_;
+ gint _tmp18_;
+ ScaleConstraint _tmp19_;
+ ScaleConstraint _tmp20_;
+ GtkEntry* _tmp21_;
+ const gchar* _tmp22_;
ScaleConstraint _tmp23_;
- ScaleConstraint _tmp24_;
- GtkEntry* _tmp25_;
- const gchar* _tmp26_;
- gint _tmp27_;
- ScaleConstraint _tmp28_;
- gint _tmp30_;
- gboolean _tmp31_ = FALSE;
- GtkSwitch* _tmp32_;
- gboolean _tmp33_;
- gboolean _tmp34_;
- GtkComboBoxText* _tmp38_;
- gchar* _tmp39_;
- gchar* _tmp40_;
- gboolean _tmp41_;
+ gint _tmp25_;
+ gboolean _tmp26_ = FALSE;
+ GtkSwitch* _tmp27_;
+ gboolean _tmp28_;
+ gboolean _tmp29_;
+ GtkComboBoxText* _tmp33_;
+ gchar* _tmp34_;
+ gchar* _tmp35_;
+ gboolean _tmp36_;
ConfigFacade* config = NULL;
+ ConfigFacade* _tmp50_;
+ ConfigFacade* _tmp51_;
+ ExportFormatParameters _tmp52_;
+ ExportFormatMode _tmp53_;
+ ConfigFacade* _tmp54_;
+ ExportFormatParameters _tmp55_;
+ PhotoFileFormat _tmp56_;
ConfigFacade* _tmp57_;
- ConfigFacade* _tmp58_;
- ExportFormatParameters _tmp59_;
- ExportFormatMode _tmp60_;
- ConfigFacade* _tmp61_;
- ExportFormatParameters _tmp62_;
- PhotoFileFormat _tmp63_;
- ConfigFacade* _tmp64_;
- ExportFormatParameters _tmp65_;
- JpegQuality _tmp66_;
- ConfigFacade* _tmp67_;
- ExportFormatParameters _tmp68_;
- gboolean _tmp69_;
- ConfigFacade* _tmp70_;
- ScaleConstraint _tmp71_;
- ConfigFacade* _tmp72_;
- gint _tmp73_;
-#line 200 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp19_ = self->priv->constraint_combo;
+ ExportFormatParameters _tmp58_;
+ JpegQuality _tmp59_;
+ ConfigFacade* _tmp60_;
+ ExportFormatParameters _tmp61_;
+ gboolean _tmp62_;
+ ConfigFacade* _tmp63_;
+ ScaleConstraint _tmp64_;
+ ConfigFacade* _tmp65_;
+ gint _tmp66_;
#line 200 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp20_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_combo_box_get_type (), GtkComboBox));
+ _tmp16_ = self->priv->constraint_combo;
#line 200 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- index = _tmp20_;
+ index = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox));
#line 201 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp21_ = index;
+ _tmp17_ = index;
#line 201 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _vala_assert (_tmp21_ >= 0, "index >= 0");
+ _vala_assert (_tmp17_ >= 0, "index >= 0");
#line 202 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp22_ = index;
+ _tmp18_ = index;
#line 202 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp23_ = EXPORT_DIALOG_CONSTRAINT_ARRAY[_tmp22_];
+ _tmp19_ = EXPORT_DIALOG_CONSTRAINT_ARRAY[_tmp18_];
#line 202 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _vala_constraint = _tmp23_;
+ _vala_constraint = _tmp19_;
#line 203 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp24_ = _vala_constraint;
+ _tmp20_ = _vala_constraint;
#line 203 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_current_constraint = _tmp24_;
+ export_dialog_current_constraint = _tmp20_;
#line 205 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp25_ = self->priv->pixels_entry;
+ _tmp21_ = self->priv->pixels_entry;
#line 205 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp26_ = gtk_entry_get_text (_tmp25_);
+ _tmp22_ = gtk_entry_get_text (_tmp21_);
#line 205 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp27_ = atoi (_tmp26_);
-#line 205 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _vala_scale = _tmp27_;
+ _vala_scale = atoi (_tmp22_);
#line 206 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp28_ = _vala_constraint;
+ _tmp23_ = _vala_constraint;
#line 206 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (_tmp28_ != SCALE_CONSTRAINT_ORIGINAL) {
-#line 1218 "ExportDialog.c"
- gint _tmp29_;
+ if (_tmp23_ != SCALE_CONSTRAINT_ORIGINAL) {
+#line 1244 "ExportDialog.c"
+ gint _tmp24_;
#line 207 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp29_ = _vala_scale;
+ _tmp24_ = _vala_scale;
#line 207 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _vala_assert (_tmp29_ > 0, "scale > 0");
-#line 1224 "ExportDialog.c"
+ _vala_assert (_tmp24_ > 0, "scale > 0");
+#line 1250 "ExportDialog.c"
}
#line 208 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp30_ = _vala_scale;
+ _tmp25_ = _vala_scale;
#line 208 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_current_scale = _tmp30_;
+ export_dialog_current_scale = _tmp25_;
#line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp32_ = self->priv->export_metadata;
+ _tmp27_ = self->priv->export_metadata;
#line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp33_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget));
+ _tmp28_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget));
#line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp34_ = _tmp33_;
+ _tmp29_ = _tmp28_;
#line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (_tmp34_) {
-#line 1238 "ExportDialog.c"
- GtkSwitch* _tmp35_;
- gboolean _tmp36_;
- gboolean _tmp37_;
+ if (_tmp29_) {
+#line 1264 "ExportDialog.c"
+ GtkSwitch* _tmp30_;
+ gboolean _tmp31_;
+ gboolean _tmp32_;
#line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp35_ = self->priv->export_metadata;
+ _tmp30_ = self->priv->export_metadata;
#line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp36_ = gtk_switch_get_active (_tmp35_);
+ _tmp31_ = gtk_switch_get_active (_tmp30_);
#line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp37_ = _tmp36_;
+ _tmp32_ = _tmp31_;
#line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp31_ = _tmp37_;
-#line 1250 "ExportDialog.c"
+ _tmp26_ = _tmp32_;
+#line 1276 "ExportDialog.c"
} else {
#line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp31_ = FALSE;
-#line 1254 "ExportDialog.c"
+ _tmp26_ = FALSE;
+#line 1280 "ExportDialog.c"
}
#line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- (*parameters).export_metadata = _tmp31_;
+ (*parameters).export_metadata = _tmp26_;
#line 212 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp38_ = self->priv->format_combo;
+ _tmp33_ = self->priv->format_combo;
#line 212 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp39_ = gtk_combo_box_text_get_active_text (_tmp38_);
+ _tmp34_ = gtk_combo_box_text_get_active_text (_tmp33_);
#line 212 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp40_ = _tmp39_;
+ _tmp35_ = _tmp34_;
#line 212 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp41_ = g_strcmp0 (_tmp40_, EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL) == 0;
+ _tmp36_ = g_strcmp0 (_tmp35_, EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL) == 0;
#line 212 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _g_free0 (_tmp40_);
+ _g_free0 (_tmp35_);
#line 212 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (_tmp41_) {
-#line 1270 "ExportDialog.c"
- ExportFormatMode _tmp42_;
+ if (_tmp36_) {
+#line 1296 "ExportDialog.c"
+ ExportFormatMode _tmp37_;
#line 213 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_UNMODIFIED;
#line 213 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp42_ = export_dialog_current_parameters.mode;
+ _tmp37_ = export_dialog_current_parameters.mode;
#line 213 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- (*parameters).mode = _tmp42_;
-#line 1278 "ExportDialog.c"
+ (*parameters).mode = _tmp37_;
+#line 1304 "ExportDialog.c"
} else {
- GtkComboBoxText* _tmp43_;
- gchar* _tmp44_;
- gchar* _tmp45_;
- gboolean _tmp46_;
+ GtkComboBoxText* _tmp38_;
+ gchar* _tmp39_;
+ gchar* _tmp40_;
+ gboolean _tmp41_;
#line 214 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp43_ = self->priv->format_combo;
+ _tmp38_ = self->priv->format_combo;
#line 214 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp44_ = gtk_combo_box_text_get_active_text (_tmp43_);
+ _tmp39_ = gtk_combo_box_text_get_active_text (_tmp38_);
#line 214 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp45_ = _tmp44_;
+ _tmp40_ = _tmp39_;
#line 214 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp46_ = g_strcmp0 (_tmp45_, EXPORT_DIALOG_CURRENT_FORMAT_LABEL) == 0;
+ _tmp41_ = g_strcmp0 (_tmp40_, EXPORT_DIALOG_CURRENT_FORMAT_LABEL) == 0;
#line 214 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _g_free0 (_tmp45_);
+ _g_free0 (_tmp40_);
#line 214 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (_tmp46_) {
-#line 1296 "ExportDialog.c"
- ExportFormatMode _tmp47_;
+ if (_tmp41_) {
+#line 1322 "ExportDialog.c"
+ ExportFormatMode _tmp42_;
#line 215 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_CURRENT;
#line 215 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp47_ = export_dialog_current_parameters.mode;
+ _tmp42_ = export_dialog_current_parameters.mode;
#line 215 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- (*parameters).mode = _tmp47_;
-#line 1304 "ExportDialog.c"
+ (*parameters).mode = _tmp42_;
+#line 1330 "ExportDialog.c"
} else {
- ExportFormatMode _tmp48_;
- PhotoFileFormat _tmp49_;
- PhotoFileFormat _tmp50_;
- ExportFormatParameters _tmp51_;
- PhotoFileFormat _tmp52_;
+ ExportFormatMode _tmp43_;
+ PhotoFileFormat _tmp44_;
+ ExportFormatParameters _tmp45_;
+ PhotoFileFormat _tmp46_;
#line 217 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_SPECIFIED;
#line 217 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp48_ = export_dialog_current_parameters.mode;
+ _tmp43_ = export_dialog_current_parameters.mode;
#line 217 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- (*parameters).mode = _tmp48_;
-#line 218 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp49_ = export_dialog_get_specified_format (self);
+ (*parameters).mode = _tmp43_;
#line 218 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_current_parameters.specified_format = _tmp49_;
+ export_dialog_current_parameters.specified_format = export_dialog_get_specified_format (self);
#line 218 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp50_ = export_dialog_current_parameters.specified_format;
+ _tmp44_ = export_dialog_current_parameters.specified_format;
#line 218 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- (*parameters).specified_format = _tmp50_;
+ (*parameters).specified_format = _tmp44_;
#line 219 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp51_ = export_dialog_current_parameters;
+ _tmp45_ = export_dialog_current_parameters;
#line 219 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp52_ = _tmp51_.specified_format;
+ _tmp46_ = _tmp45_.specified_format;
#line 219 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (_tmp52_ == PHOTO_FILE_FORMAT_JFIF) {
-#line 1331 "ExportDialog.c"
- GtkComboBoxText* _tmp53_;
- gint _tmp54_;
- JpegQuality _tmp55_;
- JpegQuality _tmp56_;
+ if (_tmp46_ == PHOTO_FILE_FORMAT_JFIF) {
+#line 1354 "ExportDialog.c"
+ GtkComboBoxText* _tmp47_;
+ JpegQuality _tmp48_;
+ JpegQuality _tmp49_;
#line 220 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp53_ = self->priv->quality_combo;
+ _tmp47_ = self->priv->quality_combo;
#line 220 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp54_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_combo_box_get_type (), GtkComboBox));
+ _tmp48_ = EXPORT_DIALOG_QUALITY_ARRAY[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_combo_box_get_type (), GtkComboBox))];
#line 220 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp55_ = EXPORT_DIALOG_QUALITY_ARRAY[_tmp54_];
+ export_dialog_current_parameters.quality = _tmp48_;
#line 220 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- export_dialog_current_parameters.quality = _tmp55_;
+ _tmp49_ = export_dialog_current_parameters.quality;
#line 220 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp56_ = export_dialog_current_parameters.quality;
-#line 220 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- (*parameters).quality = _tmp56_;
-#line 1348 "ExportDialog.c"
+ (*parameters).quality = _tmp49_;
+#line 1368 "ExportDialog.c"
}
}
}
#line 224 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp57_ = config_facade_get_instance ();
+ _tmp50_ = config_facade_get_instance ();
#line 224 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- config = _tmp57_;
+ config = _tmp50_;
#line 225 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp58_ = config;
+ _tmp51_ = config;
#line 225 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp59_ = export_dialog_current_parameters;
+ _tmp52_ = export_dialog_current_parameters;
#line 225 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp60_ = _tmp59_.mode;
+ _tmp53_ = _tmp52_.mode;
#line 225 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- configuration_facade_set_export_export_format_mode (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp60_);
+ configuration_facade_set_export_export_format_mode (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp53_);
#line 226 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp61_ = config;
+ _tmp54_ = config;
#line 226 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp62_ = export_dialog_current_parameters;
+ _tmp55_ = export_dialog_current_parameters;
#line 226 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp63_ = _tmp62_.specified_format;
+ _tmp56_ = _tmp55_.specified_format;
#line 226 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- configuration_facade_set_export_photo_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp63_);
+ configuration_facade_set_export_photo_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp56_);
#line 227 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp64_ = config;
+ _tmp57_ = config;
#line 227 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp65_ = export_dialog_current_parameters;
+ _tmp58_ = export_dialog_current_parameters;
#line 227 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp66_ = _tmp65_.quality;
+ _tmp59_ = _tmp58_.quality;
#line 227 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- configuration_facade_set_export_quality (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp66_);
+ configuration_facade_set_export_quality (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp59_);
#line 228 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp67_ = config;
+ _tmp60_ = config;
#line 228 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp68_ = export_dialog_current_parameters;
+ _tmp61_ = export_dialog_current_parameters;
#line 228 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp69_ = _tmp68_.export_metadata;
+ _tmp62_ = _tmp61_.export_metadata;
#line 228 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- configuration_facade_set_export_export_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp69_);
+ configuration_facade_set_export_export_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp62_);
#line 229 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp70_ = config;
+ _tmp63_ = config;
#line 229 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp71_ = export_dialog_current_constraint;
+ _tmp64_ = export_dialog_current_constraint;
#line 229 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- configuration_facade_set_export_constraint (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp71_);
+ configuration_facade_set_export_constraint (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp64_);
#line 230 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp72_ = config;
+ _tmp65_ = config;
#line 230 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp73_ = export_dialog_current_scale;
+ _tmp66_ = export_dialog_current_scale;
#line 230 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- configuration_facade_set_export_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp73_);
+ configuration_facade_set_export_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp66_);
#line 199 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_g_object_unref0 (config);
-#line 1402 "ExportDialog.c"
+#line 1422 "ExportDialog.c"
} else {
#line 232 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_vala_scale = 0;
#line 233 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_vala_constraint = SCALE_CONSTRAINT_ORIGINAL;
-#line 1408 "ExportDialog.c"
+#line 1428 "ExportDialog.c"
}
#line 236 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
@@ -1416,32 +1436,34 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
if (scale) {
#line 238 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
*scale = _vala_scale;
-#line 1418 "ExportDialog.c"
+#line 1438 "ExportDialog.c"
}
#line 238 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
if (constraint) {
#line 238 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
*constraint = _vala_constraint;
-#line 1424 "ExportDialog.c"
+#line 1444 "ExportDialog.c"
}
#line 238 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
return result;
-#line 1428 "ExportDialog.c"
+#line 1448 "ExportDialog.c"
}
-static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint x, gint y, GtkWidget* widget) {
+static void
+export_dialog_add_label (ExportDialog* self,
+ const gchar* text,
+ gint x,
+ gint y,
+ GtkWidget* widget)
+{
GtkLabel* new_label = NULL;
- const gchar* _tmp0_;
+ GtkLabel* _tmp0_;
GtkLabel* _tmp1_;
GtkLabel* _tmp2_;
GtkLabel* _tmp3_;
- GtkLabel* _tmp4_;
- GtkWidget* _tmp5_;
- GtkGrid* _tmp8_;
- GtkLabel* _tmp9_;
- gint _tmp10_;
- gint _tmp11_;
+ GtkGrid* _tmp5_;
+ GtkLabel* _tmp6_;
#line 241 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
g_return_if_fail (IS_EXPORT_DIALOG (self));
#line 241 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
@@ -1449,424 +1471,394 @@ static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint
#line 241 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
g_return_if_fail ((widget == NULL) || GTK_IS_WIDGET (widget));
#line 242 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp0_ = text;
-#line 242 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp1_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp0_);
+ _tmp0_ = (GtkLabel*) gtk_label_new_with_mnemonic (text);
#line 242 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- g_object_ref_sink (_tmp1_);
+ g_object_ref_sink (_tmp0_);
#line 242 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- new_label = _tmp1_;
+ new_label = _tmp0_;
#line 243 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp2_ = new_label;
+ _tmp1_ = new_label;
#line 243 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
+ gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
#line 244 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp3_ = new_label;
+ _tmp2_ = new_label;
#line 244 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
#line 245 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp4_ = new_label;
+ _tmp3_ = new_label;
#line 245 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_label_set_use_underline (_tmp4_, TRUE);
+ gtk_label_set_use_underline (_tmp3_, TRUE);
#line 247 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp5_ = widget;
-#line 247 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (_tmp5_ != NULL) {
-#line 1474 "ExportDialog.c"
- GtkLabel* _tmp6_;
- GtkWidget* _tmp7_;
-#line 248 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp6_ = new_label;
+ if (widget != NULL) {
+#line 1492 "ExportDialog.c"
+ GtkLabel* _tmp4_;
#line 248 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp7_ = widget;
+ _tmp4_ = new_label;
#line 248 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_label_set_mnemonic_widget (_tmp6_, _tmp7_);
-#line 1483 "ExportDialog.c"
+ gtk_label_set_mnemonic_widget (_tmp4_, widget);
+#line 1498 "ExportDialog.c"
}
#line 250 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp8_ = self->priv->table;
-#line 250 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp9_ = new_label;
-#line 250 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp10_ = x;
+ _tmp5_ = self->priv->table;
#line 250 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp11_ = y;
+ _tmp6_ = new_label;
#line 250 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_grid_attach (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), _tmp10_, _tmp11_, 1, 1);
+ gtk_grid_attach (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), x, y, 1, 1);
#line 241 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_g_object_unref0 (new_label);
-#line 1497 "ExportDialog.c"
+#line 1508 "ExportDialog.c"
}
-static void export_dialog_add_control (ExportDialog* self, GtkWidget* widget, gint x, gint y) {
- GtkWidget* _tmp0_;
- GtkWidget* _tmp1_;
- GtkWidget* _tmp2_;
- GtkWidget* _tmp3_;
- GtkGrid* _tmp4_;
- GtkWidget* _tmp5_;
- gint _tmp6_;
- gint _tmp7_;
+static void
+export_dialog_add_control (ExportDialog* self,
+ GtkWidget* widget,
+ gint x,
+ gint y)
+{
+ GtkGrid* _tmp0_;
#line 253 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
g_return_if_fail (IS_EXPORT_DIALOG (self));
#line 253 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
g_return_if_fail (GTK_IS_WIDGET (widget));
#line 254 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp0_ = widget;
-#line 254 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_halign (_tmp0_, GTK_ALIGN_FILL);
-#line 255 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp1_ = widget;
+ gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
#line 255 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_valign (_tmp1_, GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
#line 256 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp2_ = widget;
-#line 256 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_hexpand (_tmp2_, TRUE);
-#line 257 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp3_ = widget;
+ gtk_widget_set_hexpand (widget, TRUE);
#line 257 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_vexpand (_tmp3_, TRUE);
+ gtk_widget_set_vexpand (widget, TRUE);
#line 259 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp4_ = self->priv->table;
+ _tmp0_ = self->priv->table;
#line 259 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp5_ = widget;
-#line 259 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp6_ = x;
-#line 259 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp7_ = y;
-#line 259 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_grid_attach (_tmp4_, _tmp5_, _tmp6_, _tmp7_, 1, 1);
-#line 1540 "ExportDialog.c"
+ gtk_grid_attach (_tmp0_, widget, x, y, 1, 1);
+#line 1535 "ExportDialog.c"
}
-static void export_dialog_on_constraint_changed (ExportDialog* self) {
+static void
+export_dialog_on_constraint_changed (ExportDialog* self)
+{
gboolean original = FALSE;
GtkComboBoxText* _tmp0_;
- gint _tmp1_;
- ScaleConstraint _tmp2_;
+ ScaleConstraint _tmp1_;
gboolean jpeg = FALSE;
- GtkComboBoxText* _tmp3_;
+ GtkComboBoxText* _tmp2_;
+ gchar* _tmp3_;
gchar* _tmp4_;
- gchar* _tmp5_;
+ PhotoFileFormatProperties* _tmp5_;
PhotoFileFormatProperties* _tmp6_;
- PhotoFileFormatProperties* _tmp7_;
+ gchar* _tmp7_;
gchar* _tmp8_;
- gchar* _tmp9_;
- gboolean _tmp10_;
- GtkEntry* _tmp11_;
- gboolean _tmp12_;
- gboolean _tmp13_ = FALSE;
- gboolean _tmp14_;
- GtkComboBoxText* _tmp16_;
- gboolean _tmp17_;
+ gboolean _tmp9_;
+ GtkEntry* _tmp10_;
+ gboolean _tmp11_;
+ gboolean _tmp12_ = FALSE;
+ gboolean _tmp13_;
+ GtkComboBoxText* _tmp15_;
+ gboolean _tmp16_;
#line 262 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
g_return_if_fail (IS_EXPORT_DIALOG (self));
#line 263 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_tmp0_ = self->priv->constraint_combo;
#line 263 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 263 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp2_ = EXPORT_DIALOG_CONSTRAINT_ARRAY[_tmp1_];
+ _tmp1_ = EXPORT_DIALOG_CONSTRAINT_ARRAY[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox))];
#line 263 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- original = _tmp2_ == SCALE_CONSTRAINT_ORIGINAL;
+ original = _tmp1_ == SCALE_CONSTRAINT_ORIGINAL;
#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp3_ = self->priv->format_combo;
+ _tmp2_ = self->priv->format_combo;
#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp4_ = gtk_combo_box_text_get_active_text (_tmp3_);
+ _tmp3_ = gtk_combo_box_text_get_active_text (_tmp2_);
#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp6_ = photo_file_format_get_properties (PHOTO_FILE_FORMAT_JFIF);
+ _tmp5_ = photo_file_format_get_properties (PHOTO_FILE_FORMAT_JFIF);
#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp8_ = photo_file_format_properties_get_user_visible_name (_tmp7_);
+ _tmp7_ = photo_file_format_properties_get_user_visible_name (_tmp6_);
#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp10_ = g_strcmp0 (_tmp5_, _tmp9_) == 0;
+ _tmp9_ = g_strcmp0 (_tmp4_, _tmp8_) == 0;
#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp8_);
#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _photo_file_format_properties_unref0 (_tmp7_);
+ _photo_file_format_properties_unref0 (_tmp6_);
#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _g_free0 (_tmp5_);
+ _g_free0 (_tmp4_);
#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- jpeg = _tmp10_;
+ jpeg = _tmp9_;
#line 266 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp11_ = self->priv->pixels_entry;
+ _tmp10_ = self->priv->pixels_entry;
#line 266 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp12_ = original;
+ _tmp11_ = original;
#line 266 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), !_tmp12_);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), !_tmp11_);
#line 267 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp14_ = original;
+ _tmp13_ = original;
#line 267 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (!_tmp14_) {
-#line 1608 "ExportDialog.c"
- gboolean _tmp15_;
+ if (!_tmp13_) {
+#line 1602 "ExportDialog.c"
+ gboolean _tmp14_;
#line 267 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp15_ = jpeg;
+ _tmp14_ = jpeg;
#line 267 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp13_ = _tmp15_;
-#line 1614 "ExportDialog.c"
+ _tmp12_ = _tmp14_;
+#line 1608 "ExportDialog.c"
} else {
#line 267 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp13_ = FALSE;
-#line 1618 "ExportDialog.c"
+ _tmp12_ = FALSE;
+#line 1612 "ExportDialog.c"
}
#line 267 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp16_ = self->priv->quality_combo;
+ _tmp15_ = self->priv->quality_combo;
#line 267 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), _tmp13_);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), _tmp12_);
#line 268 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp17_ = original;
+ _tmp16_ = original;
#line 268 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (_tmp17_) {
-#line 1628 "ExportDialog.c"
- GtkWidget* _tmp18_;
+ if (_tmp16_) {
+#line 1622 "ExportDialog.c"
+ GtkWidget* _tmp17_;
#line 269 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp18_ = self->priv->ok_button;
+ _tmp17_ = self->priv->ok_button;
#line 269 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_sensitive (_tmp18_, TRUE);
-#line 1634 "ExportDialog.c"
+ gtk_widget_set_sensitive (_tmp17_, TRUE);
+#line 1628 "ExportDialog.c"
} else {
#line 271 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
export_dialog_on_pixels_changed (self);
-#line 1638 "ExportDialog.c"
+#line 1632 "ExportDialog.c"
}
}
-static void export_dialog_on_format_changed (ExportDialog* self) {
+static void
+export_dialog_on_format_changed (ExportDialog* self)
+{
gboolean original = FALSE;
GtkComboBoxText* _tmp0_;
- gint _tmp1_;
- ScaleConstraint _tmp2_;
- GtkComboBoxText* _tmp3_;
+ ScaleConstraint _tmp1_;
+ GtkComboBoxText* _tmp2_;
+ gchar* _tmp3_;
gchar* _tmp4_;
- gchar* _tmp5_;
- gboolean _tmp6_;
+ gboolean _tmp5_;
#line 274 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
g_return_if_fail (IS_EXPORT_DIALOG (self));
#line 275 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_tmp0_ = self->priv->constraint_combo;
#line 275 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
+ _tmp1_ = EXPORT_DIALOG_CONSTRAINT_ARRAY[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox))];
#line 275 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp2_ = EXPORT_DIALOG_CONSTRAINT_ARRAY[_tmp1_];
-#line 275 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- original = _tmp2_ == SCALE_CONSTRAINT_ORIGINAL;
+ original = _tmp1_ == SCALE_CONSTRAINT_ORIGINAL;
#line 277 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp3_ = self->priv->format_combo;
+ _tmp2_ = self->priv->format_combo;
#line 277 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp4_ = gtk_combo_box_text_get_active_text (_tmp3_);
+ _tmp3_ = gtk_combo_box_text_get_active_text (_tmp2_);
#line 277 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 277 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp6_ = g_strcmp0 (_tmp5_, EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL) == 0;
+ _tmp5_ = g_strcmp0 (_tmp4_, EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL) == 0;
#line 277 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _g_free0 (_tmp5_);
+ _g_free0 (_tmp4_);
#line 277 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (_tmp6_) {
-#line 1674 "ExportDialog.c"
+ if (_tmp5_) {
+#line 1667 "ExportDialog.c"
+ GtkComboBoxText* _tmp6_;
GtkComboBoxText* _tmp7_;
GtkComboBoxText* _tmp8_;
- GtkComboBoxText* _tmp9_;
- GtkEntry* _tmp10_;
+ GtkEntry* _tmp9_;
+ GtkSwitch* _tmp10_;
GtkSwitch* _tmp11_;
- GtkSwitch* _tmp12_;
#line 282 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp7_ = self->priv->constraint_combo;
+ _tmp6_ = self->priv->constraint_combo;
#line 282 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0);
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), 0);
#line 283 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp8_ = self->priv->constraint_combo;
+ _tmp7_ = self->priv->constraint_combo;
#line 283 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 284 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp9_ = self->priv->quality_combo;
+ _tmp8_ = self->priv->quality_combo;
#line 284 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 285 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp10_ = self->priv->pixels_entry;
+ _tmp9_ = self->priv->pixels_entry;
#line 285 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 286 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp11_ = self->priv->export_metadata;
+ _tmp10_ = self->priv->export_metadata;
#line 286 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_switch_set_active (_tmp11_, FALSE);
+ gtk_switch_set_active (_tmp10_, FALSE);
#line 287 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp12_ = self->priv->export_metadata;
+ _tmp11_ = self->priv->export_metadata;
#line 287 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1705 "ExportDialog.c"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 1698 "ExportDialog.c"
} else {
- GtkComboBoxText* _tmp13_;
+ GtkComboBoxText* _tmp12_;
+ gchar* _tmp13_;
gchar* _tmp14_;
- gchar* _tmp15_;
- gboolean _tmp16_;
+ gboolean _tmp15_;
#line 288 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp13_ = self->priv->format_combo;
+ _tmp12_ = self->priv->format_combo;
#line 288 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp14_ = gtk_combo_box_text_get_active_text (_tmp13_);
+ _tmp13_ = gtk_combo_box_text_get_active_text (_tmp12_);
#line 288 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp15_ = _tmp14_;
+ _tmp14_ = _tmp13_;
#line 288 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp16_ = g_strcmp0 (_tmp15_, EXPORT_DIALOG_CURRENT_FORMAT_LABEL) == 0;
+ _tmp15_ = g_strcmp0 (_tmp14_, EXPORT_DIALOG_CURRENT_FORMAT_LABEL) == 0;
#line 288 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _g_free0 (_tmp15_);
+ _g_free0 (_tmp14_);
#line 288 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (_tmp16_) {
-#line 1723 "ExportDialog.c"
+ if (_tmp15_) {
+#line 1716 "ExportDialog.c"
+ GtkComboBoxText* _tmp16_;
GtkComboBoxText* _tmp17_;
- GtkComboBoxText* _tmp18_;
- GtkEntry* _tmp19_;
- gboolean _tmp20_;
- GtkSwitch* _tmp21_;
+ GtkEntry* _tmp18_;
+ gboolean _tmp19_;
+ GtkSwitch* _tmp20_;
#line 295 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp17_ = self->priv->constraint_combo;
+ _tmp16_ = self->priv->constraint_combo;
#line 295 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), TRUE);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 296 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp18_ = self->priv->quality_combo;
+ _tmp17_ = self->priv->quality_combo;
#line 296 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 297 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp19_ = self->priv->pixels_entry;
+ _tmp18_ = self->priv->pixels_entry;
#line 297 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp20_ = original;
+ _tmp19_ = original;
#line 297 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), !_tmp20_);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), !_tmp19_);
#line 298 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp21_ = self->priv->export_metadata;
+ _tmp20_ = self->priv->export_metadata;
#line 298 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1747 "ExportDialog.c"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 1740 "ExportDialog.c"
} else {
- GtkComboBoxText* _tmp22_;
+ GtkComboBoxText* _tmp21_;
gboolean jpeg = FALSE;
- PhotoFileFormat _tmp23_;
- gboolean _tmp24_ = FALSE;
- gboolean _tmp25_;
- GtkComboBoxText* _tmp27_;
- GtkSwitch* _tmp28_;
+ gboolean _tmp22_ = FALSE;
+ gboolean _tmp23_;
+ GtkComboBoxText* _tmp25_;
+ GtkSwitch* _tmp26_;
#line 303 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp22_ = self->priv->constraint_combo;
+ _tmp21_ = self->priv->constraint_combo;
#line 303 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 304 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp23_ = export_dialog_get_specified_format (self);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 304 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- jpeg = _tmp23_ == PHOTO_FILE_FORMAT_JFIF;
+ jpeg = export_dialog_get_specified_format (self) == PHOTO_FILE_FORMAT_JFIF;
#line 305 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp25_ = original;
+ _tmp23_ = original;
#line 305 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (!_tmp25_) {
-#line 1768 "ExportDialog.c"
- gboolean _tmp26_;
+ if (!_tmp23_) {
+#line 1758 "ExportDialog.c"
+ gboolean _tmp24_;
#line 305 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp26_ = jpeg;
+ _tmp24_ = jpeg;
#line 305 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp24_ = _tmp26_;
-#line 1774 "ExportDialog.c"
+ _tmp22_ = _tmp24_;
+#line 1764 "ExportDialog.c"
} else {
#line 305 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp24_ = FALSE;
-#line 1778 "ExportDialog.c"
+ _tmp22_ = FALSE;
+#line 1768 "ExportDialog.c"
}
#line 305 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp27_ = self->priv->quality_combo;
+ _tmp25_ = self->priv->quality_combo;
#line 305 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), _tmp24_);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), _tmp22_);
#line 306 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp28_ = self->priv->export_metadata;
+ _tmp26_ = self->priv->export_metadata;
#line 306 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1788 "ExportDialog.c"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 1778 "ExportDialog.c"
}
}
}
-static void export_dialog_on_activate (ExportDialog* self) {
+static void
+export_dialog_on_activate (ExportDialog* self)
+{
#line 310 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
g_return_if_fail (IS_EXPORT_DIALOG (self));
#line 311 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
gtk_dialog_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 1799 "ExportDialog.c"
+#line 1791 "ExportDialog.c"
}
-static void export_dialog_on_pixels_changed (ExportDialog* self) {
+static void
+export_dialog_on_pixels_changed (ExportDialog* self)
+{
gboolean _tmp0_ = FALSE;
GtkEntry* _tmp1_;
- guint16 _tmp2_;
- GtkWidget* _tmp6_;
+ GtkWidget* _tmp4_;
#line 314 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
g_return_if_fail (IS_EXPORT_DIALOG (self));
#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_tmp1_ = self->priv->pixels_entry;
#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp2_ = gtk_entry_get_text_length (_tmp1_);
-#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (((gint) _tmp2_) > 0) {
-#line 1816 "ExportDialog.c"
- GtkEntry* _tmp3_;
- const gchar* _tmp4_;
- gint _tmp5_;
-#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp3_ = self->priv->pixels_entry;
+ if (((gint) gtk_entry_get_text_length (_tmp1_)) > 0) {
+#line 1807 "ExportDialog.c"
+ GtkEntry* _tmp2_;
+ const gchar* _tmp3_;
#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp4_ = gtk_entry_get_text (_tmp3_);
+ _tmp2_ = self->priv->pixels_entry;
#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp5_ = atoi (_tmp4_);
+ _tmp3_ = gtk_entry_get_text (_tmp2_);
#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp0_ = _tmp5_ > 0;
-#line 1828 "ExportDialog.c"
+ _tmp0_ = atoi (_tmp3_) > 0;
+#line 1816 "ExportDialog.c"
} else {
#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_tmp0_ = FALSE;
-#line 1832 "ExportDialog.c"
+#line 1820 "ExportDialog.c"
}
#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp6_ = self->priv->ok_button;
+ _tmp4_ = self->priv->ok_button;
#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_widget_set_sensitive (_tmp6_, _tmp0_);
-#line 1838 "ExportDialog.c"
+ gtk_widget_set_sensitive (_tmp4_, _tmp0_);
+#line 1826 "ExportDialog.c"
}
-static gchar string_get (const gchar* self, glong index) {
+static gchar
+string_get (const gchar* self,
+ glong index)
+{
gchar result = '\0';
- glong _tmp0_;
- gchar _tmp1_;
-#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar _tmp0_;
+#line 1124 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = index;
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp1_;
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = ((gchar*) self)[index];
+#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp0_;
+#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 1856 "ExportDialog.c"
+#line 1844 "ExportDialog.c"
}
-static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar* text, gint length, gint* position) {
+static void
+export_dialog_on_pixels_insert_text (ExportDialog* self,
+ const gchar* text,
+ gint length,
+ gint* position)
+{
gboolean _tmp0_;
- gint _tmp1_;
gchar* new_text = NULL;
- gchar* _tmp5_;
- const gchar* _tmp21_;
- gint _tmp22_;
- gint _tmp23_;
- GtkEntry* _tmp29_;
+ gchar* _tmp3_;
+ const gchar* _tmp13_;
+ gint _tmp14_;
+ gint _tmp15_;
+ GtkEntry* _tmp21_;
#line 318 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
g_return_if_fail (IS_EXPORT_DIALOG (self));
#line 318 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
@@ -1877,157 +1869,136 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
if (_tmp0_) {
#line 321 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
return;
-#line 1879 "ExportDialog.c"
+#line 1871 "ExportDialog.c"
}
#line 323 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
self->priv->in_insert = TRUE;
#line 325 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp1_ = length;
-#line 325 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (_tmp1_ == -1) {
-#line 1887 "ExportDialog.c"
- const gchar* _tmp2_;
- gint _tmp3_;
- gint _tmp4_;
+ if (length == -1) {
+#line 1877 "ExportDialog.c"
+ gint _tmp1_;
+ gint _tmp2_;
#line 326 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp2_ = text;
+ _tmp1_ = strlen (text);
#line 326 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp3_ = strlen (_tmp2_);
+ _tmp2_ = _tmp1_;
#line 326 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp4_ = _tmp3_;
-#line 326 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- length = (gint) _tmp4_;
-#line 1899 "ExportDialog.c"
+ length = (gint) _tmp2_;
+#line 1886 "ExportDialog.c"
}
#line 329 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp5_ = g_strdup ("");
+ _tmp3_ = g_strdup ("");
#line 329 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- new_text = _tmp5_;
-#line 1905 "ExportDialog.c"
+ new_text = _tmp3_;
+#line 1892 "ExportDialog.c"
{
gint ctr = 0;
#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
ctr = 0;
-#line 1910 "ExportDialog.c"
+#line 1897 "ExportDialog.c"
{
- gboolean _tmp6_ = FALSE;
+ gboolean _tmp4_ = FALSE;
#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp6_ = TRUE;
+ _tmp4_ = TRUE;
#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
while (TRUE) {
-#line 1917 "ExportDialog.c"
- gint _tmp8_;
- gint _tmp9_;
- const gchar* _tmp10_;
- gint _tmp11_;
- gchar _tmp12_;
- gboolean _tmp13_;
+#line 1904 "ExportDialog.c"
+ gint _tmp6_;
+ gint _tmp7_;
#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (!_tmp6_) {
-#line 1926 "ExportDialog.c"
- gint _tmp7_;
+ if (!_tmp4_) {
+#line 1909 "ExportDialog.c"
+ gint _tmp5_;
#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp7_ = ctr;
+ _tmp5_ = ctr;
#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- ctr = _tmp7_ + 1;
-#line 1932 "ExportDialog.c"
+ ctr = _tmp5_ + 1;
+#line 1915 "ExportDialog.c"
}
#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp6_ = FALSE;
-#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp8_ = ctr;
+ _tmp4_ = FALSE;
#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp9_ = length;
+ _tmp6_ = ctr;
#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (!(_tmp8_ < _tmp9_)) {
+ if (!(_tmp6_ < length)) {
#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
break;
-#line 1944 "ExportDialog.c"
+#line 1925 "ExportDialog.c"
}
#line 331 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp10_ = text;
-#line 331 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp11_ = ctr;
-#line 331 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp12_ = string_get (_tmp10_, (glong) _tmp11_);
+ _tmp7_ = ctr;
#line 331 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp13_ = g_ascii_isdigit (_tmp12_);
-#line 331 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (_tmp13_) {
-#line 1956 "ExportDialog.c"
- const gchar* _tmp14_;
- const gchar* _tmp15_;
- gint _tmp16_;
- gchar _tmp17_;
- gchar* _tmp18_;
- gchar* _tmp19_;
- gchar* _tmp20_;
-#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp14_ = new_text;
-#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp15_ = text;
+ if (g_ascii_isdigit (string_get (text, (glong) _tmp7_))) {
+#line 1931 "ExportDialog.c"
+ const gchar* _tmp8_;
+ gint _tmp9_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ gchar* _tmp12_;
#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp16_ = ctr;
+ _tmp8_ = new_text;
#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp17_ = string_get (_tmp15_, (glong) _tmp16_);
+ _tmp9_ = ctr;
#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp18_ = g_strdup_printf ("%c", (gchar) _tmp17_);
+ _tmp10_ = g_strdup_printf ("%c", (gchar) string_get (text, (glong) _tmp9_));
#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp19_ = _tmp18_;
+ _tmp11_ = _tmp10_;
#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp20_ = g_strconcat (_tmp14_, _tmp19_, NULL);
+ _tmp12_ = g_strconcat (_tmp8_, _tmp11_, NULL);
#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_g_free0 (new_text);
#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- new_text = _tmp20_;
+ new_text = _tmp12_;
#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _g_free0 (_tmp19_);
-#line 1984 "ExportDialog.c"
+ _g_free0 (_tmp11_);
+#line 1953 "ExportDialog.c"
}
}
}
}
#line 336 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp21_ = new_text;
+ _tmp13_ = new_text;
#line 336 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp22_ = strlen (_tmp21_);
+ _tmp14_ = strlen (_tmp13_);
#line 336 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp23_ = _tmp22_;
+ _tmp15_ = _tmp14_;
#line 336 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- if (_tmp23_ > 0) {
-#line 1997 "ExportDialog.c"
- GtkEntry* _tmp24_;
- const gchar* _tmp25_;
- const gchar* _tmp26_;
- gint _tmp27_;
- gint _tmp28_;
+ if (_tmp15_ > 0) {
+#line 1966 "ExportDialog.c"
+ GtkEntry* _tmp16_;
+ const gchar* _tmp17_;
+ const gchar* _tmp18_;
+ gint _tmp19_;
+ gint _tmp20_;
#line 337 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp24_ = self->priv->pixels_entry;
+ _tmp16_ = self->priv->pixels_entry;
#line 337 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp25_ = new_text;
+ _tmp17_ = new_text;
#line 337 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp26_ = new_text;
+ _tmp18_ = new_text;
#line 337 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp27_ = strlen (_tmp26_);
+ _tmp19_ = strlen (_tmp18_);
#line 337 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp28_ = _tmp27_;
+ _tmp20_ = _tmp19_;
#line 337 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), _tmp25_, (gint) _tmp28_, position);
-#line 2015 "ExportDialog.c"
+ g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_editable_get_type (), GtkEditable), "insert-text", _tmp17_, (gint) _tmp20_, position);
+#line 1984 "ExportDialog.c"
}
#line 339 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- _tmp29_ = self->priv->pixels_entry;
+ _tmp21_ = self->priv->pixels_entry;
#line 339 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
- g_signal_stop_emission_by_name (_tmp29_, "insert-text");
+ g_signal_stop_emission_by_name (_tmp21_, "insert-text");
#line 341 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
self->priv->in_insert = FALSE;
#line 318 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
_g_free0 (new_text);
-#line 2025 "ExportDialog.c"
+#line 1994 "ExportDialog.c"
}
-static void export_dialog_class_init (ExportDialogClass * klass) {
+static void
+export_dialog_class_init (ExportDialogClass * klass)
+{
ExportFormatParameters _tmp0_ = {0};
#line 8 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
export_dialog_parent_class = g_type_class_peek_parent (klass);
@@ -2041,11 +2012,13 @@ static void export_dialog_class_init (ExportDialogClass * klass) {
export_dialog_current_parameters = _tmp0_;
#line 26 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
export_dialog_current_scale = EXPORT_DIALOG_DEFAULT_SCALE;
-#line 2043 "ExportDialog.c"
+#line 2014 "ExportDialog.c"
}
-static void export_dialog_instance_init (ExportDialog * self) {
+static void
+export_dialog_instance_init (ExportDialog * self)
+{
GtkGrid* _tmp0_;
GeeArrayList* _tmp1_;
#line 8 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
@@ -2062,11 +2035,13 @@ static void export_dialog_instance_init (ExportDialog * self) {
self->priv->format_options = _tmp1_;
#line 36 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
self->priv->in_insert = FALSE;
-#line 2064 "ExportDialog.c"
+#line 2037 "ExportDialog.c"
}
-static void export_dialog_finalize (GObject * obj) {
+static void
+export_dialog_finalize (GObject * obj)
+{
ExportDialog * self;
#line 8 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXPORT_DIALOG, ExportDialog);
@@ -2088,11 +2063,13 @@ static void export_dialog_finalize (GObject * obj) {
_g_object_unref0 (self->priv->ok_button);
#line 8 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
G_OBJECT_CLASS (export_dialog_parent_class)->finalize (obj);
-#line 2090 "ExportDialog.c"
+#line 2065 "ExportDialog.c"
}
-GType export_dialog_get_type (void) {
+GType
+export_dialog_get_type (void)
+{
static volatile gsize export_dialog_type_id__volatile = 0;
if (g_once_init_enter (&export_dialog_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ExportDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) export_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ExportDialog), 0, (GInstanceInitFunc) export_dialog_instance_init, NULL };
diff --git a/src/dialogs/MultiTextEntryDialog.c b/src/dialogs/MultiTextEntryDialog.c
index 7e682a6..e33e415 100644
--- a/src/dialogs/MultiTextEntryDialog.c
+++ b/src/dialogs/MultiTextEntryDialog.c
@@ -1,4 +1,4 @@
-/* MultiTextEntryDialog.c generated by valac 0.36.6, the Vala compiler
+/* MultiTextEntryDialog.c generated by valac 0.40.4, the Vala compiler
* generated from MultiTextEntryDialog.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8,6 +8,7 @@
* See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
@@ -25,6 +26,11 @@
typedef struct _MultiTextEntryDialog MultiTextEntryDialog;
typedef struct _MultiTextEntryDialogClass MultiTextEntryDialogClass;
typedef struct _MultiTextEntryDialogPrivate MultiTextEntryDialogPrivate;
+enum {
+ MULTI_TEXT_ENTRY_DIALOG_0_PROPERTY,
+ MULTI_TEXT_ENTRY_DIALOG_NUM_PROPERTIES
+};
+static GParamSpec* multi_text_entry_dialog_properties[MULTI_TEXT_ENTRY_DIALOG_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define TYPE_PAGE_WINDOW (page_window_get_type ())
@@ -69,13 +75,15 @@ static gpointer multi_text_entry_dialog_parent_class = NULL;
GType multi_text_entry_dialog_get_type (void) G_GNUC_CONST;
#define MULTI_TEXT_ENTRY_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MULTI_TEXT_ENTRY_DIALOG, MultiTextEntryDialogPrivate))
-enum {
- MULTI_TEXT_ENTRY_DIALOG_DUMMY_PROPERTY
-};
MultiTextEntryDialog* multi_text_entry_dialog_new (void);
MultiTextEntryDialog* multi_text_entry_dialog_construct (GType object_type);
gint resources_use_header_bar (void);
-void multi_text_entry_dialog_setup (MultiTextEntryDialog* self, MultiTextEntryDialogOnModifyValidateType modify_validate, void* modify_validate_target, const gchar* title, const gchar* label, const gchar* initial_text);
+void multi_text_entry_dialog_setup (MultiTextEntryDialog* self,
+ MultiTextEntryDialogOnModifyValidateType modify_validate,
+ void* modify_validate_target,
+ const gchar* title,
+ const gchar* label,
+ const gchar* initial_text);
GType page_window_get_type (void) G_GNUC_CONST;
GType app_window_get_type (void) G_GNUC_CONST;
AppWindow* app_window_get_instance (void);
@@ -83,41 +91,45 @@ gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self);
static void multi_text_entry_dialog_finalize (GObject * obj);
-MultiTextEntryDialog* multi_text_entry_dialog_construct (GType object_type) {
+MultiTextEntryDialog*
+multi_text_entry_dialog_construct (GType object_type)
+{
MultiTextEntryDialog * self = NULL;
- gint _tmp0_;
-#line 17 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp0_ = resources_use_header_bar ();
#line 17 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- self = (MultiTextEntryDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
+ self = (MultiTextEntryDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL);
#line 16 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
return self;
-#line 96 "MultiTextEntryDialog.c"
+#line 103 "MultiTextEntryDialog.c"
}
-MultiTextEntryDialog* multi_text_entry_dialog_new (void) {
+MultiTextEntryDialog*
+multi_text_entry_dialog_new (void)
+{
#line 16 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
return multi_text_entry_dialog_construct (TYPE_MULTI_TEXT_ENTRY_DIALOG);
-#line 103 "MultiTextEntryDialog.c"
+#line 112 "MultiTextEntryDialog.c"
}
-void multi_text_entry_dialog_setup (MultiTextEntryDialog* self, MultiTextEntryDialogOnModifyValidateType modify_validate, void* modify_validate_target, const gchar* title, const gchar* label, const gchar* initial_text) {
- const gchar* _tmp0_;
+void
+multi_text_entry_dialog_setup (MultiTextEntryDialog* self,
+ MultiTextEntryDialogOnModifyValidateType modify_validate,
+ void* modify_validate_target,
+ const gchar* title,
+ const gchar* label,
+ const gchar* initial_text)
+{
+ AppWindow* _tmp0_;
AppWindow* _tmp1_;
- AppWindow* _tmp2_;
- GdkWindow* _tmp3_;
+ GdkWindow* _tmp2_;
+ AppWindow* _tmp3_;
AppWindow* _tmp4_;
- AppWindow* _tmp5_;
- MultiTextEntryDialogOnModifyValidateType _tmp6_;
- void* _tmp6__target;
- const gchar* _tmp7_ = NULL;
- const gchar* _tmp8_;
- GtkTextView* _tmp10_;
- GtkTextBuffer* _tmp11_;
- GtkTextBuffer* _tmp12_;
- GtkTextView* _tmp13_;
+ const gchar* _tmp5_ = NULL;
+ GtkTextView* _tmp6_;
+ GtkTextBuffer* _tmp7_;
+ GtkTextBuffer* _tmp8_;
+ GtkTextView* _tmp9_;
#line 20 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
g_return_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self));
#line 20 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
@@ -125,71 +137,60 @@ void multi_text_entry_dialog_setup (MultiTextEntryDialog* self, MultiTextEntryDi
#line 20 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
g_return_if_fail (label != NULL);
#line 21 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp0_ = title;
-#line 21 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_);
+ gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), title);
#line 22 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp1_ = app_window_get_instance ();
+ _tmp0_ = app_window_get_instance ();
#line 22 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 22 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
+ _tmp2_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
#line 22 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp3_);
+ gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp2_);
#line 22 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _g_object_unref0 (_tmp2_);
+ _g_object_unref0 (_tmp1_);
#line 23 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp4_ = app_window_get_instance ();
+ _tmp3_ = app_window_get_instance ();
#line 23 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 23 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
+ gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow));
#line 23 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _g_object_unref0 (_tmp5_);
-#line 24 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp6_ = modify_validate;
-#line 24 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp6__target = modify_validate_target;
+ _g_object_unref0 (_tmp4_);
#line 24 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- self->priv->on_modify_validate = _tmp6_;
+ self->priv->on_modify_validate = modify_validate;
#line 24 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- self->priv->on_modify_validate_target = _tmp6__target;
+ self->priv->on_modify_validate_target = modify_validate_target;
#line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp8_ = initial_text;
+ if (initial_text != NULL) {
#line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- if (_tmp8_ != NULL) {
-#line 162 "MultiTextEntryDialog.c"
- const gchar* _tmp9_;
-#line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp9_ = initial_text;
-#line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp7_ = _tmp9_;
+ _tmp5_ = initial_text;
#line 168 "MultiTextEntryDialog.c"
} else {
#line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp7_ = "";
+ _tmp5_ = "";
#line 172 "MultiTextEntryDialog.c"
}
#line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp10_ = self->priv->entry;
+ _tmp6_ = self->priv->entry;
#line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp11_ = gtk_text_view_get_buffer (_tmp10_);
+ _tmp7_ = gtk_text_view_get_buffer (_tmp6_);
#line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp12_ = _tmp11_;
+ _tmp8_ = _tmp7_;
#line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- g_object_set (_tmp12_, "text", _tmp7_, NULL);
+ g_object_set (_tmp8_, "text", _tmp5_, NULL);
#line 28 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp13_ = self->priv->entry;
+ _tmp9_ = self->priv->entry;
#line 28 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
+ gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
#line 186 "MultiTextEntryDialog.c"
}
-gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self) {
+gchar*
+multi_text_entry_dialog_execute (MultiTextEntryDialog* self)
+{
gchar* result = NULL;
gchar* text = NULL;
- gint _tmp0_;
#line 31 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
g_return_val_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self), NULL);
#line 32 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
@@ -197,30 +198,28 @@ gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self) {
#line 34 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 36 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 36 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 204 "MultiTextEntryDialog.c"
- GtkTextView* _tmp1_;
+ if (gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)) == ((gint) GTK_RESPONSE_OK)) {
+#line 203 "MultiTextEntryDialog.c"
+ GtkTextView* _tmp0_;
+ GtkTextBuffer* _tmp1_;
GtkTextBuffer* _tmp2_;
- GtkTextBuffer* _tmp3_;
+ gchar* _tmp3_;
gchar* _tmp4_;
- gchar* _tmp5_;
#line 37 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp1_ = self->priv->entry;
+ _tmp0_ = self->priv->entry;
#line 37 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp2_ = gtk_text_view_get_buffer (_tmp1_);
+ _tmp1_ = gtk_text_view_get_buffer (_tmp0_);
#line 37 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 37 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- g_object_get (_tmp3_, "text", &_tmp4_, NULL);
+ g_object_get (_tmp2_, "text", &_tmp3_, NULL);
#line 37 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 37 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
_g_free0 (text);
#line 37 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
- text = _tmp5_;
-#line 224 "MultiTextEntryDialog.c"
+ text = _tmp4_;
+#line 223 "MultiTextEntryDialog.c"
}
#line 39 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
@@ -228,11 +227,13 @@ gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self) {
result = text;
#line 41 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
return result;
-#line 232 "MultiTextEntryDialog.c"
+#line 231 "MultiTextEntryDialog.c"
}
-static void multi_text_entry_dialog_class_init (MultiTextEntryDialogClass * klass) {
+static void
+multi_text_entry_dialog_class_init (MultiTextEntryDialogClass * klass)
+{
gint MultiTextEntryDialog_private_offset;
#line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
multi_text_entry_dialog_parent_class = g_type_class_peek_parent (klass);
@@ -246,20 +247,24 @@ static void multi_text_entry_dialog_class_init (MultiTextEntryDialogClass * klas
gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/Shotwell/ui/multitextentrydialog.ui");
#line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "entry", FALSE, MultiTextEntryDialog_private_offset + G_STRUCT_OFFSET (MultiTextEntryDialogPrivate, entry));
-#line 250 "MultiTextEntryDialog.c"
+#line 251 "MultiTextEntryDialog.c"
}
-static void multi_text_entry_dialog_instance_init (MultiTextEntryDialog * self) {
+static void
+multi_text_entry_dialog_instance_init (MultiTextEntryDialog * self)
+{
#line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
self->priv = MULTI_TEXT_ENTRY_DIALOG_GET_PRIVATE (self);
#line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
gtk_widget_init_template (GTK_WIDGET (self));
-#line 259 "MultiTextEntryDialog.c"
+#line 262 "MultiTextEntryDialog.c"
}
-static void multi_text_entry_dialog_finalize (GObject * obj) {
+static void
+multi_text_entry_dialog_finalize (GObject * obj)
+{
MultiTextEntryDialog * self;
#line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTI_TEXT_ENTRY_DIALOG, MultiTextEntryDialog);
@@ -267,11 +272,13 @@ static void multi_text_entry_dialog_finalize (GObject * obj) {
_g_object_unref0 (self->priv->entry);
#line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
G_OBJECT_CLASS (multi_text_entry_dialog_parent_class)->finalize (obj);
-#line 271 "MultiTextEntryDialog.c"
+#line 276 "MultiTextEntryDialog.c"
}
-GType multi_text_entry_dialog_get_type (void) {
+GType
+multi_text_entry_dialog_get_type (void)
+{
static volatile gsize multi_text_entry_dialog_type_id__volatile = 0;
if (g_once_init_enter (&multi_text_entry_dialog_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (MultiTextEntryDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) multi_text_entry_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MultiTextEntryDialog), 0, (GInstanceInitFunc) multi_text_entry_dialog_instance_init, NULL };
diff --git a/src/dialogs/Preferences.c b/src/dialogs/Preferences.c
index 855b11d..7a77423 100644
--- a/src/dialogs/Preferences.c
+++ b/src/dialogs/Preferences.c
@@ -1,4 +1,4 @@
-/* Preferences.c generated by valac 0.36.6, the Vala compiler
+/* Preferences.c generated by valac 0.40.4, the Vala compiler
* generated from Preferences.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8,6 +8,7 @@
* See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
@@ -63,6 +64,11 @@ typedef struct _PreferencesDialogPathFormatClass PreferencesDialogPathFormatClas
typedef struct _PluginsManifestWidgetMediator PluginsManifestWidgetMediator;
typedef struct _PluginsManifestWidgetMediatorClass PluginsManifestWidgetMediatorClass;
+enum {
+ PREFERENCES_DIALOG_0_PROPERTY,
+ PREFERENCES_DIALOG_NUM_PROPERTIES
+};
+static GParamSpec* preferences_dialog_properties[PREFERENCES_DIALOG_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define _g_free0(var) (var = (g_free (var), NULL))
#define _g_date_time_unref0(var) ((var == NULL) ? NULL : (var = (g_date_time_unref (var), NULL)))
@@ -198,16 +204,19 @@ GType preferences_dialog_get_type (void) G_GNUC_CONST;
GType sorted_list_get_type (void) G_GNUC_CONST;
static gpointer preferences_dialog_path_format_ref (gpointer instance);
static void preferences_dialog_path_format_unref (gpointer instance);
-static GParamSpec* preferences_dialog_param_spec_path_format (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
-static void preferences_dialog_value_set_path_format (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static void preferences_dialog_value_take_path_format (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+static GParamSpec* preferences_dialog_param_spec_path_format (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags) G_GNUC_UNUSED;
+static void preferences_dialog_value_set_path_format (GValue* value,
+ gpointer v_object) G_GNUC_UNUSED;
+static void preferences_dialog_value_take_path_format (GValue* value,
+ gpointer v_object) G_GNUC_UNUSED;
static gpointer preferences_dialog_value_get_path_format (const GValue* value) G_GNUC_UNUSED;
static GType preferences_dialog_path_format_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
GType plugins_manifest_widget_mediator_get_type (void) G_GNUC_CONST;
#define PREFERENCES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PREFERENCES_DIALOG, PreferencesDialogPrivate))
-enum {
- PREFERENCES_DIALOG_DUMMY_PROPERTY
-};
PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_new (void);
PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_construct (GType object_type);
static PreferencesDialog* preferences_dialog_new (void);
@@ -217,62 +226,102 @@ GType page_window_get_type (void) G_GNUC_CONST;
GType app_window_get_type (void) G_GNUC_CONST;
AppWindow* app_window_get_instance (void);
static gboolean preferences_dialog_on_delete (PreferencesDialog* self);
-static gboolean _preferences_dialog_on_delete_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self);
+static gboolean _preferences_dialog_on_delete_gtk_widget_delete_event (GtkWidget* _sender,
+ GdkEventAny* event,
+ gpointer self);
static void preferences_dialog_on_close (PreferencesDialog* self);
-static void _preferences_dialog_on_close_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self);
+static void _preferences_dialog_on_close_gtk_dialog_response (GtkDialog* _sender,
+ gint response_id,
+ gpointer self);
GType configuration_facade_get_type (void) G_GNUC_CONST;
GType config_facade_get_type (void) G_GNUC_CONST;
ConfigFacade* config_facade_get_instance (void);
-void config_facade_get_bg_color (ConfigFacade* self, GdkRGBA* result);
+void config_facade_get_bg_color (ConfigFacade* self,
+ GdkRGBA* result);
static void preferences_dialog_on_value_changed (PreferencesDialog* self);
-static void _preferences_dialog_on_value_changed_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
-static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, GdkEventButton* event);
-static gboolean _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
+static void _preferences_dialog_on_value_changed_gtk_adjustment_value_changed (GtkAdjustment* _sender,
+ gpointer self);
+static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self,
+ GdkEventButton* event);
+static gboolean _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event (GtkWidget* _sender,
+ GdkEventButton* event,
+ gpointer self);
static void preferences_dialog_on_radio_changed (PreferencesDialog* self);
-static void _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
+static void _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender,
+ gpointer self);
gchar* configuration_facade_get_transparent_background_color (ConfigurationFacade* self);
static void preferences_dialog_on_color_changed (PreferencesDialog* self);
-static void _preferences_dialog_on_color_changed_gtk_color_button_color_set (GtkColorButton* _sender, gpointer self);
+static void _preferences_dialog_on_color_changed_gtk_color_button_color_set (GtkColorButton* _sender,
+ gpointer self);
gchar* configuration_facade_get_transparent_background_type (ConfigurationFacade* self);
gchar* resources_get_help_path (void);
#define RESOURCES_DIR_PATTERN_URI_SYSWIDE "help:shotwell/other-files"
-static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* self, const gchar* ignore);
-static gboolean _preferences_dialog_on_local_pattern_help_gtk_label_activate_link (GtkLabel* _sender, const gchar* uri, gpointer self);
-static void preferences_dialog_add_to_dir_formats (PreferencesDialog* self, const gchar* name, const gchar* pattern);
+static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* self,
+ const gchar* ignore);
+static gboolean _preferences_dialog_on_local_pattern_help_gtk_label_activate_link (GtkLabel* _sender,
+ const gchar* uri,
+ gpointer self);
+static void preferences_dialog_add_to_dir_formats (PreferencesDialog* self,
+ const gchar* name,
+ const gchar* pattern);
static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog* self);
-static void _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self);
static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog* self);
-static void _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self);
static void preferences_dialog_on_lowercase_toggled (PreferencesDialog* self);
-static void _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
+static void _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender,
+ gpointer self);
void preferences_dialog_populate_preference_options (PreferencesDialog* self);
static void preferences_dialog_on_photo_editor_changed (PreferencesDialog* self);
-static void _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self);
static void preferences_dialog_on_raw_editor_changed (PreferencesDialog* self);
-static void _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self);
gboolean configuration_facade_get_auto_import_from_library (ConfigurationFacade* self);
gboolean configuration_facade_get_commit_metadata_to_masters (ConfigurationFacade* self);
GType raw_developer_get_type (void) G_GNUC_CONST;
gchar* raw_developer_get_label (RawDeveloper self);
-static void preferences_dialog_set_raw_developer_combo (PreferencesDialog* self, RawDeveloper d);
+static void preferences_dialog_set_raw_developer_combo (PreferencesDialog* self,
+ RawDeveloper d);
RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self);
static void preferences_dialog_on_default_raw_developer_changed (PreferencesDialog* self);
-static void _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, GtkComboBox* combo_box, gchar** mime_types, int mime_types_length1, const gchar* current_app_executable, SortedList* * external_apps);
+static void _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self);
+static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
+ GtkComboBox* combo_box,
+ gchar** mime_types,
+ int mime_types_length1,
+ const gchar* current_app_executable,
+ SortedList* * external_apps);
gchar** photo_file_format_get_editable_mime_types (int* result_length1);
gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self);
GType photo_file_format_get_type (void) G_GNUC_CONST;
-gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_length1);
+gchar** photo_file_format_get_mime_types (PhotoFileFormat self,
+ int* result_length1);
gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self);
-static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkComboBox* combo_box, GtkEntry* entry);
+static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self,
+ GtkComboBox* combo_box,
+ GtkEntry* entry);
gboolean configuration_facade_get_use_lowercase_filenames (ConfigurationFacade* self);
-void configuration_facade_set_transparent_background_type (ConfigurationFacade* self, const gchar* type);
-void configuration_facade_set_transparent_background_color (ConfigurationFacade* self, const gchar* color_name);
-void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** error);
-SortedList* desktop_integration_get_apps_for_mime_types (gchar** mime_types, int mime_types_length1);
-GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gboolean scale_up);
+void configuration_facade_set_transparent_background_type (ConfigurationFacade* self,
+ const gchar* type);
+void configuration_facade_set_transparent_background_color (ConfigurationFacade* self,
+ const gchar* color_name);
+void resources_launch_help (GdkScreen* screen,
+ const gchar* anchor,
+ GError** error);
+SortedList* desktop_integration_get_apps_for_mime_types (gchar** mime_types,
+ int mime_types_length1);
+GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf,
+ gint scale,
+ GdkInterpType interp,
+ gboolean scale_up);
#define RESOURCES_DEFAULT_ICON_SCALE 24
-gint sorted_list_index_of (SortedList* self, gconstpointer search);
+gint sorted_list_index_of (SortedList* self,
+ gconstpointer search);
gchar* configuration_facade_get_directory_pattern (ConfigurationFacade* self);
gchar* configuration_facade_get_directory_pattern_custom (ConfigurationFacade* self);
gboolean is_string_empty (const gchar* s);
@@ -280,568 +329,624 @@ void preferences_dialog_show_preferences (void);
GFile* app_dirs_get_import_dir (void);
static void preferences_dialog_commit_on_close (PreferencesDialog* self);
void config_facade_commit_bg_color (ConfigFacade* self);
-void configuration_facade_set_auto_import_from_library (ConfigurationFacade* self, gboolean auto_import);
-void configuration_facade_set_commit_metadata_to_masters (ConfigurationFacade* self, gboolean commit_metadata);
+void configuration_facade_set_auto_import_from_library (ConfigurationFacade* self,
+ gboolean auto_import);
+void configuration_facade_set_commit_metadata_to_masters (ConfigurationFacade* self,
+ gboolean commit_metadata);
void app_dirs_set_import_dir (const gchar* path);
-void configuration_facade_set_directory_pattern_custom (ConfigurationFacade* self, const gchar* s);
-void configuration_facade_set_directory_pattern (ConfigurationFacade* self, const gchar* s);
+void configuration_facade_set_directory_pattern_custom (ConfigurationFacade* self,
+ const gchar* s);
+void configuration_facade_set_directory_pattern (ConfigurationFacade* self,
+ const gchar* s);
static gboolean preferences_dialog_get_allow_closing (PreferencesDialog* self);
-static void preferences_dialog_set_background_color (PreferencesDialog* self, gdouble bg_color_value);
-gboolean has_only_key_modifier (GdkModifierType field, GdkModifierType mask);
-void parse_color (const gchar* spec, GdkRGBA* result);
+static void preferences_dialog_set_background_color (PreferencesDialog* self,
+ gdouble bg_color_value);
+gboolean has_only_key_modifier (GdkModifierType field,
+ GdkModifierType mask);
+void parse_color (const gchar* spec,
+ GdkRGBA* result);
#define CONFIG_FACADE_DEFAULT_BG_COLOR "#444"
-static void preferences_dialog_set_allow_closing (PreferencesDialog* self, gboolean allow);
-void config_facade_set_bg_color (ConfigFacade* self, GdkRGBA* color);
-static void preferences_dialog_to_grayscale (PreferencesDialog* self, gdouble color_value, GdkRGBA* result);
-gpointer sorted_list_get_at (SortedList* self, gint index);
-void configuration_facade_set_external_photo_app (ConfigurationFacade* self, const gchar* external_photo_app);
+static void preferences_dialog_set_allow_closing (PreferencesDialog* self,
+ gboolean allow);
+void config_facade_set_bg_color (ConfigFacade* self,
+ GdkRGBA* color);
+static void preferences_dialog_to_grayscale (PreferencesDialog* self,
+ gdouble color_value,
+ GdkRGBA* result);
+gpointer sorted_list_get_at (SortedList* self,
+ gint index);
+void configuration_facade_set_external_photo_app (ConfigurationFacade* self,
+ const gchar* external_photo_app);
gchar* desktop_integration_get_app_open_command (GAppInfo* app_info);
-void configuration_facade_set_external_raw_app (ConfigurationFacade* self, const gchar* external_raw_app);
+void configuration_facade_set_external_raw_app (ConfigurationFacade* self,
+ const gchar* external_raw_app);
static RawDeveloper preferences_dialog_raw_developer_from_combo (PreferencesDialog* self);
-void configuration_facade_set_default_raw_developer (ConfigurationFacade* self, RawDeveloper d);
+void configuration_facade_set_default_raw_developer (ConfigurationFacade* self,
+ RawDeveloper d);
static void preferences_dialog_on_current_folder_changed (PreferencesDialog* self);
-static gboolean preferences_dialog_real_map_event (GtkWidget* base, GdkEventAny* event);
-static void _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed (GtkFileChooser* _sender, gpointer self);
-static PreferencesDialogPathFormat* preferences_dialog_path_format_new (const gchar* name, const gchar* pattern);
-static PreferencesDialogPathFormat* preferences_dialog_path_format_construct (GType object_type, const gchar* name, const gchar* pattern);
-void configuration_facade_set_use_lowercase_filenames (ConfigurationFacade* self, gboolean b);
-enum {
- PREFERENCES_DIALOG_PATH_FORMAT_DUMMY_PROPERTY
-};
+static gboolean preferences_dialog_real_map_event (GtkWidget* base,
+ GdkEventAny* event);
+static void _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed (GtkFileChooser* _sender,
+ gpointer self);
+static PreferencesDialogPathFormat* preferences_dialog_path_format_new (const gchar* name,
+ const gchar* pattern);
+static PreferencesDialogPathFormat* preferences_dialog_path_format_construct (GType object_type,
+ const gchar* name,
+ const gchar* pattern);
+void configuration_facade_set_use_lowercase_filenames (ConfigurationFacade* self,
+ gboolean b);
static void preferences_dialog_path_format_finalize (PreferencesDialogPathFormat * obj);
static void preferences_dialog_finalize (GObject * obj);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static void _vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
static gint _vala_array_length (gpointer array);
-static gboolean _preferences_dialog_on_delete_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
+static gboolean
+_preferences_dialog_on_delete_gtk_widget_delete_event (GtkWidget* _sender,
+ GdkEventAny* event,
+ gpointer self)
+{
gboolean result;
result = preferences_dialog_on_delete ((PreferencesDialog*) self);
#line 72 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return result;
-#line 324 "Preferences.c"
+#line 399 "Preferences.c"
}
-static void _preferences_dialog_on_close_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
+static void
+_preferences_dialog_on_close_gtk_dialog_response (GtkDialog* _sender,
+ gint response_id,
+ gpointer self)
+{
#line 73 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_on_close ((PreferencesDialog*) self);
-#line 331 "Preferences.c"
+#line 410 "Preferences.c"
}
-static void _preferences_dialog_on_value_changed_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
+static void
+_preferences_dialog_on_value_changed_gtk_adjustment_value_changed (GtkAdjustment* _sender,
+ gpointer self)
+{
#line 77 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_on_value_changed ((PreferencesDialog*) self);
-#line 338 "Preferences.c"
+#line 420 "Preferences.c"
}
-static gboolean _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
+static gboolean
+_preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event (GtkWidget* _sender,
+ GdkEventButton* event,
+ gpointer self)
+{
gboolean result;
result = preferences_dialog_on_bg_color_reset ((PreferencesDialog*) self, event);
#line 79 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return result;
-#line 347 "Preferences.c"
+#line 433 "Preferences.c"
}
-static void _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+static void
+_preferences_dialog_on_radio_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender,
+ gpointer self)
+{
#line 81 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_on_radio_changed ((PreferencesDialog*) self);
-#line 354 "Preferences.c"
+#line 443 "Preferences.c"
}
-static void _preferences_dialog_on_color_changed_gtk_color_button_color_set (GtkColorButton* _sender, gpointer self) {
+static void
+_preferences_dialog_on_color_changed_gtk_color_button_color_set (GtkColorButton* _sender,
+ gpointer self)
+{
#line 92 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_on_color_changed ((PreferencesDialog*) self);
-#line 361 "Preferences.c"
+#line 453 "Preferences.c"
}
-static gboolean _preferences_dialog_on_local_pattern_help_gtk_label_activate_link (GtkLabel* _sender, const gchar* uri, gpointer self) {
+static gboolean
+_preferences_dialog_on_local_pattern_help_gtk_label_activate_link (GtkLabel* _sender,
+ const gchar* uri,
+ gpointer self)
+{
gboolean result;
result = preferences_dialog_on_local_pattern_help ((PreferencesDialog*) self, uri);
#line 120 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return result;
-#line 370 "Preferences.c"
+#line 466 "Preferences.c"
}
-static void _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self)
+{
#line 131 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_on_dir_pattern_combo_changed ((PreferencesDialog*) self);
-#line 377 "Preferences.c"
+#line 476 "Preferences.c"
}
-static void _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self)
+{
#line 132 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_on_dir_pattern_entry_changed ((PreferencesDialog*) self);
-#line 384 "Preferences.c"
+#line 486 "Preferences.c"
}
-static void _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+static void
+_preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender,
+ gpointer self)
+{
#line 134 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_on_lowercase_toggled ((PreferencesDialog*) self);
-#line 391 "Preferences.c"
+#line 496 "Preferences.c"
}
-static void _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self)
+{
#line 140 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_on_photo_editor_changed ((PreferencesDialog*) self);
-#line 398 "Preferences.c"
+#line 506 "Preferences.c"
}
-static void _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self)
+{
#line 141 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_on_raw_editor_changed ((PreferencesDialog*) self);
-#line 405 "Preferences.c"
+#line 516 "Preferences.c"
}
-static void _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self)
+{
#line 150 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_on_default_raw_developer_changed ((PreferencesDialog*) self);
-#line 412 "Preferences.c"
+#line 526 "Preferences.c"
}
-static PreferencesDialog* preferences_dialog_construct (GType object_type) {
+static PreferencesDialog*
+preferences_dialog_construct (GType object_type)
+{
PreferencesDialog * self = NULL;
- gint _tmp0_;
+ AppWindow* _tmp0_;
AppWindow* _tmp1_;
- AppWindow* _tmp2_;
- GdkWindow* _tmp3_;
+ GdkWindow* _tmp2_;
+ AppWindow* _tmp3_;
AppWindow* _tmp4_;
- AppWindow* _tmp5_;
+ GtkAdjustment* _tmp5_;
GtkAdjustment* _tmp6_;
- GtkAdjustment* _tmp7_;
- gdouble _tmp8_;
- ConfigFacade* _tmp9_;
- ConfigFacade* _tmp10_;
- GdkRGBA _tmp11_ = {0};
- gdouble _tmp12_;
- GtkAdjustment* _tmp13_;
- GtkScale* _tmp14_;
+ ConfigFacade* _tmp7_;
+ ConfigFacade* _tmp8_;
+ GdkRGBA _tmp9_ = {0};
+ gdouble _tmp10_;
+ GtkAdjustment* _tmp11_;
+ GtkScale* _tmp12_;
+ GtkRadioButton* _tmp13_;
+ GtkRadioButton* _tmp14_;
GtkRadioButton* _tmp15_;
GtkRadioButton* _tmp16_;
- GtkRadioButton* _tmp17_;
- GtkRadioButton* _tmp18_;
- GtkColorButton* _tmp19_;
+ GtkColorButton* _tmp17_;
GdkRGBA color = {0};
- ConfigFacade* _tmp20_;
- ConfigFacade* _tmp21_;
- gchar* _tmp22_;
- gchar* _tmp23_;
+ ConfigFacade* _tmp18_;
+ ConfigFacade* _tmp19_;
+ gchar* _tmp20_;
+ gchar* _tmp21_;
+ GtkColorButton* _tmp22_;
+ GdkRGBA _tmp23_;
GtkColorButton* _tmp24_;
- GdkRGBA _tmp25_;
- GtkColorButton* _tmp26_;
- ConfigFacade* _tmp27_;
- ConfigFacade* _tmp28_;
+ ConfigFacade* _tmp25_;
+ ConfigFacade* _tmp26_;
+ gchar* _tmp27_;
+ gchar* _tmp28_;
gchar* _tmp29_;
- gchar* _tmp30_;
- gchar* _tmp31_;
- GQuark _tmp33_ = 0U;
+ GQuark _tmp31_ = 0U;
#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- static GQuark _tmp32_label0 = 0;
+ static GQuark _tmp30_label0 = 0;
#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- static GQuark _tmp32_label1 = 0;
-#line 456 "Preferences.c"
+ static GQuark _tmp30_label1 = 0;
+#line 570 "Preferences.c"
gchar* help_path = NULL;
- gchar* _tmp37_;
- const gchar* _tmp38_;
+ gchar* _tmp35_;
+ const gchar* _tmp36_;
+ gchar* _tmp48_;
+ gchar* _tmp49_;
gchar* _tmp50_;
gchar* _tmp51_;
gchar* _tmp52_;
gchar* _tmp53_;
- gchar* _tmp54_;
- gchar* _tmp55_;
- GtkComboBoxText* _tmp56_;
- GtkEntry* _tmp57_;
- GtkCheckButton* _tmp58_;
- GtkNotebook* _tmp59_;
- GtkWidget* _tmp60_;
- PluginsManifestWidgetMediator* _tmp61_;
- GtkComboBox* _tmp62_;
- GtkComboBox* _tmp63_;
- GtkCheckButton* _tmp64_;
- ConfigFacade* _tmp65_;
+ GtkComboBoxText* _tmp54_;
+ GtkEntry* _tmp55_;
+ GtkCheckButton* _tmp56_;
+ GtkNotebook* _tmp57_;
+ GtkWidget* _tmp58_;
+ PluginsManifestWidgetMediator* _tmp59_;
+ GtkComboBox* _tmp60_;
+ GtkComboBox* _tmp61_;
+ GtkCheckButton* _tmp62_;
+ ConfigFacade* _tmp63_;
+ ConfigFacade* _tmp64_;
+ GtkCheckButton* _tmp65_;
ConfigFacade* _tmp66_;
- gboolean _tmp67_;
- GtkCheckButton* _tmp68_;
- ConfigFacade* _tmp69_;
- ConfigFacade* _tmp70_;
- gboolean _tmp71_;
- GtkComboBoxText* _tmp72_;
+ ConfigFacade* _tmp67_;
+ GtkComboBoxText* _tmp68_;
+ gchar* _tmp69_;
+ gchar* _tmp70_;
+ GtkComboBoxText* _tmp71_;
+ gchar* _tmp72_;
gchar* _tmp73_;
- gchar* _tmp74_;
- GtkComboBoxText* _tmp75_;
- gchar* _tmp76_;
- gchar* _tmp77_;
- ConfigFacade* _tmp78_;
- ConfigFacade* _tmp79_;
- RawDeveloper _tmp80_;
- GtkComboBoxText* _tmp81_;
-#line 68 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp0_ = resources_use_header_bar ();
+ ConfigFacade* _tmp74_;
+ ConfigFacade* _tmp75_;
+ GtkComboBoxText* _tmp76_;
#line 68 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- self = (PreferencesDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
+ self = (PreferencesDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL);
#line 70 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp1_ = app_window_get_instance ();
+ _tmp0_ = app_window_get_instance ();
#line 70 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 70 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
+ _tmp2_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
#line 70 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp3_);
+ gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp2_);
#line 70 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_object_unref0 (_tmp2_);
+ _g_object_unref0 (_tmp1_);
#line 71 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp4_ = app_window_get_instance ();
+ _tmp3_ = app_window_get_instance ();
#line 71 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 71 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
+ gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow));
#line 71 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_object_unref0 (_tmp5_);
+ _g_object_unref0 (_tmp4_);
#line 72 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _preferences_dialog_on_delete_gtk_widget_delete_event, self, 0);
#line 73 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), "response", (GCallback) _preferences_dialog_on_close_gtk_dialog_response, self, 0);
#line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp6_ = self->priv->bg_color_adjustment;
-#line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp7_ = self->priv->bg_color_adjustment;
+ _tmp5_ = self->priv->bg_color_adjustment;
#line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp8_ = gtk_adjustment_get_upper (_tmp7_);
+ _tmp6_ = self->priv->bg_color_adjustment;
#line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp9_ = config_facade_get_instance ();
+ _tmp7_ = config_facade_get_instance ();
#line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp10_ = _tmp9_;
+ _tmp8_ = _tmp7_;
#line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- config_facade_get_bg_color (_tmp10_, &_tmp11_);
+ config_facade_get_bg_color (_tmp8_, &_tmp9_);
#line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp12_ = _tmp11_.red;
+ _tmp10_ = _tmp9_.red;
#line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_adjustment_set_value (_tmp6_, _tmp8_ - (_tmp12_ * 65535.0));
+ gtk_adjustment_set_value (_tmp5_, gtk_adjustment_get_upper (_tmp6_) - (_tmp10_ * 65535.0));
#line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_object_unref0 (_tmp10_);
+ _g_object_unref0 (_tmp8_);
#line 77 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp13_ = self->priv->bg_color_adjustment;
+ _tmp11_ = self->priv->bg_color_adjustment;
#line 77 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_signal_connect_object (_tmp13_, "value-changed", (GCallback) _preferences_dialog_on_value_changed_gtk_adjustment_value_changed, self, 0);
+ g_signal_connect_object (_tmp11_, "value-changed", (GCallback) _preferences_dialog_on_value_changed_gtk_adjustment_value_changed, self, 0);
#line 79 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp14_ = self->priv->bg_color_slider;
+ _tmp12_ = self->priv->bg_color_slider;
#line 79 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event, self, 0);
#line 81 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp15_ = self->priv->transparent_checker_radio;
+ _tmp13_ = self->priv->transparent_checker_radio;
#line 81 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled, self, 0);
#line 82 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp16_ = self->priv->transparent_solid_radio;
+ _tmp14_ = self->priv->transparent_solid_radio;
#line 82 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled, self, 0);
#line 83 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp17_ = self->priv->transparent_none_radio;
+ _tmp15_ = self->priv->transparent_none_radio;
#line 83 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled, self, 0);
#line 85 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp18_ = self->priv->transparent_solid_radio;
+ _tmp16_ = self->priv->transparent_solid_radio;
#line 85 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp19_ = self->priv->transparent_solid_color;
+ _tmp17_ = self->priv->transparent_solid_color;
#line 85 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_object_bind_property_with_closures (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, G_TYPE_OBJECT, GObject), "active", G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, G_TYPE_OBJECT, GObject), "sensitive", G_BINDING_DEFAULT, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)));
+ g_object_bind_property_with_closures (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, G_TYPE_OBJECT, GObject), "active", G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, G_TYPE_OBJECT, GObject), "sensitive", G_BINDING_DEFAULT, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)));
#line 89 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
memset (&color, 0, sizeof (GdkRGBA));
#line 90 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp20_ = config_facade_get_instance ();
+ _tmp18_ = config_facade_get_instance ();
#line 90 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp21_ = _tmp20_;
+ _tmp19_ = _tmp18_;
#line 90 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp22_ = configuration_facade_get_transparent_background_color (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp20_ = configuration_facade_get_transparent_background_color (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 90 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp23_ = _tmp22_;
+ _tmp21_ = _tmp20_;
#line 90 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gdk_rgba_parse (&color, _tmp23_);
+ gdk_rgba_parse (&color, _tmp21_);
#line 90 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_free0 (_tmp23_);
+ _g_free0 (_tmp21_);
#line 90 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_object_unref0 (_tmp21_);
+ _g_object_unref0 (_tmp19_);
#line 91 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp24_ = self->priv->transparent_solid_color;
+ _tmp22_ = self->priv->transparent_solid_color;
#line 91 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp25_ = color;
+ _tmp23_ = color;
#line 91 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_color_chooser_set_rgba (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, GTK_TYPE_COLOR_CHOOSER) ? ((GtkColorChooser*) _tmp24_) : NULL, &_tmp25_);
+ gtk_color_chooser_set_rgba (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, gtk_color_chooser_get_type ()) ? ((GtkColorChooser*) _tmp22_) : NULL, &_tmp23_);
#line 92 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp26_ = self->priv->transparent_solid_color;
+ _tmp24_ = self->priv->transparent_solid_color;
#line 92 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_signal_connect_object (_tmp26_, "color-set", (GCallback) _preferences_dialog_on_color_changed_gtk_color_button_color_set, self, 0);
+ g_signal_connect_object (_tmp24_, "color-set", (GCallback) _preferences_dialog_on_color_changed_gtk_color_button_color_set, self, 0);
#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp27_ = config_facade_get_instance ();
+ _tmp25_ = config_facade_get_instance ();
#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp28_ = _tmp27_;
+ _tmp26_ = _tmp25_;
#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp29_ = configuration_facade_get_transparent_background_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp27_ = configuration_facade_get_transparent_background_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp30_ = _tmp29_;
+ _tmp28_ = _tmp27_;
#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_object_unref0 (_tmp28_);
+ _g_object_unref0 (_tmp26_);
#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp31_ = _tmp30_;
+ _tmp29_ = _tmp28_;
#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp33_ = (NULL == _tmp31_) ? 0 : g_quark_from_string (_tmp31_);
+ _tmp31_ = (NULL == _tmp29_) ? 0 : g_quark_from_string (_tmp29_);
#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_free (_tmp31_);
+ g_free (_tmp29_);
#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- if (_tmp33_ == ((0 != _tmp32_label0) ? _tmp32_label0 : (_tmp32_label0 = g_quark_from_static_string ("checkered")))) {
+ if (_tmp31_ == ((0 != _tmp30_label0) ? _tmp30_label0 : (_tmp30_label0 = g_quark_from_static_string ("checkered")))) {
#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
switch (0) {
-#line 608 "Preferences.c"
+#line 715 "Preferences.c"
default:
{
- GtkRadioButton* _tmp34_;
+ GtkRadioButton* _tmp32_;
#line 96 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp34_ = self->priv->transparent_checker_radio;
+ _tmp32_ = self->priv->transparent_checker_radio;
#line 96 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
#line 97 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
break;
-#line 618 "Preferences.c"
+#line 725 "Preferences.c"
}
}
- } else if (_tmp33_ == ((0 != _tmp32_label1) ? _tmp32_label1 : (_tmp32_label1 = g_quark_from_static_string ("solid")))) {
+ } else if (_tmp31_ == ((0 != _tmp30_label1) ? _tmp30_label1 : (_tmp30_label1 = g_quark_from_static_string ("solid")))) {
#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
switch (0) {
-#line 624 "Preferences.c"
+#line 731 "Preferences.c"
default:
{
- GtkRadioButton* _tmp35_;
+ GtkRadioButton* _tmp33_;
#line 99 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp35_ = self->priv->transparent_solid_radio;
+ _tmp33_ = self->priv->transparent_solid_radio;
#line 99 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
#line 100 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
break;
-#line 634 "Preferences.c"
+#line 741 "Preferences.c"
}
}
} else {
#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
switch (0) {
-#line 640 "Preferences.c"
+#line 747 "Preferences.c"
default:
{
- GtkRadioButton* _tmp36_;
+ GtkRadioButton* _tmp34_;
#line 102 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp36_ = self->priv->transparent_none_radio;
+ _tmp34_ = self->priv->transparent_none_radio;
#line 102 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
#line 103 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
break;
-#line 650 "Preferences.c"
+#line 757 "Preferences.c"
}
}
}
#line 111 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp37_ = resources_get_help_path ();
+ _tmp35_ = resources_get_help_path ();
#line 111 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- help_path = _tmp37_;
+ help_path = _tmp35_;
#line 113 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp38_ = help_path;
+ _tmp36_ = help_path;
#line 113 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- if (_tmp38_ == NULL) {
-#line 662 "Preferences.c"
- GtkLabel* _tmp39_;
+ if (_tmp36_ == NULL) {
+#line 769 "Preferences.c"
+ GtkLabel* _tmp37_;
+ gchar* _tmp38_;
+ gchar* _tmp39_;
gchar* _tmp40_;
gchar* _tmp41_;
- gchar* _tmp42_;
- gchar* _tmp43_;
#line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp39_ = self->priv->pattern_help;
+ _tmp37_ = self->priv->pattern_help;
#line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp40_ = g_strconcat ("<a href=\"" RESOURCES_DIR_PATTERN_URI_SYSWIDE "\">", _ ("(Help)"), NULL);
+ _tmp38_ = g_strconcat ("<a href=\"" RESOURCES_DIR_PATTERN_URI_SYSWIDE "\">", _ ("(Help)"), NULL);
#line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp41_ = _tmp40_;
+ _tmp39_ = _tmp38_;
#line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp42_ = g_strconcat (_tmp41_, "</a>", NULL);
+ _tmp40_ = g_strconcat (_tmp39_, "</a>", NULL);
#line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp43_ = _tmp42_;
-#line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_label_set_markup (_tmp39_, _tmp43_);
+ _tmp41_ = _tmp40_;
#line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_free0 (_tmp43_);
+ gtk_label_set_markup (_tmp37_, _tmp41_);
#line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_free0 (_tmp41_);
-#line 684 "Preferences.c"
+#line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+ _g_free0 (_tmp39_);
+#line 791 "Preferences.c"
} else {
- GtkLabel* _tmp44_;
+ GtkLabel* _tmp42_;
+ gchar* _tmp43_;
+ gchar* _tmp44_;
gchar* _tmp45_;
gchar* _tmp46_;
- gchar* _tmp47_;
- gchar* _tmp48_;
- GtkLabel* _tmp49_;
-#line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp44_ = self->priv->pattern_help;
+ GtkLabel* _tmp47_;
#line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp45_ = g_strconcat ("<a href=\"dummy:\">", _ ("(Help)"), NULL);
+ _tmp42_ = self->priv->pattern_help;
#line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp46_ = _tmp45_;
+ _tmp43_ = g_strconcat ("<a href=\"dummy:\">", _ ("(Help)"), NULL);
#line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp47_ = g_strconcat (_tmp46_, "</a>", NULL);
+ _tmp44_ = _tmp43_;
#line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp48_ = _tmp47_;
+ _tmp45_ = g_strconcat (_tmp44_, "</a>", NULL);
#line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_label_set_markup (_tmp44_, _tmp48_);
+ _tmp46_ = _tmp45_;
#line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_free0 (_tmp48_);
+ gtk_label_set_markup (_tmp42_, _tmp46_);
#line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_free0 (_tmp46_);
+#line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+ _g_free0 (_tmp44_);
#line 120 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp49_ = self->priv->pattern_help;
+ _tmp47_ = self->priv->pattern_help;
#line 120 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_signal_connect_object (_tmp49_, "activate-link", (GCallback) _preferences_dialog_on_local_pattern_help_gtk_label_activate_link, self, 0);
-#line 712 "Preferences.c"
+ g_signal_connect_object (_tmp47_, "activate-link", (GCallback) _preferences_dialog_on_local_pattern_help_gtk_label_activate_link, self, 0);
+#line 819 "Preferences.c"
}
#line 123 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp50_ = g_strdup_printf (_ ("Year%sMonth%sDay"), G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S);
+ _tmp48_ = g_strdup_printf (_ ("Year%sMonth%sDay"), G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S);
#line 123 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp51_ = _tmp50_;
+ _tmp49_ = _tmp48_;
#line 123 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- preferences_dialog_add_to_dir_formats (self, _tmp51_, "%Y" G_DIR_SEPARATOR_S "%m" G_DIR_SEPARATOR_S "%d");
+ preferences_dialog_add_to_dir_formats (self, _tmp49_, "%Y" G_DIR_SEPARATOR_S "%m" G_DIR_SEPARATOR_S "%d");
#line 123 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_free0 (_tmp51_);
+ _g_free0 (_tmp49_);
#line 125 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp52_ = g_strdup_printf (_ ("Year%sMonth"), G_DIR_SEPARATOR_S);
+ _tmp50_ = g_strdup_printf (_ ("Year%sMonth"), G_DIR_SEPARATOR_S);
#line 125 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp53_ = _tmp52_;
+ _tmp51_ = _tmp50_;
#line 125 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- preferences_dialog_add_to_dir_formats (self, _tmp53_, "%Y" G_DIR_SEPARATOR_S "%m");
+ preferences_dialog_add_to_dir_formats (self, _tmp51_, "%Y" G_DIR_SEPARATOR_S "%m");
#line 125 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_free0 (_tmp53_);
+ _g_free0 (_tmp51_);
#line 127 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp54_ = g_strdup_printf (_ ("Year%sMonth-Day"), G_DIR_SEPARATOR_S);
+ _tmp52_ = g_strdup_printf (_ ("Year%sMonth-Day"), G_DIR_SEPARATOR_S);
#line 127 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp55_ = _tmp54_;
+ _tmp53_ = _tmp52_;
#line 127 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- preferences_dialog_add_to_dir_formats (self, _tmp55_, "%Y" G_DIR_SEPARATOR_S "%m-%d");
+ preferences_dialog_add_to_dir_formats (self, _tmp53_, "%Y" G_DIR_SEPARATOR_S "%m-%d");
#line 127 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_free0 (_tmp55_);
+ _g_free0 (_tmp53_);
#line 129 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_add_to_dir_formats (self, _ ("Year-Month-Day"), "%Y-%m-%d");
#line 130 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_add_to_dir_formats (self, _ ("Custom"), NULL);
#line 131 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp56_ = self->priv->dir_pattern_combo;
+ _tmp54_ = self->priv->dir_pattern_combo;
#line 131 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed, self, 0);
#line 132 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp57_ = self->priv->dir_pattern_entry;
+ _tmp55_ = self->priv->dir_pattern_entry;
#line 132 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed, self, 0);
#line 134 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp58_ = self->priv->lowercase;
+ _tmp56_ = self->priv->lowercase;
#line 134 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled, self, 0);
#line 136 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp59_ = self->priv->preferences_notebook;
+ _tmp57_ = self->priv->preferences_notebook;
#line 136 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp60_ = gtk_notebook_get_nth_page (_tmp59_, 2);
+ _tmp58_ = gtk_notebook_get_nth_page (_tmp57_, 2);
#line 136 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp61_ = self->priv->plugins_mediator;
+ _tmp59_ = self->priv->plugins_mediator;
#line 136 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_TYPE (_tmp60_, gtk_container_get_type ()) ? ((GtkContainer*) _tmp60_) : NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget));
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_TYPE (_tmp58_, gtk_container_get_type ()) ? ((GtkContainer*) _tmp58_) : NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget));
#line 138 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_populate_preference_options (self);
#line 140 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp62_ = self->priv->photo_editor_combo;
+ _tmp60_ = self->priv->photo_editor_combo;
#line 140 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_signal_connect_object (_tmp62_, "changed", (GCallback) _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed, self, 0);
+ g_signal_connect_object (_tmp60_, "changed", (GCallback) _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed, self, 0);
#line 141 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp63_ = self->priv->raw_editor_combo;
+ _tmp61_ = self->priv->raw_editor_combo;
#line 141 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_signal_connect_object (_tmp63_, "changed", (GCallback) _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed, self, 0);
+ g_signal_connect_object (_tmp61_, "changed", (GCallback) _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed, self, 0);
#line 143 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp64_ = self->priv->autoimport;
+ _tmp62_ = self->priv->autoimport;
#line 143 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp65_ = config_facade_get_instance ();
+ _tmp63_ = config_facade_get_instance ();
#line 143 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp66_ = _tmp65_;
+ _tmp64_ = _tmp63_;
#line 143 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp67_ = configuration_facade_get_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_toggle_button_get_type (), GtkToggleButton), configuration_facade_get_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
#line 143 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp67_);
-#line 143 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_object_unref0 (_tmp66_);
-#line 145 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp68_ = self->priv->write_metadata;
+ _g_object_unref0 (_tmp64_);
#line 145 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp69_ = config_facade_get_instance ();
+ _tmp65_ = self->priv->write_metadata;
#line 145 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp70_ = _tmp69_;
+ _tmp66_ = config_facade_get_instance ();
#line 145 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp71_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp67_ = _tmp66_;
#line 145 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp71_);
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_toggle_button_get_type (), GtkToggleButton), configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
#line 145 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_object_unref0 (_tmp70_);
+ _g_object_unref0 (_tmp67_);
#line 147 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp72_ = self->priv->default_raw_developer_combo;
+ _tmp68_ = self->priv->default_raw_developer_combo;
#line 147 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp73_ = raw_developer_get_label (RAW_DEVELOPER_CAMERA);
+ _tmp69_ = raw_developer_get_label (RAW_DEVELOPER_CAMERA);
#line 147 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp74_ = _tmp73_;
+ _tmp70_ = _tmp69_;
#line 147 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_combo_box_text_append_text (_tmp72_, _tmp74_);
+ gtk_combo_box_text_append_text (_tmp68_, _tmp70_);
#line 147 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_free0 (_tmp74_);
+ _g_free0 (_tmp70_);
#line 148 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp75_ = self->priv->default_raw_developer_combo;
+ _tmp71_ = self->priv->default_raw_developer_combo;
#line 148 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp76_ = raw_developer_get_label (RAW_DEVELOPER_SHOTWELL);
+ _tmp72_ = raw_developer_get_label (RAW_DEVELOPER_SHOTWELL);
#line 148 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp77_ = _tmp76_;
+ _tmp73_ = _tmp72_;
#line 148 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_combo_box_text_append_text (_tmp75_, _tmp77_);
+ gtk_combo_box_text_append_text (_tmp71_, _tmp73_);
#line 148 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_free0 (_tmp77_);
+ _g_free0 (_tmp73_);
#line 149 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp78_ = config_facade_get_instance ();
+ _tmp74_ = config_facade_get_instance ();
#line 149 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp79_ = _tmp78_;
+ _tmp75_ = _tmp74_;
#line 149 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp80_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ preferences_dialog_set_raw_developer_combo (self, configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
#line 149 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- preferences_dialog_set_raw_developer_combo (self, _tmp80_);
-#line 149 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_object_unref0 (_tmp79_);
+ _g_object_unref0 (_tmp75_);
#line 150 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp81_ = self->priv->default_raw_developer_combo;
+ _tmp76_ = self->priv->default_raw_developer_combo;
#line 150 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed, self, 0);
#line 67 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_free0 (help_path);
#line 67 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return self;
-#line 834 "Preferences.c"
+#line 935 "Preferences.c"
}
-static PreferencesDialog* preferences_dialog_new (void) {
+static PreferencesDialog*
+preferences_dialog_new (void)
+{
#line 67 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return preferences_dialog_construct (TYPE_PREFERENCES_DIALOG);
-#line 841 "Preferences.c"
+#line 944 "Preferences.c"
}
-void preferences_dialog_populate_preference_options (PreferencesDialog* self) {
+void
+preferences_dialog_populate_preference_options (PreferencesDialog* self)
+{
GtkComboBox* _tmp0_;
gint _tmp1_;
gchar** _tmp2_;
@@ -867,7 +972,6 @@ void preferences_dialog_populate_preference_options (PreferencesDialog* self) {
GtkCheckButton* _tmp20_;
ConfigFacade* _tmp21_;
ConfigFacade* _tmp22_;
- gboolean _tmp23_;
#line 153 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_if_fail (IS_PREFERENCES_DIALOG (self));
#line 154 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
@@ -939,16 +1043,16 @@ void preferences_dialog_populate_preference_options (PreferencesDialog* self) {
#line 162 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp22_ = _tmp21_;
#line 162 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp23_ = configuration_facade_get_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 162 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp23_);
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_toggle_button_get_type (), GtkToggleButton), configuration_facade_get_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
#line 162 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_object_unref0 (_tmp22_);
-#line 948 "Preferences.c"
+#line 1050 "Preferences.c"
}
-static void preferences_dialog_on_radio_changed (PreferencesDialog* self) {
+static void
+preferences_dialog_on_radio_changed (PreferencesDialog* self)
+{
ConfigFacade* config = NULL;
ConfigFacade* _tmp0_;
GtkRadioButton* _tmp1_;
@@ -968,13 +1072,13 @@ static void preferences_dialog_on_radio_changed (PreferencesDialog* self) {
_tmp3_ = _tmp2_;
#line 168 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (_tmp3_) {
-#line 972 "Preferences.c"
+#line 1076 "Preferences.c"
ConfigFacade* _tmp4_;
#line 169 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp4_ = config;
#line 169 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
configuration_facade_set_transparent_background_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "checkered");
-#line 978 "Preferences.c"
+#line 1082 "Preferences.c"
} else {
GtkRadioButton* _tmp5_;
gboolean _tmp6_;
@@ -987,29 +1091,31 @@ static void preferences_dialog_on_radio_changed (PreferencesDialog* self) {
_tmp7_ = _tmp6_;
#line 170 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (_tmp7_) {
-#line 991 "Preferences.c"
+#line 1095 "Preferences.c"
ConfigFacade* _tmp8_;
#line 171 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp8_ = config;
#line 171 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
configuration_facade_set_transparent_background_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "solid");
-#line 997 "Preferences.c"
+#line 1101 "Preferences.c"
} else {
ConfigFacade* _tmp9_;
#line 173 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp9_ = config;
#line 173 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
configuration_facade_set_transparent_background_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "none");
-#line 1004 "Preferences.c"
+#line 1108 "Preferences.c"
}
}
#line 165 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_object_unref0 (config);
-#line 1009 "Preferences.c"
+#line 1113 "Preferences.c"
}
-static void preferences_dialog_on_color_changed (PreferencesDialog* self) {
+static void
+preferences_dialog_on_color_changed (PreferencesDialog* self)
+{
gchar* color = NULL;
GtkColorButton* _tmp0_;
GdkRGBA _tmp1_ = {0};
@@ -1022,7 +1128,7 @@ static void preferences_dialog_on_color_changed (PreferencesDialog* self) {
#line 178 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp0_ = self->priv->transparent_solid_color;
#line 178 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_color_chooser_get_rgba (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, GTK_TYPE_COLOR_CHOOSER) ? ((GtkColorChooser*) _tmp0_) : NULL, &_tmp1_);
+ gtk_color_chooser_get_rgba (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_color_chooser_get_type ()) ? ((GtkColorChooser*) _tmp0_) : NULL, &_tmp1_);
#line 178 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp2_ = _tmp1_;
#line 178 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
@@ -1039,18 +1145,21 @@ static void preferences_dialog_on_color_changed (PreferencesDialog* self) {
_g_object_unref0 (_tmp5_);
#line 177 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_free0 (color);
-#line 1043 "Preferences.c"
+#line 1149 "Preferences.c"
}
-static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* self, const gchar* ignore) {
+static gboolean
+preferences_dialog_on_local_pattern_help (PreferencesDialog* self,
+ const gchar* ignore)
+{
gboolean result = FALSE;
GError * _inner_error_ = NULL;
#line 184 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
#line 184 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_val_if_fail (ignore != NULL, FALSE);
-#line 1054 "Preferences.c"
+#line 1163 "Preferences.c"
{
AppWindow* _tmp0_;
AppWindow* _tmp1_;
@@ -1067,7 +1176,7 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel
_g_object_unref0 (_tmp1_);
#line 186 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1071 "Preferences.c"
+#line 1180 "Preferences.c"
goto __catch22_g_error;
}
}
@@ -1089,12 +1198,12 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel
g_message ("Preferences.vala:188: Unable to launch help: %s", _tmp4_);
#line 185 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_error_free0 (e);
-#line 1093 "Preferences.c"
+#line 1202 "Preferences.c"
}
__finally22:
#line 185 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1098 "Preferences.c"
+#line 1207 "Preferences.c"
gboolean _tmp5_ = FALSE;
#line 185 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1102,53 +1211,52 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel
g_clear_error (&_inner_error_);
#line 185 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return _tmp5_;
-#line 1106 "Preferences.c"
+#line 1215 "Preferences.c"
}
#line 190 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
result = TRUE;
#line 190 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return result;
-#line 1112 "Preferences.c"
+#line 1221 "Preferences.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 220 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return self ? g_object_ref (self) : NULL;
-#line 1119 "Preferences.c"
+#line 1230 "Preferences.c"
}
-static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, GtkComboBox* combo_box, gchar** mime_types, int mime_types_length1, const gchar* current_app_executable, SortedList* * external_apps) {
+static void
+preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
+ GtkComboBox* combo_box,
+ gchar** mime_types,
+ int mime_types_length1,
+ const gchar* current_app_executable,
+ SortedList* * external_apps)
+{
SortedList* _vala_external_apps = NULL;
- gchar** _tmp0_;
- gint _tmp0__length1;
- gchar** _tmp1_;
- gint _tmp1__length1;
- SortedList* _tmp2_;
- SortedList* _tmp3_;
- gint _tmp4_;
- gint _tmp5_;
+ SortedList* _tmp0_;
+ SortedList* _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
GtkCellRendererPixbuf* pixbuf_renderer = NULL;
- GtkCellRendererPixbuf* _tmp6_;
+ GtkCellRendererPixbuf* _tmp4_;
GtkCellRendererText* text_renderer = NULL;
+ GtkCellRendererText* _tmp5_;
+ GtkCellRendererPixbuf* _tmp6_;
GtkCellRendererText* _tmp7_;
- GtkComboBox* _tmp8_;
- GtkComboBox* _tmp9_;
- GtkCellRendererPixbuf* _tmp10_;
- GtkComboBox* _tmp11_;
- GtkCellRendererText* _tmp12_;
- GtkComboBox* _tmp13_;
- GtkCellRendererPixbuf* _tmp14_;
- GtkComboBox* _tmp15_;
- GtkCellRendererText* _tmp16_;
+ GtkCellRendererPixbuf* _tmp8_;
+ GtkCellRendererText* _tmp9_;
GtkListStore* combo_store = NULL;
- GtkListStore* _tmp17_;
+ GtkListStore* _tmp10_;
GtkTreeIter iter = {0};
gint current_app = 0;
- GtkComboBox* _tmp67_;
- GtkListStore* _tmp68_;
- gint _tmp69_;
+ GtkListStore* _tmp57_;
+ gint _tmp58_;
GError * _inner_error_ = NULL;
#line 193 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_if_fail (IS_PREFERENCES_DIALOG (self));
@@ -1157,261 +1265,239 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
#line 193 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_if_fail (current_app_executable != NULL);
#line 196 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp0_ = mime_types;
-#line 196 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp0__length1 = mime_types_length1;
-#line 196 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _vala_assert (_tmp0__length1 != 0, "mime_types.length != 0");
+ _vala_assert (mime_types_length1 != 0, "mime_types.length != 0");
#line 197 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp1_ = mime_types;
-#line 197 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp1__length1 = mime_types_length1;
-#line 197 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp2_ = desktop_integration_get_apps_for_mime_types (_tmp1_, _tmp1__length1);
+ _tmp0_ = desktop_integration_get_apps_for_mime_types (mime_types, mime_types_length1);
#line 197 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_object_unref0 (_vala_external_apps);
#line 197 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _vala_external_apps = _tmp2_;
+ _vala_external_apps = _tmp0_;
#line 199 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp3_ = _vala_external_apps;
+ _tmp1_ = _vala_external_apps;
#line 199 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
#line 199 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp5_ = _tmp4_;
+ _tmp3_ = _tmp2_;
#line 199 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- if (_tmp5_ == 0) {
+ if (_tmp3_ == 0) {
#line 200 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (external_apps) {
#line 200 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
*external_apps = _vala_external_apps;
-#line 1188 "Preferences.c"
+#line 1288 "Preferences.c"
} else {
#line 200 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_object_unref0 (_vala_external_apps);
-#line 1192 "Preferences.c"
+#line 1292 "Preferences.c"
}
#line 200 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return;
-#line 1196 "Preferences.c"
+#line 1296 "Preferences.c"
}
#line 203 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp6_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
+ _tmp4_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
#line 203 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_object_ref_sink (_tmp6_);
+ g_object_ref_sink (_tmp4_);
#line 203 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- pixbuf_renderer = _tmp6_;
+ pixbuf_renderer = _tmp4_;
#line 204 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp7_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+ _tmp5_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
#line 204 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_object_ref_sink (_tmp7_);
+ g_object_ref_sink (_tmp5_);
#line 204 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- text_renderer = _tmp7_;
+ text_renderer = _tmp5_;
#line 205 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp8_ = combo_box;
-#line 205 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_cell_layout_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout));
-#line 206 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp9_ = combo_box;
+ gtk_cell_layout_clear (G_TYPE_CHECK_INSTANCE_CAST (combo_box, gtk_cell_layout_get_type (), GtkCellLayout));
#line 206 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp10_ = pixbuf_renderer;
+ _tmp6_ = pixbuf_renderer;
#line 206 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE);
-#line 207 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp11_ = combo_box;
+ gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (combo_box, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE);
#line 207 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp12_ = text_renderer;
+ _tmp7_ = text_renderer;
#line 207 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE);
+ gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (combo_box, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE);
#line 208 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp13_ = combo_box;
+ _tmp8_ = pixbuf_renderer;
#line 208 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp14_ = pixbuf_renderer;
-#line 208 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0);
-#line 209 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp15_ = combo_box;
+ gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (combo_box, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0);
#line 209 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp16_ = text_renderer;
+ _tmp9_ = text_renderer;
#line 209 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1);
+ gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (combo_box, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1);
#line 212 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp17_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
+ _tmp10_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
#line 212 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- combo_store = _tmp17_;
+ combo_store = _tmp10_;
#line 215 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
current_app = -1;
-#line 1244 "Preferences.c"
+#line 1334 "Preferences.c"
{
GeeIterator* _app_it = NULL;
- SortedList* _tmp18_;
- GeeIterator* _tmp19_;
+ SortedList* _tmp11_;
+ GeeIterator* _tmp12_;
#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp18_ = _vala_external_apps;
+ _tmp11_ = _vala_external_apps;
#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable));
#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _app_it = _tmp19_;
+ _app_it = _tmp12_;
#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
while (TRUE) {
-#line 1257 "Preferences.c"
- GeeIterator* _tmp20_;
- gboolean _tmp21_;
+#line 1347 "Preferences.c"
+ GeeIterator* _tmp13_;
GAppInfo* app = NULL;
- GeeIterator* _tmp22_;
- gpointer _tmp23_;
- GtkListStore* _tmp24_;
- GtkTreeIter _tmp25_ = {0};
+ GeeIterator* _tmp14_;
+ gpointer _tmp15_;
+ GtkListStore* _tmp16_;
+ GtkTreeIter _tmp17_ = {0};
GIcon* app_icon = NULL;
- GAppInfo* _tmp26_;
- GIcon* _tmp27_;
- GIcon* _tmp28_;
- GtkListStore* _tmp56_;
- GtkTreeIter _tmp57_;
- GAppInfo* _tmp58_;
- const gchar* _tmp59_;
- GValue _tmp60_ = {0};
- GAppInfo* _tmp61_;
- const gchar* _tmp62_;
- const gchar* _tmp63_;
-#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp20_ = _app_it;
+ GAppInfo* _tmp18_;
+ GIcon* _tmp19_;
+ GIcon* _tmp20_;
+ GtkListStore* _tmp48_;
+ GtkTreeIter _tmp49_;
+ GAppInfo* _tmp50_;
+ const gchar* _tmp51_;
+ GValue _tmp52_ = {0};
+ GAppInfo* _tmp53_;
+ const gchar* _tmp54_;
#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp21_ = gee_iterator_next (_tmp20_);
+ _tmp13_ = _app_it;
#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- if (!_tmp21_) {
+ if (!gee_iterator_next (_tmp13_)) {
#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
break;
-#line 1285 "Preferences.c"
+#line 1371 "Preferences.c"
}
#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp22_ = _app_it;
+ _tmp14_ = _app_it;
#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp23_ = gee_iterator_get (_tmp22_);
+ _tmp15_ = gee_iterator_get (_tmp14_);
#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- app = (GAppInfo*) _tmp23_;
+ app = (GAppInfo*) _tmp15_;
#line 218 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp24_ = combo_store;
+ _tmp16_ = combo_store;
#line 218 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_list_store_append (_tmp24_, &_tmp25_);
+ gtk_list_store_append (_tmp16_, &_tmp17_);
#line 218 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- iter = _tmp25_;
+ iter = _tmp17_;
#line 220 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp26_ = app;
+ _tmp18_ = app;
#line 220 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp27_ = g_app_info_get_icon (_tmp26_);
+ _tmp19_ = g_app_info_get_icon (_tmp18_);
#line 220 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp28_ = _g_object_ref0 (_tmp27_);
+ _tmp20_ = _g_object_ref0 (_tmp19_);
#line 220 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- app_icon = _tmp28_;
-#line 1307 "Preferences.c"
+ app_icon = _tmp20_;
+#line 1393 "Preferences.c"
{
- GIcon* _tmp29_;
+ GIcon* _tmp21_;
#line 222 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp29_ = app_icon;
+ _tmp21_ = app_icon;
#line 222 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, g_file_icon_get_type ())) {
-#line 1314 "Preferences.c"
- GdkPixbuf* _tmp30_ = NULL;
- GIcon* _tmp31_;
- GFile* _tmp32_;
- gchar* _tmp33_;
- gchar* _tmp34_;
- GdkPixbuf* _tmp35_;
- GdkPixbuf* _tmp36_;
- GtkListStore* _tmp37_;
- GtkTreeIter _tmp38_;
- GdkPixbuf* _tmp39_;
- GValue _tmp40_ = {0};
+ if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, g_file_icon_get_type ())) {
+#line 1400 "Preferences.c"
+ GdkPixbuf* _tmp22_ = NULL;
+ GIcon* _tmp23_;
+ GFile* _tmp24_;
+ gchar* _tmp25_;
+ gchar* _tmp26_;
+ GdkPixbuf* _tmp27_;
+ GdkPixbuf* _tmp28_;
+ GtkListStore* _tmp29_;
+ GtkTreeIter _tmp30_;
+ GdkPixbuf* _tmp31_;
+ GValue _tmp32_ = {0};
#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp31_ = app_icon;
+ _tmp23_ = app_icon;
#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp32_ = g_file_icon_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_file_icon_get_type (), GFileIcon));
+ _tmp24_ = g_file_icon_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, g_file_icon_get_type (), GFileIcon));
#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp33_ = g_file_get_path (_tmp32_);
+ _tmp25_ = g_file_get_path (_tmp24_);
#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp34_ = _tmp33_;
+ _tmp26_ = _tmp25_;
#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp35_ = gdk_pixbuf_new_from_file (_tmp34_, &_inner_error_);
+ _tmp27_ = gdk_pixbuf_new_from_file (_tmp26_, &_inner_error_);
#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp36_ = _tmp35_;
+ _tmp28_ = _tmp27_;
#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_free0 (_tmp34_);
+ _g_free0 (_tmp26_);
#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp30_ = _tmp36_;
+ _tmp22_ = _tmp28_;
#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1344 "Preferences.c"
+#line 1430 "Preferences.c"
goto __catch23_g_error;
}
#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp37_ = combo_store;
+ _tmp29_ = combo_store;
#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp38_ = iter;
+ _tmp30_ = iter;
#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp39_ = scale_pixbuf (_tmp30_, RESOURCES_DEFAULT_ICON_SCALE, GDK_INTERP_BILINEAR, FALSE);
+ _tmp31_ = scale_pixbuf (_tmp22_, RESOURCES_DEFAULT_ICON_SCALE, GDK_INTERP_BILINEAR, FALSE);
#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_value_init (&_tmp40_, gdk_pixbuf_get_type ());
+ g_value_init (&_tmp32_, gdk_pixbuf_get_type ());
#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_value_take_object (&_tmp40_, _tmp39_);
+ g_value_take_object (&_tmp32_, _tmp31_);
#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_list_store_set_value (_tmp37_, &_tmp38_, 0, &_tmp40_);
+ gtk_list_store_set_value (_tmp29_, &_tmp30_, 0, &_tmp32_);
#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- G_IS_VALUE (&_tmp40_) ? (g_value_unset (&_tmp40_), NULL) : NULL;
+ G_IS_VALUE (&_tmp32_) ? (g_value_unset (&_tmp32_), NULL) : NULL;
#line 222 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_object_unref0 (_tmp30_);
-#line 1363 "Preferences.c"
+ _g_object_unref0 (_tmp22_);
+#line 1449 "Preferences.c"
} else {
- GIcon* _tmp41_;
+ GIcon* _tmp33_;
#line 226 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp41_ = app_icon;
+ _tmp33_ = app_icon;
#line 226 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, g_themed_icon_get_type ())) {
-#line 1370 "Preferences.c"
+ if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp33_, g_themed_icon_get_type ())) {
+#line 1456 "Preferences.c"
GdkPixbuf* icon_pixbuf = NULL;
- GtkIconTheme* _tmp42_;
- GIcon* _tmp43_;
- gchar** _tmp44_;
- gchar** _tmp45_;
- const gchar* _tmp46_;
- GdkPixbuf* _tmp47_;
- GtkListStore* _tmp48_;
- GtkTreeIter _tmp49_;
- GdkPixbuf* _tmp50_;
- GValue _tmp51_ = {0};
+ GtkIconTheme* _tmp34_;
+ GIcon* _tmp35_;
+ gchar** _tmp36_;
+ gchar** _tmp37_;
+ const gchar* _tmp38_;
+ GdkPixbuf* _tmp39_;
+ GtkListStore* _tmp40_;
+ GtkTreeIter _tmp41_;
+ GdkPixbuf* _tmp42_;
+ GValue _tmp43_ = {0};
#line 227 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp42_ = gtk_icon_theme_get_default ();
+ _tmp34_ = gtk_icon_theme_get_default ();
#line 227 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp43_ = app_icon;
+ _tmp35_ = app_icon;
#line 227 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp45_ = _tmp44_ = g_themed_icon_get_names (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, g_themed_icon_get_type (), GThemedIcon));
+ _tmp37_ = _tmp36_ = g_themed_icon_get_names (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, g_themed_icon_get_type (), GThemedIcon));
#line 227 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp46_ = _tmp45_[0];
+ _tmp38_ = _tmp37_[0];
#line 227 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp47_ = gtk_icon_theme_load_icon (_tmp42_, _tmp46_, RESOURCES_DEFAULT_ICON_SCALE, GTK_ICON_LOOKUP_FORCE_SIZE, &_inner_error_);
+ _tmp39_ = gtk_icon_theme_load_icon (_tmp34_, _tmp38_, RESOURCES_DEFAULT_ICON_SCALE, GTK_ICON_LOOKUP_FORCE_SIZE, &_inner_error_);
#line 227 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- icon_pixbuf = _tmp47_;
+ icon_pixbuf = _tmp39_;
#line 227 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1396 "Preferences.c"
+#line 1482 "Preferences.c"
goto __catch23_g_error;
}
#line 231 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp48_ = combo_store;
+ _tmp40_ = combo_store;
#line 231 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp49_ = iter;
+ _tmp41_ = iter;
#line 231 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp50_ = icon_pixbuf;
+ _tmp42_ = icon_pixbuf;
#line 231 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_value_init (&_tmp51_, gdk_pixbuf_get_type ());
+ g_value_init (&_tmp43_, gdk_pixbuf_get_type ());
#line 231 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_value_set_object (&_tmp51_, _tmp50_);
+ g_value_set_object (&_tmp43_, _tmp42_);
#line 231 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_list_store_set_value (_tmp48_, &_tmp49_, 0, &_tmp51_);
+ gtk_list_store_set_value (_tmp40_, &_tmp41_, 0, &_tmp43_);
#line 231 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- G_IS_VALUE (&_tmp51_) ? (g_value_unset (&_tmp51_), NULL) : NULL;
+ G_IS_VALUE (&_tmp43_) ? (g_value_unset (&_tmp43_), NULL) : NULL;
#line 226 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_object_unref0 (icon_pixbuf);
-#line 1415 "Preferences.c"
+#line 1501 "Preferences.c"
}
}
}
@@ -1419,29 +1505,29 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
__catch23_g_error:
{
GError* _error_ = NULL;
- GError* _tmp52_;
- const gchar* _tmp53_;
- gchar* _tmp54_;
- gchar* _tmp55_;
+ GError* _tmp44_;
+ const gchar* _tmp45_;
+ gchar* _tmp46_;
+ gchar* _tmp47_;
#line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_error_ = _inner_error_;
#line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_inner_error_ = NULL;
#line 234 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp52_ = _error_;
+ _tmp44_ = _error_;
#line 234 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp53_ = _tmp52_->message;
+ _tmp45_ = _tmp44_->message;
#line 234 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp54_ = g_strconcat ("Error loading icon pixbuf: ", _tmp53_, NULL);
+ _tmp46_ = g_strconcat ("Error loading icon pixbuf: ", _tmp45_, NULL);
#line 234 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp55_ = _tmp54_;
+ _tmp47_ = _tmp46_;
#line 234 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_warning ("Preferences.vala:234: %s", _tmp55_);
+ g_warning ("Preferences.vala:234: %s", _tmp47_);
#line 234 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_free0 (_tmp55_);
+ _g_free0 (_tmp47_);
#line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_error_free0 (_error_);
-#line 1445 "Preferences.c"
+#line 1531 "Preferences.c"
}
__finally23:
#line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
@@ -1464,76 +1550,66 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
g_clear_error (&_inner_error_);
#line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return;
-#line 1468 "Preferences.c"
+#line 1554 "Preferences.c"
}
#line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp56_ = combo_store;
+ _tmp48_ = combo_store;
#line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp57_ = iter;
+ _tmp49_ = iter;
#line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp58_ = app;
+ _tmp50_ = app;
#line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp59_ = g_app_info_get_name (_tmp58_);
+ _tmp51_ = g_app_info_get_name (_tmp50_);
#line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_value_init (&_tmp60_, G_TYPE_STRING);
+ g_value_init (&_tmp52_, G_TYPE_STRING);
#line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_value_set_string (&_tmp60_, _tmp59_);
+ g_value_set_string (&_tmp52_, _tmp51_);
#line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_list_store_set_value (_tmp56_, &_tmp57_, 1, &_tmp60_);
+ gtk_list_store_set_value (_tmp48_, &_tmp49_, 1, &_tmp52_);
#line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- G_IS_VALUE (&_tmp60_) ? (g_value_unset (&_tmp60_), NULL) : NULL;
+ G_IS_VALUE (&_tmp52_) ? (g_value_unset (&_tmp52_), NULL) : NULL;
#line 239 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp61_ = app;
+ _tmp53_ = app;
#line 239 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp62_ = g_app_info_get_commandline (_tmp61_);
+ _tmp54_ = g_app_info_get_commandline (_tmp53_);
#line 239 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp63_ = current_app_executable;
-#line 239 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- if (g_strcmp0 (_tmp62_, _tmp63_) == 0) {
-#line 1494 "Preferences.c"
- SortedList* _tmp64_;
- GAppInfo* _tmp65_;
- gint _tmp66_;
-#line 240 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp64_ = _vala_external_apps;
+ if (g_strcmp0 (_tmp54_, current_app_executable) == 0) {
+#line 1578 "Preferences.c"
+ SortedList* _tmp55_;
+ GAppInfo* _tmp56_;
#line 240 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp65_ = app;
+ _tmp55_ = _vala_external_apps;
#line 240 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp66_ = sorted_list_index_of (_tmp64_, _tmp65_);
+ _tmp56_ = app;
#line 240 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- current_app = _tmp66_;
-#line 1506 "Preferences.c"
+ current_app = sorted_list_index_of (_tmp55_, _tmp56_);
+#line 1587 "Preferences.c"
}
#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_object_unref0 (app_icon);
#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_object_unref0 (app);
-#line 1512 "Preferences.c"
+#line 1593 "Preferences.c"
}
#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_object_unref0 (_app_it);
-#line 1516 "Preferences.c"
+#line 1597 "Preferences.c"
}
#line 245 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp67_ = combo_box;
-#line 245 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp68_ = combo_store;
+ _tmp57_ = combo_store;
#line 245 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_combo_box_set_model (_tmp67_, G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
+ gtk_combo_box_set_model (combo_box, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_tree_model_get_type (), GtkTreeModel));
#line 247 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp69_ = current_app;
+ _tmp58_ = current_app;
#line 247 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- if (_tmp69_ != -1) {
-#line 1528 "Preferences.c"
- GtkComboBox* _tmp70_;
- gint _tmp71_;
+ if (_tmp58_ != -1) {
+#line 1607 "Preferences.c"
+ gint _tmp59_;
#line 248 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp70_ = combo_box;
+ _tmp59_ = current_app;
#line 248 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp71_ = current_app;
-#line 248 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_combo_box_set_active (_tmp70_, _tmp71_);
-#line 1537 "Preferences.c"
+ gtk_combo_box_set_active (combo_box, _tmp59_);
+#line 1613 "Preferences.c"
}
#line 193 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_object_unref0 (combo_store);
@@ -1545,16 +1621,20 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
if (external_apps) {
#line 193 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
*external_apps = _vala_external_apps;
-#line 1549 "Preferences.c"
+#line 1625 "Preferences.c"
} else {
#line 193 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_object_unref0 (_vala_external_apps);
-#line 1553 "Preferences.c"
+#line 1629 "Preferences.c"
}
}
-static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkComboBox* combo_box, GtkEntry* entry) {
+static void
+preferences_dialog_setup_dir_pattern (PreferencesDialog* self,
+ GtkComboBox* combo_box,
+ GtkEntry* entry)
+{
gchar* pattern = NULL;
ConfigFacade* _tmp0_;
ConfigFacade* _tmp1_;
@@ -1562,7 +1642,7 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
gchar* _tmp3_;
gboolean found = FALSE;
const gchar* _tmp4_;
- gboolean _tmp32_;
+ gboolean _tmp29_;
#line 251 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_if_fail (IS_PREFERENCES_DIALOG (self));
#line 251 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
@@ -1587,11 +1667,11 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
_tmp4_ = pattern;
#line 254 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (NULL != _tmp4_) {
-#line 1591 "Preferences.c"
+#line 1671 "Preferences.c"
gint i = 0;
#line 256 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
i = 0;
-#line 1595 "Preferences.c"
+#line 1675 "Preferences.c"
{
GeeArrayList* _pf_list = NULL;
GeeArrayList* _tmp5_;
@@ -1619,7 +1699,7 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
_pf_index = -1;
#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
while (TRUE) {
-#line 1623 "Preferences.c"
+#line 1703 "Preferences.c"
gint _tmp10_;
gint _tmp11_;
gint _tmp12_;
@@ -1630,7 +1710,7 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
PreferencesDialogPathFormat* _tmp16_;
const gchar* _tmp17_;
const gchar* _tmp18_;
- gint _tmp21_;
+ gint _tmp20_;
#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp10_ = _pf_index;
#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
@@ -1643,7 +1723,7 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
if (!(_tmp11_ < _tmp12_)) {
#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
break;
-#line 1647 "Preferences.c"
+#line 1727 "Preferences.c"
}
#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp13_ = _pf_list;
@@ -1661,105 +1741,94 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
_tmp18_ = pattern;
#line 258 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (g_strcmp0 (_tmp17_, _tmp18_) == 0) {
-#line 1665 "Preferences.c"
- GtkComboBox* _tmp19_;
- gint _tmp20_;
-#line 259 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp19_ = combo_box;
+#line 1745 "Preferences.c"
+ gint _tmp19_;
#line 259 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp20_ = i;
+ _tmp19_ = i;
#line 259 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_combo_box_set_active (_tmp19_, _tmp20_);
+ gtk_combo_box_set_active (combo_box, _tmp19_);
#line 260 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
found = TRUE;
#line 261 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_preferences_dialog_path_format_unref0 (pf);
#line 261 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
break;
-#line 1680 "Preferences.c"
+#line 1757 "Preferences.c"
}
#line 263 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp21_ = i;
+ _tmp20_ = i;
#line 263 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- i = _tmp21_ + 1;
+ i = _tmp20_ + 1;
#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_preferences_dialog_path_format_unref0 (pf);
-#line 1688 "Preferences.c"
+#line 1765 "Preferences.c"
}
#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_object_unref0 (_pf_list);
-#line 1692 "Preferences.c"
+#line 1769 "Preferences.c"
}
} else {
gchar* s = NULL;
+ ConfigFacade* _tmp21_;
ConfigFacade* _tmp22_;
- ConfigFacade* _tmp23_;
+ gchar* _tmp23_;
gchar* _tmp24_;
- gchar* _tmp25_;
- const gchar* _tmp26_;
- gboolean _tmp27_;
+ const gchar* _tmp25_;
#line 267 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp22_ = config_facade_get_instance ();
+ _tmp21_ = config_facade_get_instance ();
#line 267 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp23_ = _tmp22_;
+ _tmp22_ = _tmp21_;
#line 267 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp24_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp23_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 267 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp25_ = _tmp24_;
+ _tmp24_ = _tmp23_;
#line 267 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_object_unref0 (_tmp23_);
+ _g_object_unref0 (_tmp22_);
#line 267 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- s = _tmp25_;
-#line 268 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp26_ = s;
+ s = _tmp24_;
#line 268 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp27_ = is_string_empty (_tmp26_);
+ _tmp25_ = s;
#line 268 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- if (!_tmp27_) {
-#line 1720 "Preferences.c"
- GtkComboBox* _tmp28_;
- GeeArrayList* _tmp29_;
- gint _tmp30_;
- gint _tmp31_;
+ if (!is_string_empty (_tmp25_)) {
+#line 1794 "Preferences.c"
+ GeeArrayList* _tmp26_;
+ gint _tmp27_;
+ gint _tmp28_;
#line 269 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp28_ = combo_box;
+ _tmp26_ = self->priv->path_formats;
#line 269 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp29_ = self->priv->path_formats;
+ _tmp27_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 269 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+ _tmp28_ = _tmp27_;
#line 269 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp31_ = _tmp30_;
-#line 269 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_combo_box_set_active (_tmp28_, _tmp31_ - 1);
+ gtk_combo_box_set_active (combo_box, _tmp28_ - 1);
#line 270 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
found = TRUE;
-#line 1737 "Preferences.c"
+#line 1808 "Preferences.c"
}
#line 254 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_free0 (s);
-#line 1741 "Preferences.c"
+#line 1812 "Preferences.c"
}
#line 274 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp32_ = found;
+ _tmp29_ = found;
#line 274 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- if (!_tmp32_) {
-#line 1747 "Preferences.c"
- GtkComboBox* _tmp33_;
-#line 275 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp33_ = combo_box;
+ if (!_tmp29_) {
#line 275 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_combo_box_set_active (_tmp33_, 0);
-#line 1753 "Preferences.c"
+ gtk_combo_box_set_active (combo_box, 0);
+#line 1820 "Preferences.c"
}
#line 278 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_on_dir_pattern_combo_changed (self);
#line 251 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_free0 (pattern);
-#line 1759 "Preferences.c"
+#line 1826 "Preferences.c"
}
-void preferences_dialog_show_preferences (void) {
+void
+preferences_dialog_show_preferences (void)
+{
PreferencesDialog* _tmp0_;
PreferencesDialog* _tmp2_;
PreferencesDialog* _tmp3_;
@@ -1774,7 +1843,7 @@ void preferences_dialog_show_preferences (void) {
_tmp0_ = preferences_dialog_preferences_dialog;
#line 282 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (_tmp0_ == NULL) {
-#line 1778 "Preferences.c"
+#line 1847 "Preferences.c"
PreferencesDialog* _tmp1_;
#line 283 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp1_ = preferences_dialog_new ();
@@ -1784,7 +1853,7 @@ void preferences_dialog_show_preferences (void) {
_g_object_unref0 (preferences_dialog_preferences_dialog);
#line 283 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_preferences_dialog = _tmp1_;
-#line 1788 "Preferences.c"
+#line 1857 "Preferences.c"
}
#line 285 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp2_ = preferences_dialog_preferences_dialog;
@@ -1807,7 +1876,7 @@ void preferences_dialog_show_preferences (void) {
#line 287 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp9_ = _tmp8_;
#line 287 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp9_);
+ gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_file_chooser_get_type (), GtkFileChooser), _tmp9_);
#line 287 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_free0 (_tmp9_);
#line 287 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
@@ -1816,11 +1885,13 @@ void preferences_dialog_show_preferences (void) {
_tmp10_ = preferences_dialog_preferences_dialog;
#line 291 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow));
-#line 1820 "Preferences.c"
+#line 1889 "Preferences.c"
}
-static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
+static void
+preferences_dialog_commit_on_close (PreferencesDialog* self)
+{
ConfigFacade* _tmp0_;
ConfigFacade* _tmp1_;
ConfigFacade* _tmp2_;
@@ -1837,10 +1908,9 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
PreferencesDialogPathFormat* pf = NULL;
GeeArrayList* _tmp14_;
GtkComboBoxText* _tmp15_;
- gint _tmp16_;
- gpointer _tmp17_;
- PreferencesDialogPathFormat* _tmp18_;
- const gchar* _tmp19_;
+ gpointer _tmp16_;
+ PreferencesDialogPathFormat* _tmp17_;
+ const gchar* _tmp18_;
#line 296 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_if_fail (IS_PREFERENCES_DIALOG (self));
#line 297 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
@@ -1883,250 +1953,228 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
_tmp12_ = self->priv->lib_dir;
#line 301 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (_tmp12_ != NULL) {
-#line 1887 "Preferences.c"
+#line 1957 "Preferences.c"
const gchar* _tmp13_;
#line 302 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp13_ = self->priv->lib_dir;
#line 302 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
app_dirs_set_import_dir (_tmp13_);
-#line 1893 "Preferences.c"
+#line 1963 "Preferences.c"
}
#line 304 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp14_ = self->priv->path_formats;
#line 304 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp15_ = self->priv->dir_pattern_combo;
#line 304 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp16_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_combo_box_get_type (), GtkComboBox));
-#line 304 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp17_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp16_);
+ _tmp16_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_combo_box_get_type (), GtkComboBox)));
#line 304 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- pf = (PreferencesDialogPathFormat*) _tmp17_;
+ pf = (PreferencesDialogPathFormat*) _tmp16_;
#line 305 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp18_ = pf;
+ _tmp17_ = pf;
#line 305 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp19_ = _tmp18_->pattern;
+ _tmp18_ = _tmp17_->pattern;
#line 305 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- if (NULL == _tmp19_) {
-#line 1911 "Preferences.c"
+ if (NULL == _tmp18_) {
+#line 1979 "Preferences.c"
+ ConfigFacade* _tmp19_;
ConfigFacade* _tmp20_;
- ConfigFacade* _tmp21_;
- GtkEntry* _tmp22_;
+ GtkEntry* _tmp21_;
+ const gchar* _tmp22_;
const gchar* _tmp23_;
- const gchar* _tmp24_;
+ ConfigFacade* _tmp24_;
ConfigFacade* _tmp25_;
- ConfigFacade* _tmp26_;
#line 306 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp20_ = config_facade_get_instance ();
+ _tmp19_ = config_facade_get_instance ();
#line 306 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp21_ = _tmp20_;
+ _tmp20_ = _tmp19_;
#line 306 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp22_ = self->priv->dir_pattern_entry;
+ _tmp21_ = self->priv->dir_pattern_entry;
#line 306 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp23_ = gtk_entry_get_text (_tmp22_);
+ _tmp22_ = gtk_entry_get_text (_tmp21_);
#line 306 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp24_ = _tmp23_;
+ _tmp23_ = _tmp22_;
#line 306 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- configuration_facade_set_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp24_);
+ configuration_facade_set_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp23_);
#line 306 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_object_unref0 (_tmp21_);
+ _g_object_unref0 (_tmp20_);
#line 307 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp25_ = config_facade_get_instance ();
+ _tmp24_ = config_facade_get_instance ();
#line 307 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp26_ = _tmp25_;
+ _tmp25_ = _tmp24_;
#line 307 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), NULL);
+ configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), NULL);
#line 307 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_object_unref0 (_tmp26_);
-#line 1941 "Preferences.c"
+ _g_object_unref0 (_tmp25_);
+#line 2009 "Preferences.c"
} else {
+ ConfigFacade* _tmp26_;
ConfigFacade* _tmp27_;
- ConfigFacade* _tmp28_;
- PreferencesDialogPathFormat* _tmp29_;
- const gchar* _tmp30_;
+ PreferencesDialogPathFormat* _tmp28_;
+ const gchar* _tmp29_;
#line 309 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp27_ = config_facade_get_instance ();
+ _tmp26_ = config_facade_get_instance ();
#line 309 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp28_ = _tmp27_;
+ _tmp27_ = _tmp26_;
#line 309 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp29_ = pf;
+ _tmp28_ = pf;
#line 309 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp30_ = _tmp29_->pattern;
+ _tmp29_ = _tmp28_->pattern;
#line 309 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp30_);
+ configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp29_);
#line 309 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_object_unref0 (_tmp28_);
-#line 1959 "Preferences.c"
+ _g_object_unref0 (_tmp27_);
+#line 2027 "Preferences.c"
}
#line 296 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_preferences_dialog_path_format_unref0 (pf);
-#line 1963 "Preferences.c"
+#line 2031 "Preferences.c"
}
-static gboolean preferences_dialog_on_delete (PreferencesDialog* self) {
+static gboolean
+preferences_dialog_on_delete (PreferencesDialog* self)
+{
gboolean result = FALSE;
- gboolean _tmp0_;
- gboolean _tmp1_;
#line 313 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
#line 314 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp0_ = preferences_dialog_get_allow_closing (self);
-#line 314 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- if (!_tmp0_) {
+ if (!preferences_dialog_get_allow_closing (self)) {
#line 315 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
result = TRUE;
#line 315 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return result;
-#line 1981 "Preferences.c"
+#line 2047 "Preferences.c"
}
#line 317 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_commit_on_close (self);
#line 318 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp1_ = gtk_widget_hide_on_delete (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 318 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- result = _tmp1_;
+ result = gtk_widget_hide_on_delete (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 318 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return result;
-#line 1991 "Preferences.c"
+#line 2055 "Preferences.c"
}
-static void preferences_dialog_on_close (PreferencesDialog* self) {
- gboolean _tmp0_;
+static void
+preferences_dialog_on_close (PreferencesDialog* self)
+{
#line 321 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_if_fail (IS_PREFERENCES_DIALOG (self));
#line 322 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp0_ = preferences_dialog_get_allow_closing (self);
-#line 322 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- if (!_tmp0_) {
+ if (!preferences_dialog_get_allow_closing (self)) {
#line 323 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return;
-#line 2005 "Preferences.c"
+#line 2068 "Preferences.c"
}
#line 325 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 326 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_commit_on_close (self);
-#line 2011 "Preferences.c"
+#line 2074 "Preferences.c"
}
-static void preferences_dialog_on_value_changed (PreferencesDialog* self) {
+static void
+preferences_dialog_on_value_changed (PreferencesDialog* self)
+{
GtkAdjustment* _tmp0_;
- gdouble _tmp1_;
- GtkAdjustment* _tmp2_;
- gdouble _tmp3_;
+ GtkAdjustment* _tmp1_;
#line 329 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_if_fail (IS_PREFERENCES_DIALOG (self));
#line 330 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp0_ = self->priv->bg_color_adjustment;
#line 330 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp1_ = gtk_adjustment_get_upper (_tmp0_);
+ _tmp1_ = self->priv->bg_color_adjustment;
#line 330 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp2_ = self->priv->bg_color_adjustment;
-#line 330 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp3_ = gtk_adjustment_get_value (_tmp2_);
-#line 330 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- preferences_dialog_set_background_color (self, ((gdouble) (_tmp1_ - _tmp3_)) / 65535.0);
-#line 2032 "Preferences.c"
+ preferences_dialog_set_background_color (self, ((gdouble) (gtk_adjustment_get_upper (_tmp0_) - gtk_adjustment_get_value (_tmp1_))) / 65535.0);
+#line 2091 "Preferences.c"
}
-static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, GdkEventButton* event) {
+static gboolean
+preferences_dialog_on_bg_color_reset (PreferencesDialog* self,
+ GdkEventButton* event)
+{
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
- GdkEventButton* _tmp2_;
- guint _tmp3_;
+ guint _tmp2_;
#line 334 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
#line 334 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_val_if_fail (event != NULL, FALSE);
#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp2_ = event;
-#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp3_ = _tmp2_->button;
-#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- if (_tmp3_ == ((guint) 1)) {
-#line 2052 "Preferences.c"
- GdkEventButton* _tmp4_;
- GdkEventType _tmp5_;
+ _tmp2_ = event->button;
#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp4_ = event;
+ if (_tmp2_ == ((guint) 1)) {
+#line 2111 "Preferences.c"
+ GdkEventType _tmp3_;
#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp5_ = _tmp4_->type;
+ _tmp3_ = event->type;
#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp1_ = _tmp5_ == GDK_BUTTON_PRESS;
-#line 2061 "Preferences.c"
+ _tmp1_ = _tmp3_ == GDK_BUTTON_PRESS;
+#line 2117 "Preferences.c"
} else {
#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp1_ = FALSE;
-#line 2065 "Preferences.c"
+#line 2121 "Preferences.c"
}
#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (_tmp1_) {
-#line 2069 "Preferences.c"
- GdkEventButton* _tmp6_;
- GdkModifierType _tmp7_;
- gboolean _tmp8_;
+#line 2125 "Preferences.c"
+ GdkModifierType _tmp4_;
#line 336 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp6_ = event;
+ _tmp4_ = event->state;
#line 336 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp7_ = _tmp6_->state;
-#line 336 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp8_ = has_only_key_modifier (_tmp7_, GDK_CONTROL_MASK);
-#line 336 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp0_ = _tmp8_;
-#line 2081 "Preferences.c"
+ _tmp0_ = has_only_key_modifier (_tmp4_, GDK_CONTROL_MASK);
+#line 2131 "Preferences.c"
} else {
#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp0_ = FALSE;
-#line 2085 "Preferences.c"
+#line 2135 "Preferences.c"
}
#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (_tmp0_) {
-#line 2089 "Preferences.c"
- GtkScale* _tmp9_;
- GtkAdjustment* _tmp10_;
- gdouble _tmp11_;
- GdkRGBA _tmp12_ = {0};
- gdouble _tmp13_;
+#line 2139 "Preferences.c"
+ GtkScale* _tmp5_;
+ GtkAdjustment* _tmp6_;
+ GdkRGBA _tmp7_ = {0};
+ gdouble _tmp8_;
#line 338 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp9_ = self->priv->bg_color_slider;
+ _tmp5_ = self->priv->bg_color_slider;
#line 338 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp10_ = self->priv->bg_color_adjustment;
+ _tmp6_ = self->priv->bg_color_adjustment;
#line 338 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp11_ = gtk_adjustment_get_upper (_tmp10_);
+ parse_color (CONFIG_FACADE_DEFAULT_BG_COLOR, &_tmp7_);
#line 338 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- parse_color (CONFIG_FACADE_DEFAULT_BG_COLOR, &_tmp12_);
+ _tmp8_ = _tmp7_.red;
#line 338 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp13_ = _tmp12_.red;
-#line 338 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), _tmp11_ - (_tmp13_ * 65536.0f));
+ gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_range_get_type (), GtkRange), gtk_adjustment_get_upper (_tmp6_) - (_tmp8_ * 65536.0f));
#line 340 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_on_value_changed (self);
#line 342 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
result = TRUE;
#line 342 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return result;
-#line 2113 "Preferences.c"
+#line 2160 "Preferences.c"
}
#line 345 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
result = FALSE;
#line 345 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return result;
-#line 2119 "Preferences.c"
+#line 2166 "Preferences.c"
}
-static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog* self) {
+static void
+preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog* self)
+{
PreferencesDialogPathFormat* pf = NULL;
GeeArrayList* _tmp0_;
GtkComboBoxText* _tmp1_;
- gint _tmp2_;
- gpointer _tmp3_;
- PreferencesDialogPathFormat* _tmp4_;
- const gchar* _tmp5_;
+ gpointer _tmp2_;
+ PreferencesDialogPathFormat* _tmp3_;
+ const gchar* _tmp4_;
#line 348 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_if_fail (IS_PREFERENCES_DIALOG (self));
#line 349 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
@@ -2134,105 +2182,102 @@ static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog*
#line 349 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp1_ = self->priv->dir_pattern_combo;
#line 349 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 349 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp3_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp2_);
+ _tmp2_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)));
#line 349 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- pf = (PreferencesDialogPathFormat*) _tmp3_;
+ pf = (PreferencesDialogPathFormat*) _tmp2_;
#line 350 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp4_ = pf;
+ _tmp3_ = pf;
#line 350 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp5_ = _tmp4_->pattern;
+ _tmp4_ = _tmp3_->pattern;
#line 350 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- if (NULL == _tmp5_) {
-#line 2149 "Preferences.c"
+ if (NULL == _tmp4_) {
+#line 2195 "Preferences.c"
gchar* dir_pattern = NULL;
+ ConfigFacade* _tmp5_;
ConfigFacade* _tmp6_;
- ConfigFacade* _tmp7_;
+ gchar* _tmp7_;
gchar* _tmp8_;
- gchar* _tmp9_;
- const gchar* _tmp10_;
- gboolean _tmp11_;
+ const gchar* _tmp9_;
+ GtkEntry* _tmp11_;
+ const gchar* _tmp12_;
GtkEntry* _tmp13_;
- const gchar* _tmp14_;
- GtkEntry* _tmp15_;
- GtkEntry* _tmp16_;
+ GtkEntry* _tmp14_;
#line 352 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp6_ = config_facade_get_instance ();
+ _tmp5_ = config_facade_get_instance ();
#line 352 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 352 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp8_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp7_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 352 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 352 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_object_unref0 (_tmp7_);
+ _g_object_unref0 (_tmp6_);
#line 352 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- dir_pattern = _tmp9_;
-#line 353 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp10_ = dir_pattern;
+ dir_pattern = _tmp8_;
#line 353 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp11_ = is_string_empty (_tmp10_);
+ _tmp9_ = dir_pattern;
#line 353 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- if (_tmp11_) {
-#line 2179 "Preferences.c"
- gchar* _tmp12_;
+ if (is_string_empty (_tmp9_)) {
+#line 2222 "Preferences.c"
+ gchar* _tmp10_;
#line 354 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp12_ = g_strdup ("");
+ _tmp10_ = g_strdup ("");
#line 354 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_free0 (dir_pattern);
#line 354 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- dir_pattern = _tmp12_;
-#line 2187 "Preferences.c"
+ dir_pattern = _tmp10_;
+#line 2230 "Preferences.c"
}
#line 355 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp13_ = self->priv->dir_pattern_entry;
+ _tmp11_ = self->priv->dir_pattern_entry;
#line 355 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp14_ = dir_pattern;
+ _tmp12_ = dir_pattern;
#line 355 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_entry_set_text (_tmp13_, _tmp14_);
+ gtk_entry_set_text (_tmp11_, _tmp12_);
#line 356 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp15_ = self->priv->dir_pattern_entry;
+ _tmp13_ = self->priv->dir_pattern_entry;
#line 356 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_object_set (_tmp15_, "editable", TRUE, NULL);
+ g_object_set (_tmp13_, "editable", TRUE, NULL);
#line 357 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp16_ = self->priv->dir_pattern_entry;
+ _tmp14_ = self->priv->dir_pattern_entry;
#line 357 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), TRUE);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 350 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_free0 (dir_pattern);
-#line 2205 "Preferences.c"
+#line 2248 "Preferences.c"
} else {
- GtkEntry* _tmp17_;
- PreferencesDialogPathFormat* _tmp18_;
- const gchar* _tmp19_;
- GtkEntry* _tmp20_;
- GtkEntry* _tmp21_;
+ GtkEntry* _tmp15_;
+ PreferencesDialogPathFormat* _tmp16_;
+ const gchar* _tmp17_;
+ GtkEntry* _tmp18_;
+ GtkEntry* _tmp19_;
#line 359 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp17_ = self->priv->dir_pattern_entry;
+ _tmp15_ = self->priv->dir_pattern_entry;
#line 359 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp18_ = pf;
+ _tmp16_ = pf;
#line 359 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp19_ = _tmp18_->pattern;
+ _tmp17_ = _tmp16_->pattern;
#line 359 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_entry_set_text (_tmp17_, _tmp19_);
+ gtk_entry_set_text (_tmp15_, _tmp17_);
#line 360 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp20_ = self->priv->dir_pattern_entry;
+ _tmp18_ = self->priv->dir_pattern_entry;
#line 360 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_object_set (_tmp20_, "editable", FALSE, NULL);
+ g_object_set (_tmp18_, "editable", FALSE, NULL);
#line 361 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp21_ = self->priv->dir_pattern_entry;
+ _tmp19_ = self->priv->dir_pattern_entry;
#line 361 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2228 "Preferences.c"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 2271 "Preferences.c"
}
#line 348 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_preferences_dialog_path_format_unref0 (pf);
-#line 2232 "Preferences.c"
+#line 2275 "Preferences.c"
}
-static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog* self) {
+static void
+preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog* self)
+{
gchar* example = NULL;
GDateTime* _tmp0_;
GtkEntry* _tmp1_;
@@ -2241,7 +2286,6 @@ static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog*
gchar* _tmp4_;
gboolean _tmp5_ = FALSE;
const gchar* _tmp6_;
- gboolean _tmp7_;
#line 365 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_if_fail (IS_PREFERENCES_DIALOG (self));
#line 366 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
@@ -2259,93 +2303,87 @@ static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog*
#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp6_ = example;
#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp7_ = is_string_empty (_tmp6_);
-#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- if (_tmp7_) {
-#line 2266 "Preferences.c"
- GtkEntry* _tmp8_;
+ if (is_string_empty (_tmp6_)) {
+#line 2308 "Preferences.c"
+ GtkEntry* _tmp7_;
+ const gchar* _tmp8_;
const gchar* _tmp9_;
- const gchar* _tmp10_;
- gboolean _tmp11_;
#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp8_ = self->priv->dir_pattern_entry;
+ _tmp7_ = self->priv->dir_pattern_entry;
#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp9_ = gtk_entry_get_text (_tmp8_);
+ _tmp8_ = gtk_entry_get_text (_tmp7_);
#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp10_ = _tmp9_;
-#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp11_ = is_string_empty (_tmp10_);
+ _tmp9_ = _tmp8_;
#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp5_ = !_tmp11_;
-#line 2281 "Preferences.c"
+ _tmp5_ = !is_string_empty (_tmp9_);
+#line 2320 "Preferences.c"
} else {
#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp5_ = FALSE;
-#line 2285 "Preferences.c"
+#line 2324 "Preferences.c"
}
#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (_tmp5_) {
-#line 2289 "Preferences.c"
- GtkLabel* _tmp12_;
- GtkEntry* _tmp13_;
- GtkEntry* _tmp14_;
+#line 2328 "Preferences.c"
+ GtkLabel* _tmp10_;
+ GtkEntry* _tmp11_;
+ GtkEntry* _tmp12_;
#line 369 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp12_ = self->priv->dir_pattern_example;
+ _tmp10_ = self->priv->dir_pattern_example;
#line 369 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_label_set_text (_tmp12_, _ ("Invalid pattern"));
+ gtk_label_set_text (_tmp10_, _ ("Invalid pattern"));
#line 370 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp13_ = self->priv->dir_pattern_entry;
+ _tmp11_ = self->priv->dir_pattern_entry;
#line 370 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_entry_set_icon_from_icon_name (_tmp13_, GTK_ENTRY_ICON_SECONDARY, "dialog-error");
+ gtk_entry_set_icon_from_icon_name (_tmp11_, GTK_ENTRY_ICON_SECONDARY, "dialog-error");
#line 371 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp14_ = self->priv->dir_pattern_entry;
+ _tmp12_ = self->priv->dir_pattern_entry;
#line 371 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_entry_set_icon_activatable (_tmp14_, GTK_ENTRY_ICON_SECONDARY, FALSE);
+ gtk_entry_set_icon_activatable (_tmp12_, GTK_ENTRY_ICON_SECONDARY, FALSE);
#line 372 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_set_allow_closing (self, FALSE);
-#line 2307 "Preferences.c"
+#line 2346 "Preferences.c"
} else {
- GtkLabel* _tmp15_;
- const gchar* _tmp16_;
- GtkEntry* _tmp17_;
+ GtkLabel* _tmp13_;
+ const gchar* _tmp14_;
+ GtkEntry* _tmp15_;
#line 375 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp15_ = self->priv->dir_pattern_example;
+ _tmp13_ = self->priv->dir_pattern_example;
#line 375 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp16_ = example;
+ _tmp14_ = example;
#line 375 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_label_set_text (_tmp15_, _tmp16_);
+ gtk_label_set_text (_tmp13_, _tmp14_);
#line 376 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp17_ = self->priv->dir_pattern_entry;
+ _tmp15_ = self->priv->dir_pattern_entry;
#line 376 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_entry_set_icon_from_icon_name (_tmp17_, GTK_ENTRY_ICON_SECONDARY, NULL);
+ gtk_entry_set_icon_from_icon_name (_tmp15_, GTK_ENTRY_ICON_SECONDARY, NULL);
#line 377 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_set_allow_closing (self, TRUE);
-#line 2324 "Preferences.c"
+#line 2363 "Preferences.c"
}
#line 365 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_free0 (example);
-#line 2328 "Preferences.c"
+#line 2367 "Preferences.c"
}
-static void preferences_dialog_set_allow_closing (PreferencesDialog* self, gboolean allow) {
- gboolean _tmp0_;
- gboolean _tmp1_;
+static void
+preferences_dialog_set_allow_closing (PreferencesDialog* self,
+ gboolean allow)
+{
#line 381 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_if_fail (IS_PREFERENCES_DIALOG (self));
#line 382 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp0_ = allow;
-#line 382 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_window_set_deletable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_);
-#line 383 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp1_ = allow;
+ gtk_window_set_deletable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), allow);
#line 383 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- self->priv->allow_closing = _tmp1_;
-#line 2345 "Preferences.c"
+ self->priv->allow_closing = allow;
+#line 2381 "Preferences.c"
}
-static gboolean preferences_dialog_get_allow_closing (PreferencesDialog* self) {
+static gboolean
+preferences_dialog_get_allow_closing (PreferencesDialog* self)
+{
gboolean result = FALSE;
gboolean _tmp0_;
#line 386 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
@@ -2356,15 +2394,17 @@ static gboolean preferences_dialog_get_allow_closing (PreferencesDialog* self) {
result = _tmp0_;
#line 387 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return result;
-#line 2360 "Preferences.c"
+#line 2398 "Preferences.c"
}
-static void preferences_dialog_set_background_color (PreferencesDialog* self, gdouble bg_color_value) {
+static void
+preferences_dialog_set_background_color (PreferencesDialog* self,
+ gdouble bg_color_value)
+{
ConfigFacade* _tmp0_;
ConfigFacade* _tmp1_;
- gdouble _tmp2_;
- GdkRGBA _tmp3_ = {0};
+ GdkRGBA _tmp2_ = {0};
#line 390 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_if_fail (IS_PREFERENCES_DIALOG (self));
#line 391 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
@@ -2372,276 +2412,261 @@ static void preferences_dialog_set_background_color (PreferencesDialog* self, gd
#line 391 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp1_ = _tmp0_;
#line 391 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp2_ = bg_color_value;
+ preferences_dialog_to_grayscale (self, bg_color_value, &_tmp2_);
#line 391 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- preferences_dialog_to_grayscale (self, _tmp2_, &_tmp3_);
-#line 391 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- config_facade_set_bg_color (_tmp1_, &_tmp3_);
+ config_facade_set_bg_color (_tmp1_, &_tmp2_);
#line 391 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_object_unref0 (_tmp1_);
-#line 2383 "Preferences.c"
+#line 2421 "Preferences.c"
}
-static void preferences_dialog_to_grayscale (PreferencesDialog* self, gdouble color_value, GdkRGBA* result) {
+static void
+preferences_dialog_to_grayscale (PreferencesDialog* self,
+ gdouble color_value,
+ GdkRGBA* result)
+{
GdkRGBA color = {0};
- gdouble _tmp0_;
- gdouble _tmp1_;
- gdouble _tmp2_;
#line 394 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_if_fail (IS_PREFERENCES_DIALOG (self));
#line 395 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
memset (&color, 0, sizeof (GdkRGBA));
#line 397 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp0_ = color_value;
-#line 397 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- color.red = _tmp0_;
+ color.red = color_value;
#line 398 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp1_ = color_value;
-#line 398 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- color.green = _tmp1_;
-#line 399 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp2_ = color_value;
+ color.green = color_value;
#line 399 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- color.blue = _tmp2_;
+ color.blue = color_value;
#line 400 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
color.alpha = 1.0;
#line 402 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
*result = color;
#line 402 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return;
-#line 2414 "Preferences.c"
+#line 2447 "Preferences.c"
}
-static void preferences_dialog_on_photo_editor_changed (PreferencesDialog* self) {
+static void
+preferences_dialog_on_photo_editor_changed (PreferencesDialog* self)
+{
gint _tmp0_ = 0;
GtkComboBox* _tmp1_;
- gint _tmp2_;
- SortedList* _tmp3_;
+ SortedList* _tmp2_;
+ gint _tmp3_;
gint _tmp4_;
- gint _tmp5_;
gint photo_app_choice_index = 0;
GAppInfo* app = NULL;
- SortedList* _tmp11_;
- gpointer _tmp12_;
- ConfigFacade* _tmp13_;
- ConfigFacade* _tmp14_;
+ SortedList* _tmp9_;
+ gpointer _tmp10_;
+ ConfigFacade* _tmp11_;
+ ConfigFacade* _tmp12_;
+ gchar* _tmp13_;
+ gchar* _tmp14_;
gchar* _tmp15_;
gchar* _tmp16_;
- gchar* _tmp17_;
- gchar* _tmp18_;
#line 405 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_if_fail (IS_PREFERENCES_DIALOG (self));
#line 406 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp1_ = self->priv->photo_editor_combo;
#line 406 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp2_ = gtk_combo_box_get_active (_tmp1_);
+ _tmp2_ = self->priv->external_photo_apps;
#line 406 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp3_ = self->priv->external_photo_apps;
+ _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
#line 406 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp4_ = _tmp3_;
#line 406 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp5_ = _tmp4_;
-#line 406 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- if (_tmp2_ < _tmp5_) {
-#line 2449 "Preferences.c"
- GtkComboBox* _tmp6_;
- gint _tmp7_;
+ if (gtk_combo_box_get_active (_tmp1_) < _tmp4_) {
+#line 2481 "Preferences.c"
+ GtkComboBox* _tmp5_;
#line 407 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp6_ = self->priv->photo_editor_combo;
+ _tmp5_ = self->priv->photo_editor_combo;
#line 407 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp7_ = gtk_combo_box_get_active (_tmp6_);
-#line 407 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp0_ = _tmp7_;
-#line 2458 "Preferences.c"
+ _tmp0_ = gtk_combo_box_get_active (_tmp5_);
+#line 2487 "Preferences.c"
} else {
- SortedList* _tmp8_;
- gint _tmp9_;
- gint _tmp10_;
+ SortedList* _tmp6_;
+ gint _tmp7_;
+ gint _tmp8_;
#line 407 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp8_ = self->priv->external_photo_apps;
+ _tmp6_ = self->priv->external_photo_apps;
#line 407 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
#line 407 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp10_ = _tmp9_;
+ _tmp8_ = _tmp7_;
#line 407 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp0_ = _tmp10_;
-#line 2471 "Preferences.c"
+ _tmp0_ = _tmp8_;
+#line 2500 "Preferences.c"
}
#line 406 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
photo_app_choice_index = _tmp0_;
#line 409 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp11_ = self->priv->external_photo_apps;
+ _tmp9_ = self->priv->external_photo_apps;
#line 409 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp12_ = sorted_list_get_at (_tmp11_, photo_app_choice_index);
+ _tmp10_ = sorted_list_get_at (_tmp9_, photo_app_choice_index);
#line 409 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- app = (GAppInfo*) _tmp12_;
+ app = (GAppInfo*) _tmp10_;
#line 411 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp13_ = config_facade_get_instance ();
+ _tmp11_ = config_facade_get_instance ();
#line 411 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp14_ = _tmp13_;
+ _tmp12_ = _tmp11_;
#line 411 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp15_ = desktop_integration_get_app_open_command (app);
+ _tmp13_ = desktop_integration_get_app_open_command (app);
#line 411 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp16_ = _tmp15_;
+ _tmp14_ = _tmp13_;
#line 411 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- configuration_facade_set_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp16_);
+ configuration_facade_set_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp14_);
#line 411 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_free0 (_tmp16_);
+ _g_free0 (_tmp14_);
#line 411 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_object_unref0 (_tmp14_);
+ _g_object_unref0 (_tmp12_);
#line 413 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp17_ = desktop_integration_get_app_open_command (app);
+ _tmp15_ = desktop_integration_get_app_open_command (app);
#line 413 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp18_ = _tmp17_;
+ _tmp16_ = _tmp15_;
#line 413 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_debug ("Preferences.vala:413: setting external photo editor to: %s", _tmp18_);
+ g_debug ("Preferences.vala:413: setting external photo editor to: %s", _tmp16_);
#line 413 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_free0 (_tmp18_);
+ _g_free0 (_tmp16_);
#line 405 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_object_unref0 (app);
-#line 2505 "Preferences.c"
+#line 2534 "Preferences.c"
}
-static void preferences_dialog_on_raw_editor_changed (PreferencesDialog* self) {
+static void
+preferences_dialog_on_raw_editor_changed (PreferencesDialog* self)
+{
gint _tmp0_ = 0;
GtkComboBox* _tmp1_;
- gint _tmp2_;
- SortedList* _tmp3_;
+ SortedList* _tmp2_;
+ gint _tmp3_;
gint _tmp4_;
- gint _tmp5_;
gint raw_app_choice_index = 0;
GAppInfo* app = NULL;
- SortedList* _tmp11_;
- gpointer _tmp12_;
- ConfigFacade* _tmp13_;
- ConfigFacade* _tmp14_;
- const gchar* _tmp15_;
- const gchar* _tmp16_;
+ SortedList* _tmp9_;
+ gpointer _tmp10_;
+ ConfigFacade* _tmp11_;
+ ConfigFacade* _tmp12_;
+ const gchar* _tmp13_;
+ const gchar* _tmp14_;
#line 416 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_if_fail (IS_PREFERENCES_DIALOG (self));
#line 417 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp1_ = self->priv->raw_editor_combo;
#line 417 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp2_ = gtk_combo_box_get_active (_tmp1_);
+ _tmp2_ = self->priv->external_raw_apps;
#line 417 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp3_ = self->priv->external_raw_apps;
+ _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
#line 417 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp4_ = _tmp3_;
#line 417 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp5_ = _tmp4_;
-#line 417 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- if (_tmp2_ < _tmp5_) {
-#line 2538 "Preferences.c"
- GtkComboBox* _tmp6_;
- gint _tmp7_;
+ if (gtk_combo_box_get_active (_tmp1_) < _tmp4_) {
+#line 2566 "Preferences.c"
+ GtkComboBox* _tmp5_;
#line 418 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp6_ = self->priv->raw_editor_combo;
+ _tmp5_ = self->priv->raw_editor_combo;
#line 418 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp7_ = gtk_combo_box_get_active (_tmp6_);
-#line 418 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp0_ = _tmp7_;
-#line 2547 "Preferences.c"
+ _tmp0_ = gtk_combo_box_get_active (_tmp5_);
+#line 2572 "Preferences.c"
} else {
- SortedList* _tmp8_;
- gint _tmp9_;
- gint _tmp10_;
+ SortedList* _tmp6_;
+ gint _tmp7_;
+ gint _tmp8_;
#line 418 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp8_ = self->priv->external_raw_apps;
+ _tmp6_ = self->priv->external_raw_apps;
#line 418 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
#line 418 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp10_ = _tmp9_;
+ _tmp8_ = _tmp7_;
#line 418 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp0_ = _tmp10_;
-#line 2560 "Preferences.c"
+ _tmp0_ = _tmp8_;
+#line 2585 "Preferences.c"
}
#line 417 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
raw_app_choice_index = _tmp0_;
#line 420 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp11_ = self->priv->external_raw_apps;
+ _tmp9_ = self->priv->external_raw_apps;
#line 420 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp12_ = sorted_list_get_at (_tmp11_, raw_app_choice_index);
+ _tmp10_ = sorted_list_get_at (_tmp9_, raw_app_choice_index);
#line 420 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- app = (GAppInfo*) _tmp12_;
+ app = (GAppInfo*) _tmp10_;
#line 422 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp13_ = config_facade_get_instance ();
+ _tmp11_ = config_facade_get_instance ();
#line 422 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp14_ = _tmp13_;
+ _tmp12_ = _tmp11_;
#line 422 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp15_ = g_app_info_get_commandline (app);
+ _tmp13_ = g_app_info_get_commandline (app);
#line 422 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- configuration_facade_set_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp15_);
+ configuration_facade_set_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp13_);
#line 422 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _g_object_unref0 (_tmp14_);
+ _g_object_unref0 (_tmp12_);
#line 424 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp16_ = g_app_info_get_commandline (app);
+ _tmp14_ = g_app_info_get_commandline (app);
#line 424 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_debug ("Preferences.vala:424: setting external raw editor to: %s", _tmp16_);
+ g_debug ("Preferences.vala:424: setting external raw editor to: %s", _tmp14_);
#line 416 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_object_unref0 (app);
-#line 2586 "Preferences.c"
+#line 2611 "Preferences.c"
}
-static RawDeveloper preferences_dialog_raw_developer_from_combo (PreferencesDialog* self) {
+static RawDeveloper
+preferences_dialog_raw_developer_from_combo (PreferencesDialog* self)
+{
RawDeveloper result = 0;
GtkComboBoxText* _tmp0_;
- gint _tmp1_;
#line 427 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), 0);
#line 428 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp0_ = self->priv->default_raw_developer_combo;
#line 428 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 428 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- if (_tmp1_ == 0) {
+ if (gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox)) == 0) {
#line 429 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
result = RAW_DEVELOPER_CAMERA;
#line 429 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return result;
-#line 2606 "Preferences.c"
+#line 2630 "Preferences.c"
}
#line 430 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
result = RAW_DEVELOPER_SHOTWELL;
#line 430 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return result;
-#line 2612 "Preferences.c"
+#line 2636 "Preferences.c"
}
-static void preferences_dialog_set_raw_developer_combo (PreferencesDialog* self, RawDeveloper d) {
- RawDeveloper _tmp0_;
+static void
+preferences_dialog_set_raw_developer_combo (PreferencesDialog* self,
+ RawDeveloper d)
+{
#line 433 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_if_fail (IS_PREFERENCES_DIALOG (self));
#line 434 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp0_ = d;
-#line 434 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- if (_tmp0_ == RAW_DEVELOPER_CAMERA) {
-#line 2624 "Preferences.c"
- GtkComboBoxText* _tmp1_;
+ if (d == RAW_DEVELOPER_CAMERA) {
+#line 2648 "Preferences.c"
+ GtkComboBoxText* _tmp0_;
#line 435 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp1_ = self->priv->default_raw_developer_combo;
+ _tmp0_ = self->priv->default_raw_developer_combo;
#line 435 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 2630 "Preferences.c"
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), 0);
+#line 2654 "Preferences.c"
} else {
- GtkComboBoxText* _tmp2_;
+ GtkComboBoxText* _tmp1_;
#line 437 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp2_ = self->priv->default_raw_developer_combo;
+ _tmp1_ = self->priv->default_raw_developer_combo;
#line 437 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), 1);
-#line 2637 "Preferences.c"
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), 1);
+#line 2661 "Preferences.c"
}
}
-static void preferences_dialog_on_default_raw_developer_changed (PreferencesDialog* self) {
+static void
+preferences_dialog_on_default_raw_developer_changed (PreferencesDialog* self)
+{
ConfigFacade* _tmp0_;
ConfigFacade* _tmp1_;
- RawDeveloper _tmp2_;
#line 440 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_if_fail (IS_PREFERENCES_DIALOG (self));
#line 441 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
@@ -2649,16 +2674,16 @@ static void preferences_dialog_on_default_raw_developer_changed (PreferencesDial
#line 441 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp1_ = _tmp0_;
#line 441 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp2_ = preferences_dialog_raw_developer_from_combo (self);
-#line 441 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- configuration_facade_set_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_);
+ configuration_facade_set_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), preferences_dialog_raw_developer_from_combo (self));
#line 441 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_object_unref0 (_tmp1_);
-#line 2658 "Preferences.c"
+#line 2681 "Preferences.c"
}
-static void preferences_dialog_on_current_folder_changed (PreferencesDialog* self) {
+static void
+preferences_dialog_on_current_folder_changed (PreferencesDialog* self)
+{
GtkFileChooserButton* _tmp0_;
gchar* _tmp1_;
#line 444 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
@@ -2666,92 +2691,88 @@ static void preferences_dialog_on_current_folder_changed (PreferencesDialog* sel
#line 445 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp0_ = self->priv->library_dir_button;
#line 445 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp1_ = gtk_file_chooser_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+ _tmp1_ = gtk_file_chooser_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_file_chooser_get_type (), GtkFileChooser));
#line 445 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_free0 (self->priv->lib_dir);
#line 445 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
self->priv->lib_dir = _tmp1_;
-#line 2675 "Preferences.c"
+#line 2700 "Preferences.c"
}
-static void _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed (GtkFileChooser* _sender, gpointer self) {
+static void
+_preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed (GtkFileChooser* _sender,
+ gpointer self)
+{
#line 454 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_on_current_folder_changed ((PreferencesDialog*) self);
-#line 2682 "Preferences.c"
+#line 2710 "Preferences.c"
}
-static gboolean preferences_dialog_real_map_event (GtkWidget* base, GdkEventAny* event) {
+static gboolean
+preferences_dialog_real_map_event (GtkWidget* base,
+ GdkEventAny* event)
+{
PreferencesDialog * self;
gboolean result = FALSE;
gboolean _result_ = FALSE;
- GdkEventAny* _tmp0_;
- gboolean _tmp1_;
- GtkFileChooserButton* _tmp2_;
+ GtkFileChooserButton* _tmp0_;
#line 448 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PREFERENCES_DIALOG, PreferencesDialog);
#line 448 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_val_if_fail (event != NULL, FALSE);
#line 449 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp0_ = event;
-#line 449 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp1_ = GTK_WIDGET_CLASS (preferences_dialog_parent_class)->map_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 449 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _result_ = _tmp1_;
+ _result_ = GTK_WIDGET_CLASS (preferences_dialog_parent_class)->map_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), gtk_widget_get_type (), GtkWidget), event);
#line 454 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp2_ = self->priv->library_dir_button;
+ _tmp0_ = self->priv->library_dir_button;
#line 454 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "current-folder-changed", (GCallback) _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_file_chooser_get_type (), GtkFileChooser), "current-folder-changed", (GCallback) _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed, self, 0);
#line 456 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
result = _result_;
#line 456 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return result;
-#line 2711 "Preferences.c"
+#line 2736 "Preferences.c"
}
-static void preferences_dialog_add_to_dir_formats (PreferencesDialog* self, const gchar* name, const gchar* pattern) {
+static void
+preferences_dialog_add_to_dir_formats (PreferencesDialog* self,
+ const gchar* name,
+ const gchar* pattern)
+{
PreferencesDialogPathFormat* pf = NULL;
- const gchar* _tmp0_;
- const gchar* _tmp1_;
- PreferencesDialogPathFormat* _tmp2_;
- GeeArrayList* _tmp3_;
- GtkComboBoxText* _tmp4_;
- const gchar* _tmp5_;
+ PreferencesDialogPathFormat* _tmp0_;
+ GeeArrayList* _tmp1_;
+ GtkComboBoxText* _tmp2_;
#line 459 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_if_fail (IS_PREFERENCES_DIALOG (self));
#line 459 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_if_fail (name != NULL);
#line 460 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp0_ = name;
-#line 460 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp1_ = pattern;
-#line 460 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp2_ = preferences_dialog_path_format_new (_tmp0_, _tmp1_);
+ _tmp0_ = preferences_dialog_path_format_new (name, pattern);
#line 460 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- pf = _tmp2_;
+ pf = _tmp0_;
#line 461 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp3_ = self->priv->path_formats;
+ _tmp1_ = self->priv->path_formats;
#line 461 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), pf);
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), pf);
#line 462 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp4_ = self->priv->dir_pattern_combo;
+ _tmp2_ = self->priv->dir_pattern_combo;
#line 462 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp5_ = name;
-#line 462 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- gtk_combo_box_text_append_text (_tmp4_, _tmp5_);
+ gtk_combo_box_text_append_text (_tmp2_, name);
#line 459 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_preferences_dialog_path_format_unref0 (pf);
-#line 2747 "Preferences.c"
+#line 2767 "Preferences.c"
}
-static void preferences_dialog_on_lowercase_toggled (PreferencesDialog* self) {
+static void
+preferences_dialog_on_lowercase_toggled (PreferencesDialog* self)
+{
ConfigFacade* _tmp0_;
ConfigFacade* _tmp1_;
GtkCheckButton* _tmp2_;
- gboolean _tmp3_;
#line 465 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_if_fail (IS_PREFERENCES_DIALOG (self));
#line 466 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
@@ -2761,152 +2782,176 @@ static void preferences_dialog_on_lowercase_toggled (PreferencesDialog* self) {
#line 466 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_tmp2_ = self->priv->lowercase;
#line 466 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp3_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 466 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- configuration_facade_set_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp3_);
+ configuration_facade_set_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton)));
#line 466 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_object_unref0 (_tmp1_);
-#line 2770 "Preferences.c"
+#line 2789 "Preferences.c"
}
-static PreferencesDialogPathFormat* preferences_dialog_path_format_construct (GType object_type, const gchar* name, const gchar* pattern) {
+static PreferencesDialogPathFormat*
+preferences_dialog_path_format_construct (GType object_type,
+ const gchar* name,
+ const gchar* pattern)
+{
PreferencesDialogPathFormat* self = NULL;
- const gchar* _tmp0_;
+ gchar* _tmp0_;
gchar* _tmp1_;
- const gchar* _tmp2_;
- gchar* _tmp3_;
#line 11 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 11 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
self = (PreferencesDialogPathFormat*) g_type_create_instance (object_type);
#line 12 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp0_ = name;
-#line 12 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (name);
#line 12 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_free0 (self->name);
#line 12 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- self->name = _tmp1_;
+ self->name = _tmp0_;
#line 13 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp2_ = pattern;
-#line 13 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp1_ = g_strdup (pattern);
#line 13 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_free0 (self->pattern);
#line 13 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
- self->pattern = _tmp3_;
+ self->pattern = _tmp1_;
#line 11 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return self;
-#line 2802 "Preferences.c"
+#line 2819 "Preferences.c"
}
-static PreferencesDialogPathFormat* preferences_dialog_path_format_new (const gchar* name, const gchar* pattern) {
+static PreferencesDialogPathFormat*
+preferences_dialog_path_format_new (const gchar* name,
+ const gchar* pattern)
+{
#line 11 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return preferences_dialog_path_format_construct (PREFERENCES_DIALOG_TYPE_PATH_FORMAT, name, pattern);
-#line 2809 "Preferences.c"
+#line 2829 "Preferences.c"
}
-static void preferences_dialog_value_path_format_init (GValue* value) {
+static void
+preferences_dialog_value_path_format_init (GValue* value)
+{
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
value->data[0].v_pointer = NULL;
-#line 2816 "Preferences.c"
+#line 2838 "Preferences.c"
}
-static void preferences_dialog_value_path_format_free_value (GValue* value) {
+static void
+preferences_dialog_value_path_format_free_value (GValue* value)
+{
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (value->data[0].v_pointer) {
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_path_format_unref (value->data[0].v_pointer);
-#line 2825 "Preferences.c"
+#line 2849 "Preferences.c"
}
}
-static void preferences_dialog_value_path_format_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+preferences_dialog_value_path_format_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (src_value->data[0].v_pointer) {
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
dest_value->data[0].v_pointer = preferences_dialog_path_format_ref (src_value->data[0].v_pointer);
-#line 2835 "Preferences.c"
+#line 2862 "Preferences.c"
} else {
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
dest_value->data[0].v_pointer = NULL;
-#line 2839 "Preferences.c"
+#line 2866 "Preferences.c"
}
}
-static gpointer preferences_dialog_value_path_format_peek_pointer (const GValue* value) {
+static gpointer
+preferences_dialog_value_path_format_peek_pointer (const GValue* value)
+{
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return value->data[0].v_pointer;
-#line 2847 "Preferences.c"
+#line 2876 "Preferences.c"
}
-static gchar* preferences_dialog_value_path_format_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+preferences_dialog_value_path_format_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (collect_values[0].v_pointer) {
-#line 2854 "Preferences.c"
+#line 2888 "Preferences.c"
PreferencesDialogPathFormat * object;
object = collect_values[0].v_pointer;
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (object->parent_instance.g_class == NULL) {
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2861 "Preferences.c"
+#line 2895 "Preferences.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2865 "Preferences.c"
+#line 2899 "Preferences.c"
}
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
value->data[0].v_pointer = preferences_dialog_path_format_ref (object);
-#line 2869 "Preferences.c"
+#line 2903 "Preferences.c"
} else {
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
value->data[0].v_pointer = NULL;
-#line 2873 "Preferences.c"
+#line 2907 "Preferences.c"
}
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return NULL;
-#line 2877 "Preferences.c"
+#line 2911 "Preferences.c"
}
-static gchar* preferences_dialog_value_path_format_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+preferences_dialog_value_path_format_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PreferencesDialogPathFormat ** object_p;
object_p = collect_values[0].v_pointer;
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (!object_p) {
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2888 "Preferences.c"
+#line 2927 "Preferences.c"
}
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (!value->data[0].v_pointer) {
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
*object_p = NULL;
-#line 2894 "Preferences.c"
+#line 2933 "Preferences.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
*object_p = value->data[0].v_pointer;
-#line 2898 "Preferences.c"
+#line 2937 "Preferences.c"
} else {
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
*object_p = preferences_dialog_path_format_ref (value->data[0].v_pointer);
-#line 2902 "Preferences.c"
+#line 2941 "Preferences.c"
}
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return NULL;
-#line 2906 "Preferences.c"
+#line 2945 "Preferences.c"
}
-static GParamSpec* preferences_dialog_param_spec_path_format (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+static GParamSpec*
+preferences_dialog_param_spec_path_format (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PreferencesDialogParamSpecPathFormat* spec;
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_val_if_fail (g_type_is_a (object_type, PREFERENCES_DIALOG_TYPE_PATH_FORMAT), NULL);
@@ -2916,20 +2961,25 @@ static GParamSpec* preferences_dialog_param_spec_path_format (const gchar* name,
G_PARAM_SPEC (spec)->value_type = object_type;
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return G_PARAM_SPEC (spec);
-#line 2920 "Preferences.c"
+#line 2965 "Preferences.c"
}
-static gpointer preferences_dialog_value_get_path_format (const GValue* value) {
+static gpointer
+preferences_dialog_value_get_path_format (const GValue* value)
+{
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT), NULL);
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return value->data[0].v_pointer;
-#line 2929 "Preferences.c"
+#line 2976 "Preferences.c"
}
-static void preferences_dialog_value_set_path_format (GValue* value, gpointer v_object) {
+static void
+preferences_dialog_value_set_path_format (GValue* value,
+ gpointer v_object)
+{
PreferencesDialogPathFormat * old;
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
@@ -2945,22 +2995,25 @@ static void preferences_dialog_value_set_path_format (GValue* value, gpointer v_
value->data[0].v_pointer = v_object;
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_path_format_ref (value->data[0].v_pointer);
-#line 2949 "Preferences.c"
+#line 2999 "Preferences.c"
} else {
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
value->data[0].v_pointer = NULL;
-#line 2953 "Preferences.c"
+#line 3003 "Preferences.c"
}
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (old) {
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_path_format_unref (old);
-#line 2959 "Preferences.c"
+#line 3009 "Preferences.c"
}
}
-static void preferences_dialog_value_take_path_format (GValue* value, gpointer v_object) {
+static void
+preferences_dialog_value_take_path_format (GValue* value,
+ gpointer v_object)
+{
PreferencesDialogPathFormat * old;
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
@@ -2974,38 +3027,44 @@ static void preferences_dialog_value_take_path_format (GValue* value, gpointer v
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
value->data[0].v_pointer = v_object;
-#line 2978 "Preferences.c"
+#line 3031 "Preferences.c"
} else {
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
value->data[0].v_pointer = NULL;
-#line 2982 "Preferences.c"
+#line 3035 "Preferences.c"
}
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
if (old) {
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_path_format_unref (old);
-#line 2988 "Preferences.c"
+#line 3041 "Preferences.c"
}
}
-static void preferences_dialog_path_format_class_init (PreferencesDialogPathFormatClass * klass) {
+static void
+preferences_dialog_path_format_class_init (PreferencesDialogPathFormatClass * klass)
+{
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_path_format_parent_class = g_type_class_peek_parent (klass);
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
((PreferencesDialogPathFormatClass *) klass)->finalize = preferences_dialog_path_format_finalize;
-#line 2998 "Preferences.c"
+#line 3053 "Preferences.c"
}
-static void preferences_dialog_path_format_instance_init (PreferencesDialogPathFormat * self) {
+static void
+preferences_dialog_path_format_instance_init (PreferencesDialogPathFormat * self)
+{
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
self->ref_count = 1;
-#line 3005 "Preferences.c"
+#line 3062 "Preferences.c"
}
-static void preferences_dialog_path_format_finalize (PreferencesDialogPathFormat * obj) {
+static void
+preferences_dialog_path_format_finalize (PreferencesDialogPathFormat * obj)
+{
PreferencesDialogPathFormat * self;
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PREFERENCES_DIALOG_TYPE_PATH_FORMAT, PreferencesDialogPathFormat);
@@ -3015,11 +3074,13 @@ static void preferences_dialog_path_format_finalize (PreferencesDialogPathFormat
_g_free0 (self->name);
#line 16 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
_g_free0 (self->pattern);
-#line 3019 "Preferences.c"
+#line 3078 "Preferences.c"
}
-static GType preferences_dialog_path_format_get_type (void) {
+static GType
+preferences_dialog_path_format_get_type (void)
+{
static volatile gsize preferences_dialog_path_format_type_id__volatile = 0;
if (g_once_init_enter (&preferences_dialog_path_format_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { preferences_dialog_value_path_format_init, preferences_dialog_value_path_format_free_value, preferences_dialog_value_path_format_copy_value, preferences_dialog_value_path_format_peek_pointer, "p", preferences_dialog_value_path_format_collect_value, "p", preferences_dialog_value_path_format_lcopy_value };
@@ -3033,18 +3094,22 @@ static GType preferences_dialog_path_format_get_type (void) {
}
-static gpointer preferences_dialog_path_format_ref (gpointer instance) {
+static gpointer
+preferences_dialog_path_format_ref (gpointer instance)
+{
PreferencesDialogPathFormat * self;
self = instance;
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_atomic_int_inc (&self->ref_count);
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
return instance;
-#line 3044 "Preferences.c"
+#line 3107 "Preferences.c"
}
-static void preferences_dialog_path_format_unref (gpointer instance) {
+static void
+preferences_dialog_path_format_unref (gpointer instance)
+{
PreferencesDialogPathFormat * self;
self = instance;
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
@@ -3053,12 +3118,14 @@ static void preferences_dialog_path_format_unref (gpointer instance) {
PREFERENCES_DIALOG_PATH_FORMAT_GET_CLASS (self)->finalize (self);
#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 3057 "Preferences.c"
+#line 3122 "Preferences.c"
}
}
-static void preferences_dialog_class_init (PreferencesDialogClass * klass) {
+static void
+preferences_dialog_class_init (PreferencesDialogClass * klass)
+{
gint PreferencesDialog_private_offset;
#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
preferences_dialog_parent_class = g_type_class_peek_parent (klass);
@@ -3108,11 +3175,13 @@ static void preferences_dialog_class_init (PreferencesDialogClass * klass) {
gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "transparent_solid_color", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, transparent_solid_color));
#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "transparent_none_radio", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, transparent_none_radio));
-#line 3112 "Preferences.c"
+#line 3179 "Preferences.c"
}
-static void preferences_dialog_instance_init (PreferencesDialog * self) {
+static void
+preferences_dialog_instance_init (PreferencesDialog * self)
+{
GeeArrayList* _tmp0_;
GDateTime* _tmp1_;
PluginsManifestWidgetMediator* _tmp2_;
@@ -3138,11 +3207,13 @@ static void preferences_dialog_instance_init (PreferencesDialog * self) {
self->priv->plugins_mediator = _tmp2_;
#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
gtk_widget_init_template (GTK_WIDGET (self));
-#line 3142 "Preferences.c"
+#line 3211 "Preferences.c"
}
-static void preferences_dialog_finalize (GObject * obj) {
+static void
+preferences_dialog_finalize (GObject * obj)
+{
PreferencesDialog * self;
#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREFERENCES_DIALOG, PreferencesDialog);
@@ -3196,11 +3267,13 @@ static void preferences_dialog_finalize (GObject * obj) {
_g_object_unref0 (self->priv->transparent_none_radio);
#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
G_OBJECT_CLASS (preferences_dialog_parent_class)->finalize (obj);
-#line 3200 "Preferences.c"
+#line 3271 "Preferences.c"
}
-GType preferences_dialog_get_type (void) {
+GType
+preferences_dialog_get_type (void)
+{
static volatile gsize preferences_dialog_type_id__volatile = 0;
if (g_once_init_enter (&preferences_dialog_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PreferencesDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) preferences_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PreferencesDialog), 0, (GInstanceInitFunc) preferences_dialog_instance_init, NULL };
@@ -3212,7 +3285,11 @@ GType preferences_dialog_get_type (void) {
}
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
if ((array != NULL) && (destroy_func != NULL)) {
int i;
for (i = 0; i < array_length; i = i + 1) {
@@ -3224,13 +3301,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
}
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
_vala_array_destroy (array, array_length, destroy_func);
g_free (array);
}
-static gint _vala_array_length (gpointer array) {
+static gint
+_vala_array_length (gpointer array)
+{
int length;
length = 0;
if (array) {
diff --git a/src/dialogs/ProgressDialog.c b/src/dialogs/ProgressDialog.c
index 5183c12..7098e20 100644
--- a/src/dialogs/ProgressDialog.c
+++ b/src/dialogs/ProgressDialog.c
@@ -1,4 +1,4 @@
-/* ProgressDialog.c generated by valac 0.36.6, the Vala compiler
+/* ProgressDialog.c generated by valac 0.40.4, the Vala compiler
* generated from ProgressDialog.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8,6 +8,7 @@
* See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
@@ -30,6 +31,11 @@
typedef struct _ProgressDialog ProgressDialog;
typedef struct _ProgressDialogClass ProgressDialogClass;
typedef struct _ProgressDialogPrivate ProgressDialogPrivate;
+enum {
+ PROGRESS_DIALOG_0_PROPERTY,
+ PROGRESS_DIALOG_NUM_PROPERTIES
+};
+static GParamSpec* progress_dialog_properties[PROGRESS_DIALOG_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define _g_free0(var) (var = (g_free (var), NULL))
#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
@@ -61,80 +67,103 @@ static gpointer progress_dialog_parent_class = NULL;
GType progress_dialog_get_type (void) G_GNUC_CONST;
#define PROGRESS_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PROGRESS_DIALOG, ProgressDialogPrivate))
-enum {
- PROGRESS_DIALOG_DUMMY_PROPERTY
-};
-ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable);
-ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable);
+ProgressDialog* progress_dialog_new (GtkWindow* owner,
+ const gchar* text,
+ GCancellable* cancellable);
+ProgressDialog* progress_dialog_construct (GType object_type,
+ GtkWindow* owner,
+ const gchar* text,
+ GCancellable* cancellable);
#define RESOURCES_CANCEL_LABEL _ ("_Cancel")
static void progress_dialog_on_cancel (ProgressDialog* self);
-static void _progress_dialog_on_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _progress_dialog_on_cancel_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static gboolean progress_dialog_on_window_closed (ProgressDialog* self);
-static gboolean _progress_dialog_on_window_closed_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self);
+static gboolean _progress_dialog_on_window_closed_gtk_widget_delete_event (GtkWidget* _sender,
+ GdkEventAny* event,
+ gpointer self);
gulong now_ms (void);
static void progress_dialog_real_realize (GtkWidget* base);
-void progress_dialog_update_display_every (ProgressDialog* self, gint update_every);
-void progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self, gint minimum_on_screen_time_msec);
-void progress_dialog_set_fraction (ProgressDialog* self, gint current, gint total);
-void progress_dialog_set_percentage (ProgressDialog* self, gdouble pct);
-static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct);
-void progress_dialog_set_status (ProgressDialog* self, const gchar* text);
-gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop);
+void progress_dialog_update_display_every (ProgressDialog* self,
+ gint update_every);
+void progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self,
+ gint minimum_on_screen_time_msec);
+void progress_dialog_set_fraction (ProgressDialog* self,
+ gint current,
+ gint total);
+void progress_dialog_set_percentage (ProgressDialog* self,
+ gdouble pct);
+static void progress_dialog_maybe_show_all (ProgressDialog* self,
+ gdouble pct);
+void progress_dialog_set_status (ProgressDialog* self,
+ const gchar* text);
+gboolean progress_dialog_monitor (ProgressDialog* self,
+ guint64 count,
+ guint64 total,
+ gboolean do_event_loop);
void spin_event_loop (void);
void progress_dialog_close (ProgressDialog* self);
static void progress_dialog_finalize (GObject * obj);
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 21 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
return self ? g_object_ref (self) : NULL;
-#line 92 "ProgressDialog.c"
+#line 115 "ProgressDialog.c"
}
-static void _progress_dialog_on_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_progress_dialog_on_cancel_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 38 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
progress_dialog_on_cancel ((ProgressDialog*) self);
-#line 99 "ProgressDialog.c"
+#line 125 "ProgressDialog.c"
}
-static gboolean _progress_dialog_on_window_closed_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
+static gboolean
+_progress_dialog_on_window_closed_gtk_widget_delete_event (GtkWidget* _sender,
+ GdkEventAny* event,
+ gpointer self)
+{
gboolean result;
result = progress_dialog_on_window_closed ((ProgressDialog*) self);
#line 39 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
return result;
-#line 108 "ProgressDialog.c"
+#line 138 "ProgressDialog.c"
}
-ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable) {
+ProgressDialog*
+progress_dialog_construct (GType object_type,
+ GtkWindow* owner,
+ const gchar* text,
+ GCancellable* cancellable)
+{
ProgressDialog * self = NULL;
GCancellable* _tmp0_;
- GCancellable* _tmp1_;
- const gchar* _tmp2_;
- GtkWindow* _tmp3_;
- GtkProgressBar* _tmp5_;
- GtkProgressBar* _tmp6_;
+ GtkProgressBar* _tmp1_;
+ GtkProgressBar* _tmp2_;
GtkBox* vbox_bar = NULL;
- GtkBox* _tmp7_;
- GtkBox* _tmp8_;
- GtkProgressBar* _tmp9_;
- GCancellable* _tmp10_;
+ GtkBox* _tmp3_;
+ GtkBox* _tmp4_;
+ GtkProgressBar* _tmp5_;
GtkBox* hbox = NULL;
- GtkBox* _tmp13_;
- GtkBox* _tmp14_;
- GtkBox* _tmp15_;
- GtkButton* _tmp16_;
+ GtkBox* _tmp8_;
+ GtkBox* _tmp9_;
+ GtkBox* _tmp10_;
+ GtkButton* _tmp11_;
GtkLabel* primary_text_label = NULL;
- GtkLabel* _tmp19_;
- const gchar* _tmp20_;
- gchar* _tmp21_;
- gchar* _tmp22_;
+ GtkLabel* _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
GtkBox* vbox = NULL;
- GtkBox* _tmp23_;
- GtkBox* _tmp24_;
- gulong _tmp25_;
+ GtkBox* _tmp17_;
+ GtkBox* _tmp18_;
#line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
g_return_val_if_fail ((owner == NULL) || GTK_IS_WINDOW (owner), NULL);
#line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
@@ -144,137 +173,123 @@ ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner,
#line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
self = (ProgressDialog*) g_object_new (object_type, NULL);
#line 21 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp0_ = cancellable;
-#line 21 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (cancellable);
#line 21 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
_g_object_unref0 (self->priv->cancellable);
#line 21 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- self->priv->cancellable = _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp2_ = text;
+ self->priv->cancellable = _tmp0_;
#line 23 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp2_);
+ gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), text);
#line 24 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
#line 25 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp3_ = owner;
-#line 25 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- if (_tmp3_ != NULL) {
-#line 165 "ProgressDialog.c"
- GtkWindow* _tmp4_;
-#line 26 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp4_ = owner;
+ if (owner != NULL) {
#line 26 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp4_);
-#line 171 "ProgressDialog.c"
+ gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), owner);
+#line 190 "ProgressDialog.c"
}
#line 27 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
#line 28 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG);
#line 30 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp5_ = self->priv->progress_bar;
+ _tmp1_ = self->priv->progress_bar;
#line 30 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), 300, -1);
+ gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), 300, -1);
#line 31 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp6_ = self->priv->progress_bar;
+ _tmp2_ = self->priv->progress_bar;
#line 31 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- gtk_progress_bar_set_show_text (_tmp6_, TRUE);
+ gtk_progress_bar_set_show_text (_tmp2_, TRUE);
#line 33 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ _tmp3_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
#line 33 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- g_object_ref_sink (_tmp7_);
+ g_object_ref_sink (_tmp3_);
#line 33 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- vbox_bar = _tmp7_;
+ vbox_bar = _tmp3_;
#line 34 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp8_ = vbox_bar;
+ _tmp4_ = vbox_bar;
#line 34 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp9_ = self->priv->progress_bar;
+ _tmp5_ = self->priv->progress_bar;
#line 34 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- gtk_box_pack_start (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 36 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp10_ = cancellable;
+ gtk_box_pack_start (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
#line 36 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- if (_tmp10_ != NULL) {
-#line 201 "ProgressDialog.c"
- GtkButton* _tmp11_;
- GtkButton* _tmp12_;
+ if (cancellable != NULL) {
+#line 218 "ProgressDialog.c"
+ GtkButton* _tmp6_;
+ GtkButton* _tmp7_;
#line 37 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp11_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
+ _tmp6_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
#line 37 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- g_object_ref_sink (_tmp11_);
+ g_object_ref_sink (_tmp6_);
#line 37 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
_g_object_unref0 (self->priv->cancel_button);
#line 37 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- self->priv->cancel_button = _tmp11_;
+ self->priv->cancel_button = _tmp6_;
#line 38 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp12_ = self->priv->cancel_button;
+ _tmp7_ = self->priv->cancel_button;
#line 38 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- g_signal_connect_object (_tmp12_, "clicked", (GCallback) _progress_dialog_on_cancel_gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp7_, "clicked", (GCallback) _progress_dialog_on_cancel_gtk_button_clicked, self, 0);
#line 39 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _progress_dialog_on_window_closed_gtk_widget_delete_event, self, 0);
-#line 218 "ProgressDialog.c"
+#line 235 "ProgressDialog.c"
}
#line 42 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+ _tmp8_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
#line 42 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- g_object_ref_sink (_tmp13_);
+ g_object_ref_sink (_tmp8_);
#line 42 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- hbox = _tmp13_;
+ hbox = _tmp8_;
#line 43 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp14_ = hbox;
+ _tmp9_ = hbox;
#line 43 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp15_ = vbox_bar;
+ _tmp10_ = vbox_bar;
#line 43 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+ gtk_box_pack_start (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
#line 44 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp16_ = self->priv->cancel_button;
+ _tmp11_ = self->priv->cancel_button;
#line 44 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- if (_tmp16_ != NULL) {
-#line 236 "ProgressDialog.c"
- GtkBox* _tmp17_;
- GtkButton* _tmp18_;
+ if (_tmp11_ != NULL) {
+#line 253 "ProgressDialog.c"
+ GtkBox* _tmp12_;
+ GtkButton* _tmp13_;
#line 45 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp17_ = hbox;
+ _tmp12_ = hbox;
#line 45 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp18_ = self->priv->cancel_button;
+ _tmp13_ = self->priv->cancel_button;
#line 45 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- gtk_box_pack_end (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 245 "ProgressDialog.c"
+ gtk_box_pack_end (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 262 "ProgressDialog.c"
}
#line 47 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp19_ = (GtkLabel*) gtk_label_new ("");
+ _tmp14_ = (GtkLabel*) gtk_label_new ("");
#line 47 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- g_object_ref_sink (_tmp19_);
+ g_object_ref_sink (_tmp14_);
#line 47 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- primary_text_label = _tmp19_;
+ primary_text_label = _tmp14_;
#line 48 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp20_ = text;
+ _tmp15_ = g_strdup_printf ("<span weight=\"bold\">%s</span>", text);
#line 48 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp21_ = g_strdup_printf ("<span weight=\"bold\">%s</span>", _tmp20_);
+ _tmp16_ = _tmp15_;
#line 48 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp22_ = _tmp21_;
+ gtk_label_set_markup (primary_text_label, _tmp16_);
#line 48 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- gtk_label_set_markup (primary_text_label, _tmp22_);
-#line 48 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _g_free0 (_tmp22_);
+ _g_free0 (_tmp16_);
#line 49 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
gtk_label_set_xalign (primary_text_label, 0.0f);
#line 50 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
gtk_label_set_yalign (primary_text_label, 0.5f);
#line 52 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+ _tmp17_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
#line 52 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- g_object_ref_sink (_tmp23_);
+ g_object_ref_sink (_tmp17_);
#line 52 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- vbox = _tmp23_;
+ vbox = _tmp17_;
#line 53 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
gtk_box_pack_start (vbox, G_TYPE_CHECK_INSTANCE_CAST (primary_text_label, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
#line 54 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp24_ = hbox;
+ _tmp18_ = hbox;
#line 54 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- gtk_box_pack_start (vbox, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+ gtk_box_pack_start (vbox, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
#line 55 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
#line 56 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
@@ -294,9 +309,7 @@ ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner,
#line 64 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget));
#line 66 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp25_ = now_ms ();
-#line 66 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- self->priv->time_started = _tmp25_;
+ self->priv->time_started = now_ms ();
#line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
_g_object_unref0 (vbox);
#line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
@@ -307,18 +320,24 @@ ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner,
_g_object_unref0 (vbox_bar);
#line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
return self;
-#line 311 "ProgressDialog.c"
+#line 324 "ProgressDialog.c"
}
-ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable) {
+ProgressDialog*
+progress_dialog_new (GtkWindow* owner,
+ const gchar* text,
+ GCancellable* cancellable)
+{
#line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
return progress_dialog_construct (TYPE_PROGRESS_DIALOG, owner, text, cancellable);
-#line 318 "ProgressDialog.c"
+#line 335 "ProgressDialog.c"
}
-static void progress_dialog_real_realize (GtkWidget* base) {
+static void
+progress_dialog_real_realize (GtkWidget* base)
+{
ProgressDialog * self;
GCancellable* _tmp0_;
#line 69 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
@@ -329,108 +348,93 @@ static void progress_dialog_real_realize (GtkWidget* base) {
_tmp0_ = self->priv->cancellable;
#line 73 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
if (_tmp0_ == NULL) {
-#line 333 "ProgressDialog.c"
+#line 352 "ProgressDialog.c"
GdkWindow* _tmp1_;
#line 74 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 74 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
gdk_window_set_functions (_tmp1_, GDK_FUNC_MOVE);
-#line 339 "ProgressDialog.c"
+#line 358 "ProgressDialog.c"
}
}
-void progress_dialog_update_display_every (ProgressDialog* self, gint update_every) {
- gint _tmp0_;
- gint _tmp1_;
+void
+progress_dialog_update_display_every (ProgressDialog* self,
+ gint update_every)
+{
#line 77 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
g_return_if_fail (IS_PROGRESS_DIALOG (self));
#line 78 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp0_ = update_every;
-#line 78 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _vala_assert (_tmp0_ >= 1, "update_every >= 1");
+ _vala_assert (update_every >= 1, "update_every >= 1");
#line 80 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp1_ = update_every;
-#line 80 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- self->priv->update_every = _tmp1_;
-#line 357 "ProgressDialog.c"
+ self->priv->update_every = update_every;
+#line 373 "ProgressDialog.c"
}
-void progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self, gint minimum_on_screen_time_msec) {
- gint _tmp0_;
+void
+progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self,
+ gint minimum_on_screen_time_msec)
+{
#line 83 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
g_return_if_fail (IS_PROGRESS_DIALOG (self));
#line 84 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp0_ = minimum_on_screen_time_msec;
-#line 84 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- self->priv->minimum_on_screen_time_msec = _tmp0_;
-#line 369 "ProgressDialog.c"
+ self->priv->minimum_on_screen_time_msec = minimum_on_screen_time_msec;
+#line 385 "ProgressDialog.c"
}
-void progress_dialog_set_fraction (ProgressDialog* self, gint current, gint total) {
- gint _tmp0_;
- gint _tmp1_;
+void
+progress_dialog_set_fraction (ProgressDialog* self,
+ gint current,
+ gint total)
+{
#line 87 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
g_return_if_fail (IS_PROGRESS_DIALOG (self));
#line 88 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp0_ = current;
-#line 88 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp1_ = total;
-#line 88 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- progress_dialog_set_percentage (self, ((gdouble) _tmp0_) / ((gdouble) _tmp1_));
-#line 384 "ProgressDialog.c"
+ progress_dialog_set_percentage (self, ((gdouble) current) / ((gdouble) total));
+#line 398 "ProgressDialog.c"
}
-void progress_dialog_set_percentage (ProgressDialog* self, gdouble pct) {
- gdouble _tmp0_;
- gdouble _tmp1_;
- gdouble _tmp2_;
- GtkProgressBar* _tmp3_;
- gdouble _tmp4_;
- GtkProgressBar* _tmp5_;
- gdouble _tmp6_;
- gchar* _tmp7_;
- gchar* _tmp8_;
+void
+progress_dialog_set_percentage (ProgressDialog* self,
+ gdouble pct)
+{
+ GtkProgressBar* _tmp0_;
+ GtkProgressBar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
#line 91 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
g_return_if_fail (IS_PROGRESS_DIALOG (self));
#line 92 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp0_ = pct;
-#line 92 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp1_ = CLAMP (_tmp0_, 0.0, 1.0);
-#line 92 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- pct = _tmp1_;
-#line 94 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp2_ = pct;
+ pct = CLAMP (pct, 0.0, 1.0);
#line 94 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- progress_dialog_maybe_show_all (self, _tmp2_);
+ progress_dialog_maybe_show_all (self, pct);
#line 96 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp3_ = self->priv->progress_bar;
-#line 96 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp4_ = pct;
+ _tmp0_ = self->priv->progress_bar;
#line 96 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- gtk_progress_bar_set_fraction (_tmp3_, _tmp4_);
+ gtk_progress_bar_set_fraction (_tmp0_, pct);
#line 97 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp5_ = self->priv->progress_bar;
-#line 97 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp6_ = pct;
+ _tmp1_ = self->priv->progress_bar;
#line 97 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp7_ = g_strdup_printf (_ ("%d%%"), (gint) (_tmp6_ * 100.0));
+ _tmp2_ = g_strdup_printf (_ ("%d%%"), (gint) (pct * 100.0));
#line 97 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp8_ = _tmp7_;
+ _tmp3_ = _tmp2_;
#line 97 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- gtk_progress_bar_set_text (_tmp5_, _tmp8_);
+ gtk_progress_bar_set_text (_tmp1_, _tmp3_);
#line 97 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _g_free0 (_tmp8_);
-#line 428 "ProgressDialog.c"
+ _g_free0 (_tmp3_);
+#line 430 "ProgressDialog.c"
}
-void progress_dialog_set_status (ProgressDialog* self, const gchar* text) {
+void
+progress_dialog_set_status (ProgressDialog* self,
+ const gchar* text)
+{
GtkProgressBar* _tmp0_;
- const gchar* _tmp1_;
#line 105 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
g_return_if_fail (IS_PROGRESS_DIALOG (self));
#line 105 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
@@ -438,23 +442,25 @@ void progress_dialog_set_status (ProgressDialog* self, const gchar* text) {
#line 106 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
_tmp0_ = self->priv->progress_bar;
#line 106 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp1_ = text;
-#line 106 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- gtk_progress_bar_set_text (_tmp0_, _tmp1_);
+ gtk_progress_bar_set_text (_tmp0_, text);
#line 112 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 447 "ProgressDialog.c"
+#line 449 "ProgressDialog.c"
}
-gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop) {
+gboolean
+progress_dialog_monitor (ProgressDialog* self,
+ guint64 count,
+ guint64 total,
+ gboolean do_event_loop)
+{
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
guint64 _tmp1_;
- gboolean _tmp8_ = FALSE;
- GCancellable* _tmp9_;
+ gboolean _tmp4_ = FALSE;
+ GCancellable* _tmp5_;
gboolean keep_going = FALSE;
- gboolean _tmp12_;
#line 116 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
g_return_val_if_fail (IS_PROGRESS_DIALOG (self), FALSE);
#line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
@@ -463,88 +469,74 @@ gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 t
if (_tmp1_ == G_MAXUINT64) {
#line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
_tmp0_ = TRUE;
-#line 467 "ProgressDialog.c"
+#line 473 "ProgressDialog.c"
} else {
guint64 _tmp2_;
- guint64 _tmp3_;
- gint _tmp4_;
-#line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp2_ = count;
+ gint _tmp3_;
#line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp3_ = self->priv->last_count;
+ _tmp2_ = self->priv->last_count;
#line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp4_ = self->priv->update_every;
+ _tmp3_ = self->priv->update_every;
#line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp0_ = (_tmp2_ - _tmp3_) >= ((guint64) _tmp4_);
-#line 480 "ProgressDialog.c"
+ _tmp0_ = (count - _tmp2_) >= ((guint64) _tmp3_);
+#line 483 "ProgressDialog.c"
}
#line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
if (_tmp0_) {
-#line 484 "ProgressDialog.c"
- guint64 _tmp5_;
- guint64 _tmp6_;
- guint64 _tmp7_;
-#line 118 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp5_ = count;
-#line 118 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp6_ = total;
#line 118 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- progress_dialog_set_percentage (self, ((gdouble) _tmp5_) / ((gdouble) _tmp6_));
+ progress_dialog_set_percentage (self, ((gdouble) count) / ((gdouble) total));
#line 119 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp7_ = count;
-#line 119 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- self->priv->last_count = _tmp7_;
-#line 498 "ProgressDialog.c"
+ self->priv->last_count = count;
+#line 491 "ProgressDialog.c"
}
#line 122 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp9_ = self->priv->cancellable;
-#line 122 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- if (_tmp9_ != NULL) {
-#line 504 "ProgressDialog.c"
- GCancellable* _tmp10_;
- gboolean _tmp11_;
+ _tmp5_ = self->priv->cancellable;
#line 122 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp10_ = self->priv->cancellable;
+ if (_tmp5_ != NULL) {
+#line 497 "ProgressDialog.c"
+ GCancellable* _tmp6_;
#line 122 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp11_ = g_cancellable_is_cancelled (_tmp10_);
+ _tmp6_ = self->priv->cancellable;
#line 122 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp8_ = !_tmp11_;
-#line 513 "ProgressDialog.c"
+ _tmp4_ = !g_cancellable_is_cancelled (_tmp6_);
+#line 503 "ProgressDialog.c"
} else {
#line 122 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp8_ = TRUE;
-#line 517 "ProgressDialog.c"
+ _tmp4_ = TRUE;
+#line 507 "ProgressDialog.c"
}
#line 122 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- keep_going = _tmp8_;
-#line 130 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp12_ = do_event_loop;
+ keep_going = _tmp4_;
#line 130 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- if (_tmp12_) {
+ if (do_event_loop) {
#line 131 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
spin_event_loop ();
-#line 527 "ProgressDialog.c"
+#line 515 "ProgressDialog.c"
}
#line 133 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
result = keep_going;
#line 133 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
return result;
-#line 533 "ProgressDialog.c"
+#line 521 "ProgressDialog.c"
}
-void progress_dialog_close (ProgressDialog* self) {
+void
+progress_dialog_close (ProgressDialog* self)
+{
#line 136 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
g_return_if_fail (IS_PROGRESS_DIALOG (self));
#line 141 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 142 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 544 "ProgressDialog.c"
+#line 534 "ProgressDialog.c"
}
-static gboolean progress_dialog_on_window_closed (ProgressDialog* self) {
+static gboolean
+progress_dialog_on_window_closed (ProgressDialog* self)
+{
gboolean result = FALSE;
#line 145 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
g_return_val_if_fail (IS_PROGRESS_DIALOG (self), FALSE);
@@ -554,11 +546,13 @@ static gboolean progress_dialog_on_window_closed (ProgressDialog* self) {
result = FALSE;
#line 147 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
return result;
-#line 558 "ProgressDialog.c"
+#line 550 "ProgressDialog.c"
}
-static void progress_dialog_on_cancel (ProgressDialog* self) {
+static void
+progress_dialog_on_cancel (ProgressDialog* self)
+{
GCancellable* _tmp0_;
GtkButton* _tmp2_;
#line 151 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
@@ -567,23 +561,26 @@ static void progress_dialog_on_cancel (ProgressDialog* self) {
_tmp0_ = self->priv->cancellable;
#line 152 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
if (_tmp0_ != NULL) {
-#line 571 "ProgressDialog.c"
+#line 565 "ProgressDialog.c"
GCancellable* _tmp1_;
#line 153 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
_tmp1_ = self->priv->cancellable;
#line 153 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
g_cancellable_cancel (_tmp1_);
-#line 577 "ProgressDialog.c"
+#line 571 "ProgressDialog.c"
}
#line 155 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
_tmp2_ = self->priv->cancel_button;
#line 155 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 583 "ProgressDialog.c"
+#line 577 "ProgressDialog.c"
}
-static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct) {
+static void
+progress_dialog_maybe_show_all (ProgressDialog* self,
+ gdouble pct)
+{
gboolean _tmp0_ = FALSE;
gboolean _tmp1_;
gboolean _tmp2_;
@@ -595,61 +592,57 @@ static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct) {
_tmp2_ = _tmp1_;
#line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
if (!_tmp2_) {
-#line 599 "ProgressDialog.c"
+#line 596 "ProgressDialog.c"
gulong _tmp3_;
- gulong _tmp4_;
- gint _tmp5_;
+ gint _tmp4_;
#line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp3_ = now_ms ();
+ _tmp3_ = self->priv->time_started;
#line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp4_ = self->priv->time_started;
+ _tmp4_ = self->priv->minimum_on_screen_time_msec;
#line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp5_ = self->priv->minimum_on_screen_time_msec;
-#line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp0_ = (_tmp3_ - _tmp4_) > ((gulong) _tmp5_);
-#line 611 "ProgressDialog.c"
+ _tmp0_ = (now_ms () - _tmp3_) > ((gulong) _tmp4_);
+#line 605 "ProgressDialog.c"
} else {
#line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
_tmp0_ = FALSE;
-#line 615 "ProgressDialog.c"
+#line 609 "ProgressDialog.c"
}
#line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
if (_tmp0_) {
-#line 619 "ProgressDialog.c"
+#line 613 "ProgressDialog.c"
gdouble pps = 0.0;
- gdouble _tmp6_;
- gint _tmp7_;
+ gint _tmp5_;
gdouble ttc = 0.0;
- gdouble _tmp8_;
- gdouble _tmp9_;
- gint _tmp10_;
-#line 163 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp6_ = pct;
+ gdouble _tmp6_;
+ gdouble _tmp7_;
+ gint _tmp8_;
#line 163 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp7_ = self->priv->minimum_on_screen_time_msec;
+ _tmp5_ = self->priv->minimum_on_screen_time_msec;
#line 163 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- pps = (_tmp6_ * 100.0) / _tmp7_;
+ pps = (pct * 100.0) / _tmp5_;
#line 165 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp8_ = pps;
+ _tmp6_ = pps;
#line 165 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- ttc = 100.0 / _tmp8_;
+ ttc = 100.0 / _tmp6_;
#line 168 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp9_ = ttc;
+ _tmp7_ = ttc;
#line 168 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- _tmp10_ = self->priv->minimum_on_screen_time_msec;
+ _tmp8_ = self->priv->minimum_on_screen_time_msec;
#line 168 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
- if (_tmp9_ > ((gdouble) _tmp10_)) {
+ if (_tmp7_ > ((gdouble) _tmp8_)) {
#line 173 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 174 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
spin_event_loop ();
-#line 647 "ProgressDialog.c"
+#line 638 "ProgressDialog.c"
}
}
}
-static void progress_dialog_class_init (ProgressDialogClass * klass) {
+static void
+progress_dialog_class_init (ProgressDialogClass * klass)
+{
#line 8 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
progress_dialog_parent_class = g_type_class_peek_parent (klass);
#line 8 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
@@ -658,11 +651,13 @@ static void progress_dialog_class_init (ProgressDialogClass * klass) {
((GtkWidgetClass *) klass)->realize = (void (*) (GtkWidget *)) progress_dialog_real_realize;
#line 8 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
G_OBJECT_CLASS (klass)->finalize = progress_dialog_finalize;
-#line 662 "ProgressDialog.c"
+#line 655 "ProgressDialog.c"
}
-static void progress_dialog_instance_init (ProgressDialog * self) {
+static void
+progress_dialog_instance_init (ProgressDialog * self)
+{
GtkProgressBar* _tmp0_;
#line 8 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
self->priv = PROGRESS_DIALOG_GET_PRIVATE (self);
@@ -680,11 +675,13 @@ static void progress_dialog_instance_init (ProgressDialog * self) {
self->priv->update_every = 1;
#line 14 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
self->priv->minimum_on_screen_time_msec = 500;
-#line 684 "ProgressDialog.c"
+#line 679 "ProgressDialog.c"
}
-static void progress_dialog_finalize (GObject * obj) {
+static void
+progress_dialog_finalize (GObject * obj)
+{
ProgressDialog * self;
#line 8 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROGRESS_DIALOG, ProgressDialog);
@@ -696,11 +693,13 @@ static void progress_dialog_finalize (GObject * obj) {
_g_object_unref0 (self->priv->cancellable);
#line 8 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
G_OBJECT_CLASS (progress_dialog_parent_class)->finalize (obj);
-#line 700 "ProgressDialog.c"
+#line 697 "ProgressDialog.c"
}
-GType progress_dialog_get_type (void) {
+GType
+progress_dialog_get_type (void)
+{
static volatile gsize progress_dialog_type_id__volatile = 0;
if (g_once_init_enter (&progress_dialog_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ProgressDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) progress_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ProgressDialog), 0, (GInstanceInitFunc) progress_dialog_instance_init, NULL };
diff --git a/src/dialogs/SetBackground.c b/src/dialogs/SetBackground.c
index 3f4d45f..88577ce 100644
--- a/src/dialogs/SetBackground.c
+++ b/src/dialogs/SetBackground.c
@@ -1,4 +1,4 @@
-/* SetBackground.c generated by valac 0.36.6, the Vala compiler
+/* SetBackground.c generated by valac 0.40.4, the Vala compiler
* generated from SetBackground.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8,6 +8,7 @@
* See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
@@ -23,6 +24,11 @@
typedef struct _SetBackgroundPhotoDialog SetBackgroundPhotoDialog;
typedef struct _SetBackgroundPhotoDialogClass SetBackgroundPhotoDialogClass;
typedef struct _SetBackgroundPhotoDialogPrivate SetBackgroundPhotoDialogPrivate;
+enum {
+ SET_BACKGROUND_PHOTO_DIALOG_0_PROPERTY,
+ SET_BACKGROUND_PHOTO_DIALOG_NUM_PROPERTIES
+};
+static GParamSpec* set_background_photo_dialog_properties[SET_BACKGROUND_PHOTO_DIALOG_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define TYPE_PAGE_WINDOW (page_window_get_type ())
@@ -64,9 +70,6 @@ static gpointer set_background_photo_dialog_parent_class = NULL;
GType set_background_photo_dialog_get_type (void) G_GNUC_CONST;
#define SET_BACKGROUND_PHOTO_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialogPrivate))
-enum {
- SET_BACKGROUND_PHOTO_DIALOG_DUMMY_PROPERTY
-};
SetBackgroundPhotoDialog* set_background_photo_dialog_new (void);
SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type);
gint resources_use_header_bar (void);
@@ -74,42 +77,48 @@ GType page_window_get_type (void) G_GNUC_CONST;
GType app_window_get_type (void) G_GNUC_CONST;
AppWindow* app_window_get_instance (void);
static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoDialog* self);
-static void _set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
-gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gboolean* desktop_background, gboolean* screensaver);
+static void _set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender,
+ gpointer self);
+gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self,
+ gboolean* desktop_background,
+ gboolean* screensaver);
static void set_background_photo_dialog_finalize (GObject * obj);
-SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type) {
+SetBackgroundPhotoDialog*
+set_background_photo_dialog_construct (GType object_type)
+{
SetBackgroundPhotoDialog * self = NULL;
- gint _tmp0_;
+ AppWindow* _tmp0_;
AppWindow* _tmp1_;
- AppWindow* _tmp2_;
-#line 16 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
- _tmp0_ = resources_use_header_bar ();
#line 16 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
- self = (SetBackgroundPhotoDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
+ self = (SetBackgroundPhotoDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL);
#line 17 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
- _tmp1_ = app_window_get_instance ();
+ _tmp0_ = app_window_get_instance ();
#line 17 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 17 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
- gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow));
+ gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
#line 17 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
- _g_object_unref0 (_tmp2_);
+ _g_object_unref0 (_tmp1_);
#line 15 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
return self;
-#line 102 "SetBackground.c"
+#line 107 "SetBackground.c"
}
-SetBackgroundPhotoDialog* set_background_photo_dialog_new (void) {
+SetBackgroundPhotoDialog*
+set_background_photo_dialog_new (void)
+{
#line 15 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
return set_background_photo_dialog_construct (TYPE_SET_BACKGROUND_PHOTO_DIALOG);
-#line 109 "SetBackground.c"
+#line 116 "SetBackground.c"
}
-static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoDialog* self) {
+static void
+set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoDialog* self)
+{
gboolean _tmp0_ = FALSE;
GtkCheckButton* _tmp1_;
gboolean _tmp2_;
@@ -126,7 +135,7 @@ static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoD
if (_tmp3_) {
#line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
_tmp0_ = TRUE;
-#line 130 "SetBackground.c"
+#line 139 "SetBackground.c"
} else {
GtkCheckButton* _tmp4_;
gboolean _tmp5_;
@@ -139,59 +148,63 @@ static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoD
_tmp6_ = _tmp5_;
#line 24 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
_tmp0_ = _tmp6_;
-#line 143 "SetBackground.c"
+#line 152 "SetBackground.c"
}
#line 22 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp0_);
-#line 147 "SetBackground.c"
+#line 156 "SetBackground.c"
}
-static void _set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+static void
+_set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender,
+ gpointer self)
+{
#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
set_background_photo_dialog_on_checkbox_clicked ((SetBackgroundPhotoDialog*) self);
-#line 154 "SetBackground.c"
+#line 166 "SetBackground.c"
}
-gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gboolean* desktop_background, gboolean* screensaver) {
+gboolean
+set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self,
+ gboolean* desktop_background,
+ gboolean* screensaver)
+{
gboolean _vala_desktop_background = FALSE;
gboolean _vala_screensaver = FALSE;
gboolean result = FALSE;
gboolean _result_ = FALSE;
- gint _tmp0_;
- GtkCheckButton* _tmp1_;
+ GtkCheckButton* _tmp0_;
+ gboolean _tmp1_;
gboolean _tmp2_;
- gboolean _tmp3_;
- GtkCheckButton* _tmp4_;
+ GtkCheckButton* _tmp3_;
+ gboolean _tmp4_;
gboolean _tmp5_;
- gboolean _tmp6_;
#line 27 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
g_return_val_if_fail (IS_SET_BACKGROUND_PHOTO_DIALOG (self), FALSE);
#line 28 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 29 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
- _tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 29 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
- _result_ = _tmp0_ == ((gint) GTK_RESPONSE_OK);
+ _result_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)) == ((gint) GTK_RESPONSE_OK);
#line 30 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 32 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
- _tmp1_ = self->priv->desktop_background_checkbox;
+ _tmp0_ = self->priv->desktop_background_checkbox;
#line 32 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
- _tmp2_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton));
+ _tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
#line 32 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 32 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
- _vala_desktop_background = _tmp3_;
+ _vala_desktop_background = _tmp2_;
#line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
- _tmp4_ = self->priv->screensaver_checkbox;
+ _tmp3_ = self->priv->screensaver_checkbox;
#line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
- _tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
+ _tmp4_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton));
#line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_;
#line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
- _vala_screensaver = _tmp6_;
+ _vala_screensaver = _tmp5_;
#line 35 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 36 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
@@ -200,21 +213,23 @@ gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gb
if (desktop_background) {
#line 36 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
*desktop_background = _vala_desktop_background;
-#line 204 "SetBackground.c"
+#line 217 "SetBackground.c"
}
#line 36 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
if (screensaver) {
#line 36 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
*screensaver = _vala_screensaver;
-#line 210 "SetBackground.c"
+#line 223 "SetBackground.c"
}
#line 36 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
return result;
-#line 214 "SetBackground.c"
+#line 227 "SetBackground.c"
}
-static void set_background_photo_dialog_class_init (SetBackgroundPhotoDialogClass * klass) {
+static void
+set_background_photo_dialog_class_init (SetBackgroundPhotoDialogClass * klass)
+{
gint SetBackgroundPhotoDialog_private_offset;
#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
set_background_photo_dialog_parent_class = g_type_class_peek_parent (klass);
@@ -232,20 +247,24 @@ static void set_background_photo_dialog_class_init (SetBackgroundPhotoDialogClas
gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "screensaver_checkbox", FALSE, SetBackgroundPhotoDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundPhotoDialogPrivate, screensaver_checkbox));
#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_checkbox_clicked", G_CALLBACK(_set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled));
-#line 236 "SetBackground.c"
+#line 251 "SetBackground.c"
}
-static void set_background_photo_dialog_instance_init (SetBackgroundPhotoDialog * self) {
+static void
+set_background_photo_dialog_instance_init (SetBackgroundPhotoDialog * self)
+{
#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
self->priv = SET_BACKGROUND_PHOTO_DIALOG_GET_PRIVATE (self);
#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
gtk_widget_init_template (GTK_WIDGET (self));
-#line 245 "SetBackground.c"
+#line 262 "SetBackground.c"
}
-static void set_background_photo_dialog_finalize (GObject * obj) {
+static void
+set_background_photo_dialog_finalize (GObject * obj)
+{
SetBackgroundPhotoDialog * self;
#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialog);
@@ -255,11 +274,13 @@ static void set_background_photo_dialog_finalize (GObject * obj) {
_g_object_unref0 (self->priv->screensaver_checkbox);
#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
G_OBJECT_CLASS (set_background_photo_dialog_parent_class)->finalize (obj);
-#line 259 "SetBackground.c"
+#line 278 "SetBackground.c"
}
-GType set_background_photo_dialog_get_type (void) {
+GType
+set_background_photo_dialog_get_type (void)
+{
static volatile gsize set_background_photo_dialog_type_id__volatile = 0;
if (g_once_init_enter (&set_background_photo_dialog_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (SetBackgroundPhotoDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) set_background_photo_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SetBackgroundPhotoDialog), 0, (GInstanceInitFunc) set_background_photo_dialog_instance_init, NULL };
diff --git a/src/dialogs/SetBackgroundSlideshow.c b/src/dialogs/SetBackgroundSlideshow.c
index 6e13d67..aa581d4 100644
--- a/src/dialogs/SetBackgroundSlideshow.c
+++ b/src/dialogs/SetBackgroundSlideshow.c
@@ -1,4 +1,4 @@
-/* SetBackgroundSlideshow.c generated by valac 0.36.6, the Vala compiler
+/* SetBackgroundSlideshow.c generated by valac 0.40.4, the Vala compiler
* generated from SetBackgroundSlideshow.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8,6 +8,7 @@
* See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
@@ -28,6 +29,11 @@
typedef struct _SetBackgroundSlideshowDialog SetBackgroundSlideshowDialog;
typedef struct _SetBackgroundSlideshowDialogClass SetBackgroundSlideshowDialogClass;
typedef struct _SetBackgroundSlideshowDialogPrivate SetBackgroundSlideshowDialogPrivate;
+enum {
+ SET_BACKGROUND_SLIDESHOW_DIALOG_0_PROPERTY,
+ SET_BACKGROUND_SLIDESHOW_DIALOG_NUM_PROPERTIES
+};
+static GParamSpec* set_background_slideshow_dialog_properties[SET_BACKGROUND_SLIDESHOW_DIALOG_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define TYPE_PAGE_WINDOW (page_window_get_type ())
@@ -73,9 +79,6 @@ static gpointer set_background_slideshow_dialog_parent_class = NULL;
GType set_background_slideshow_dialog_get_type (void) G_GNUC_CONST;
#define SET_BACKGROUND_SLIDESHOW_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialogPrivate))
-enum {
- SET_BACKGROUND_SLIDESHOW_DIALOG_DUMMY_PROPERTY
-};
SetBackgroundSlideshowDialog* set_background_slideshow_dialog_new (void);
SetBackgroundSlideshowDialog* set_background_slideshow_dialog_construct (GType object_type);
gint resources_use_header_bar (void);
@@ -85,53 +88,63 @@ AppWindow* app_window_get_instance (void);
static void set_background_slideshow_dialog_real_constructed (GObject* base);
static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBackgroundSlideshowDialog* self);
static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSlideshowDialog* self);
-static void _set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
-static void _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self);
-gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* self, gint* delay_value, gboolean* desktop_background, gboolean* screensaver);
+static void _set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender,
+ gpointer self);
+static void _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender,
+ gpointer self);
+gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* self,
+ gint* delay_value,
+ gboolean* desktop_background,
+ gboolean* screensaver);
static void set_background_slideshow_dialog_finalize (GObject * obj);
-SetBackgroundSlideshowDialog* set_background_slideshow_dialog_construct (GType object_type) {
+SetBackgroundSlideshowDialog*
+set_background_slideshow_dialog_construct (GType object_type)
+{
SetBackgroundSlideshowDialog * self = NULL;
- gint _tmp0_;
+ AppWindow* _tmp0_;
AppWindow* _tmp1_;
- AppWindow* _tmp2_;
-#line 22 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp0_ = resources_use_header_bar ();
#line 22 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- self = (SetBackgroundSlideshowDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
+ self = (SetBackgroundSlideshowDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL);
#line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp1_ = app_window_get_instance ();
+ _tmp0_ = app_window_get_instance ();
#line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow));
+ gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
#line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _g_object_unref0 (_tmp2_);
+ _g_object_unref0 (_tmp1_);
#line 21 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
return self;
-#line 114 "SetBackgroundSlideshow.c"
+#line 121 "SetBackgroundSlideshow.c"
}
-SetBackgroundSlideshowDialog* set_background_slideshow_dialog_new (void) {
+SetBackgroundSlideshowDialog*
+set_background_slideshow_dialog_new (void)
+{
#line 21 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
return set_background_slideshow_dialog_construct (TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG);
-#line 121 "SetBackgroundSlideshow.c"
+#line 130 "SetBackgroundSlideshow.c"
}
-static void set_background_slideshow_dialog_real_constructed (GObject* base) {
+static void
+set_background_slideshow_dialog_real_constructed (GObject* base)
+{
SetBackgroundSlideshowDialog * self;
#line 26 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialog);
#line 27 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
set_background_slideshow_dialog_on_delay_scale_value_changed (self);
-#line 131 "SetBackgroundSlideshow.c"
+#line 142 "SetBackgroundSlideshow.c"
}
-static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSlideshowDialog* self) {
+static void
+set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSlideshowDialog* self)
+{
gboolean _tmp0_ = FALSE;
GtkCheckButton* _tmp1_;
gboolean _tmp2_;
@@ -148,7 +161,7 @@ static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSl
if (_tmp3_) {
#line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
_tmp0_ = TRUE;
-#line 152 "SetBackgroundSlideshow.c"
+#line 165 "SetBackgroundSlideshow.c"
} else {
GtkCheckButton* _tmp4_;
gboolean _tmp5_;
@@ -161,22 +174,27 @@ static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSl
_tmp6_ = _tmp5_;
#line 34 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
_tmp0_ = _tmp6_;
-#line 165 "SetBackgroundSlideshow.c"
+#line 178 "SetBackgroundSlideshow.c"
}
#line 32 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp0_);
-#line 169 "SetBackgroundSlideshow.c"
+#line 182 "SetBackgroundSlideshow.c"
}
-static void _set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+static void
+_set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender,
+ gpointer self)
+{
#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
set_background_slideshow_dialog_on_checkbox_clicked ((SetBackgroundSlideshowDialog*) self);
-#line 176 "SetBackgroundSlideshow.c"
+#line 192 "SetBackgroundSlideshow.c"
}
-static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBackgroundSlideshowDialog* self) {
+static void
+set_background_slideshow_dialog_on_delay_scale_value_changed (SetBackgroundSlideshowDialog* self)
+{
gdouble value = 0.0;
GtkScale* _tmp0_;
GtkAdjustment* _tmp1_;
@@ -184,12 +202,10 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac
gdouble _tmp3_;
gdouble _tmp4_;
gdouble _tmp5_;
- gdouble _tmp6_;
- gdouble _tmp7_;
gchar* text = NULL;
- gint _tmp8_;
- GtkLabel* _tmp25_;
- const gchar* _tmp26_;
+ gint _tmp6_;
+ GtkLabel* _tmp23_;
+ const gchar* _tmp24_;
#line 38 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
g_return_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self));
#line 39 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
@@ -207,171 +223,172 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac
#line 44 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
_tmp5_ = value;
#line 44 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp6_ = pow (_tmp5_, (gdouble) 5);
-#line 44 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp7_ = pow ((gdouble) 90, (gdouble) 5);
-#line 44 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- self->priv->delay_value = (gint) (((((_tmp6_ / _tmp7_) * 60) * 60) * 24) + 5);
+ self->priv->delay_value = (gint) (((((pow (_tmp5_, (gdouble) 5) / pow ((gdouble) 90, (gdouble) 5)) * 60) * 60) * 24) + 5);
#line 48 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp8_ = self->priv->delay_value;
+ _tmp6_ = self->priv->delay_value;
#line 48 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- if (_tmp8_ < 60) {
-#line 220 "SetBackgroundSlideshow.c"
- gint _tmp9_;
- gint _tmp10_;
- gchar* _tmp11_;
+ if (_tmp6_ < 60) {
+#line 232 "SetBackgroundSlideshow.c"
+ gint _tmp7_;
+ gint _tmp8_;
+ gchar* _tmp9_;
#line 49 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp9_ = self->priv->delay_value;
+ _tmp7_ = self->priv->delay_value;
#line 49 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp10_ = self->priv->delay_value;
+ _tmp8_ = self->priv->delay_value;
#line 49 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp11_ = g_strdup_printf (ngettext ("%d second", "%d seconds", (gulong) _tmp9_), _tmp10_);
+ _tmp9_ = g_strdup_printf (ngettext ("%d second", "%d seconds", (gulong) _tmp7_), _tmp8_);
#line 49 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
_g_free0 (text);
#line 49 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- text = _tmp11_;
-#line 234 "SetBackgroundSlideshow.c"
+ text = _tmp9_;
+#line 246 "SetBackgroundSlideshow.c"
} else {
- gint _tmp12_;
+ gint _tmp10_;
#line 50 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp12_ = self->priv->delay_value;
+ _tmp10_ = self->priv->delay_value;
#line 50 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- if (_tmp12_ < (60 * 60)) {
-#line 241 "SetBackgroundSlideshow.c"
+ if (_tmp10_ < (60 * 60)) {
+#line 253 "SetBackgroundSlideshow.c"
gint minutes = 0;
+ gint _tmp11_;
+ gint _tmp12_;
gint _tmp13_;
- gint _tmp14_;
+ gchar* _tmp14_;
gint _tmp15_;
- gchar* _tmp16_;
- gint _tmp17_;
#line 51 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp13_ = self->priv->delay_value;
+ _tmp11_ = self->priv->delay_value;
#line 51 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- minutes = _tmp13_ / 60;
+ minutes = _tmp11_ / 60;
#line 52 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp14_ = minutes;
+ _tmp12_ = minutes;
#line 52 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp15_ = minutes;
+ _tmp13_ = minutes;
#line 52 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp16_ = g_strdup_printf (ngettext ("%d minute", "%d minutes", (gulong) _tmp14_), _tmp15_);
+ _tmp14_ = g_strdup_printf (ngettext ("%d minute", "%d minutes", (gulong) _tmp12_), _tmp13_);
#line 52 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
_g_free0 (text);
#line 52 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- text = _tmp16_;
+ text = _tmp14_;
#line 53 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp17_ = minutes;
+ _tmp15_ = minutes;
#line 53 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- self->priv->delay_value = _tmp17_ * 60;
-#line 266 "SetBackgroundSlideshow.c"
+ self->priv->delay_value = _tmp15_ * 60;
+#line 278 "SetBackgroundSlideshow.c"
} else {
- gint _tmp18_;
+ gint _tmp16_;
#line 54 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp18_ = self->priv->delay_value;
+ _tmp16_ = self->priv->delay_value;
#line 54 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- if (_tmp18_ < ((60 * 60) * 24)) {
-#line 273 "SetBackgroundSlideshow.c"
+ if (_tmp16_ < ((60 * 60) * 24)) {
+#line 285 "SetBackgroundSlideshow.c"
gint hours = 0;
+ gint _tmp17_;
+ gint _tmp18_;
gint _tmp19_;
- gint _tmp20_;
+ gchar* _tmp20_;
gint _tmp21_;
- gchar* _tmp22_;
- gint _tmp23_;
#line 55 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp19_ = self->priv->delay_value;
+ _tmp17_ = self->priv->delay_value;
#line 55 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- hours = _tmp19_ / (60 * 60);
+ hours = _tmp17_ / (60 * 60);
#line 56 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp20_ = hours;
+ _tmp18_ = hours;
#line 56 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp21_ = hours;
+ _tmp19_ = hours;
#line 56 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp22_ = g_strdup_printf (ngettext ("%d hour", "%d hours", (gulong) _tmp20_), _tmp21_);
+ _tmp20_ = g_strdup_printf (ngettext ("%d hour", "%d hours", (gulong) _tmp18_), _tmp19_);
#line 56 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
_g_free0 (text);
#line 56 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- text = _tmp22_;
+ text = _tmp20_;
#line 57 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp23_ = hours;
+ _tmp21_ = hours;
#line 57 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- self->priv->delay_value = _tmp23_ * (60 * 60);
-#line 298 "SetBackgroundSlideshow.c"
+ self->priv->delay_value = _tmp21_ * (60 * 60);
+#line 310 "SetBackgroundSlideshow.c"
} else {
- gchar* _tmp24_;
+ gchar* _tmp22_;
#line 59 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp24_ = g_strdup (_ ("1 day"));
+ _tmp22_ = g_strdup (_ ("1 day"));
#line 59 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
_g_free0 (text);
#line 59 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- text = _tmp24_;
+ text = _tmp22_;
#line 60 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
self->priv->delay_value = (60 * 60) * 24;
-#line 309 "SetBackgroundSlideshow.c"
+#line 321 "SetBackgroundSlideshow.c"
}
}
}
#line 63 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp25_ = self->priv->delay_value_label;
+ _tmp23_ = self->priv->delay_value_label;
#line 63 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp26_ = text;
+ _tmp24_ = text;
#line 63 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- gtk_label_set_label (_tmp25_, _tmp26_);
+ gtk_label_set_label (_tmp23_, _tmp24_);
#line 38 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
_g_free0 (text);
-#line 321 "SetBackgroundSlideshow.c"
+#line 333 "SetBackgroundSlideshow.c"
}
-static void _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
+static void
+_set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender,
+ gpointer self)
+{
#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
set_background_slideshow_dialog_on_delay_scale_value_changed ((SetBackgroundSlideshowDialog*) self);
-#line 328 "SetBackgroundSlideshow.c"
+#line 343 "SetBackgroundSlideshow.c"
}
-gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* self, gint* delay_value, gboolean* desktop_background, gboolean* screensaver) {
+gboolean
+set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* self,
+ gint* delay_value,
+ gboolean* desktop_background,
+ gboolean* screensaver)
+{
gint _vala_delay_value = 0;
gboolean _vala_desktop_background = FALSE;
gboolean _vala_screensaver = FALSE;
gboolean result = FALSE;
gboolean _result_ = FALSE;
gint _tmp0_;
- gint _tmp1_;
- GtkCheckButton* _tmp2_;
+ GtkCheckButton* _tmp1_;
+ gboolean _tmp2_;
gboolean _tmp3_;
- gboolean _tmp4_;
- GtkCheckButton* _tmp5_;
+ GtkCheckButton* _tmp4_;
+ gboolean _tmp5_;
gboolean _tmp6_;
- gboolean _tmp7_;
#line 66 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
g_return_val_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self), FALSE);
#line 67 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 68 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 68 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _result_ = _tmp0_ == ((gint) GTK_RESPONSE_OK);
+ _result_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)) == ((gint) GTK_RESPONSE_OK);
#line 69 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 71 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp1_ = self->priv->delay_value;
+ _tmp0_ = self->priv->delay_value;
#line 71 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _vala_delay_value = _tmp1_;
+ _vala_delay_value = _tmp0_;
#line 72 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp2_ = self->priv->desktop_background_checkbox;
+ _tmp1_ = self->priv->desktop_background_checkbox;
#line 72 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp3_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton));
+ _tmp2_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton));
#line 72 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 72 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _vala_desktop_background = _tmp4_;
+ _vala_desktop_background = _tmp3_;
#line 73 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp5_ = self->priv->screensaver_checkbox;
+ _tmp4_ = self->priv->screensaver_checkbox;
#line 73 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp6_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_toggle_button_get_type (), GtkToggleButton));
+ _tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
#line 73 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 73 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
- _vala_screensaver = _tmp7_;
+ _vala_screensaver = _tmp6_;
#line 75 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
@@ -380,27 +397,29 @@ gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog*
if (delay_value) {
#line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
*delay_value = _vala_delay_value;
-#line 384 "SetBackgroundSlideshow.c"
+#line 401 "SetBackgroundSlideshow.c"
}
#line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
if (desktop_background) {
#line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
*desktop_background = _vala_desktop_background;
-#line 390 "SetBackgroundSlideshow.c"
+#line 407 "SetBackgroundSlideshow.c"
}
#line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
if (screensaver) {
#line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
*screensaver = _vala_screensaver;
-#line 396 "SetBackgroundSlideshow.c"
+#line 413 "SetBackgroundSlideshow.c"
}
#line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
return result;
-#line 400 "SetBackgroundSlideshow.c"
+#line 417 "SetBackgroundSlideshow.c"
}
-static void set_background_slideshow_dialog_class_init (SetBackgroundSlideshowDialogClass * klass) {
+static void
+set_background_slideshow_dialog_class_init (SetBackgroundSlideshowDialogClass * klass)
+{
gint SetBackgroundSlideshowDialog_private_offset;
#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
set_background_slideshow_dialog_parent_class = g_type_class_peek_parent (klass);
@@ -426,22 +445,26 @@ static void set_background_slideshow_dialog_class_init (SetBackgroundSlideshowDi
gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_checkbox_clicked", G_CALLBACK(_set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled));
#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_delay_scale_value_changed", G_CALLBACK(_set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed));
-#line 430 "SetBackgroundSlideshow.c"
+#line 449 "SetBackgroundSlideshow.c"
}
-static void set_background_slideshow_dialog_instance_init (SetBackgroundSlideshowDialog * self) {
+static void
+set_background_slideshow_dialog_instance_init (SetBackgroundSlideshowDialog * self)
+{
#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
self->priv = SET_BACKGROUND_SLIDESHOW_DIALOG_GET_PRIVATE (self);
#line 19 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
self->priv->delay_value = 0;
#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
gtk_widget_init_template (GTK_WIDGET (self));
-#line 441 "SetBackgroundSlideshow.c"
+#line 462 "SetBackgroundSlideshow.c"
}
-static void set_background_slideshow_dialog_finalize (GObject * obj) {
+static void
+set_background_slideshow_dialog_finalize (GObject * obj)
+{
SetBackgroundSlideshowDialog * self;
#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialog);
@@ -455,11 +478,13 @@ static void set_background_slideshow_dialog_finalize (GObject * obj) {
_g_object_unref0 (self->priv->delay_value_label);
#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
G_OBJECT_CLASS (set_background_slideshow_dialog_parent_class)->finalize (obj);
-#line 459 "SetBackgroundSlideshow.c"
+#line 482 "SetBackgroundSlideshow.c"
}
-GType set_background_slideshow_dialog_get_type (void) {
+GType
+set_background_slideshow_dialog_get_type (void)
+{
static volatile gsize set_background_slideshow_dialog_type_id__volatile = 0;
if (g_once_init_enter (&set_background_slideshow_dialog_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (SetBackgroundSlideshowDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) set_background_slideshow_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SetBackgroundSlideshowDialog), 0, (GInstanceInitFunc) set_background_slideshow_dialog_instance_init, NULL };
diff --git a/src/dialogs/TextEntry.c b/src/dialogs/TextEntry.c
index 6fa478f..97716a3 100644
--- a/src/dialogs/TextEntry.c
+++ b/src/dialogs/TextEntry.c
@@ -1,4 +1,4 @@
-/* TextEntry.c generated by valac 0.36.6, the Vala compiler
+/* TextEntry.c generated by valac 0.40.4, the Vala compiler
* generated from TextEntry.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8,6 +8,7 @@
* See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
@@ -26,6 +27,11 @@
typedef struct _TextEntryDialog TextEntryDialog;
typedef struct _TextEntryDialogClass TextEntryDialogClass;
typedef struct _TextEntryDialogPrivate TextEntryDialogPrivate;
+enum {
+ TEXT_ENTRY_DIALOG_0_PROPERTY,
+ TEXT_ENTRY_DIALOG_NUM_PROPERTIES
+};
+static GParamSpec* text_entry_dialog_properties[TEXT_ENTRY_DIALOG_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define TYPE_PAGE_WINDOW (page_window_get_type ())
@@ -81,69 +87,84 @@ static gpointer text_entry_dialog_parent_class = NULL;
GType text_entry_dialog_get_type (void) G_GNUC_CONST;
#define TEXT_ENTRY_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TEXT_ENTRY_DIALOG, TextEntryDialogPrivate))
-enum {
- TEXT_ENTRY_DIALOG_DUMMY_PROPERTY
-};
TextEntryDialog* text_entry_dialog_new (void);
TextEntryDialog* text_entry_dialog_construct (GType object_type);
gint resources_use_header_bar (void);
-void text_entry_dialog_setup (TextEntryDialog* self, TextEntryDialogOnModifyValidateType modify_validate, void* modify_validate_target, const gchar* title, const gchar* label, const gchar* initial_text, GeeCollection* completion_list, const gchar* completion_delimiter);
+void text_entry_dialog_setup (TextEntryDialog* self,
+ TextEntryDialogOnModifyValidateType modify_validate,
+ void* modify_validate_target,
+ const gchar* title,
+ const gchar* label,
+ const gchar* initial_text,
+ GeeCollection* completion_list,
+ const gchar* completion_delimiter);
GType page_window_get_type (void) G_GNUC_CONST;
GType app_window_get_type (void) G_GNUC_CONST;
AppWindow* app_window_get_instance (void);
void text_entry_dialog_on_entry_changed (TextEntryDialog* self);
-static void _text_entry_dialog_on_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _text_entry_dialog_on_entry_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self);
GType entry_multi_completion_get_type (void) G_GNUC_CONST;
-EntryMultiCompletion* entry_multi_completion_new (GeeCollection* completion_list, const gchar* delimiter);
-EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCollection* completion_list, const gchar* delimiter);
+EntryMultiCompletion* entry_multi_completion_new (GeeCollection* completion_list,
+ const gchar* delimiter);
+EntryMultiCompletion* entry_multi_completion_construct (GType object_type,
+ GeeCollection* completion_list,
+ const gchar* delimiter);
gchar* text_entry_dialog_execute (TextEntryDialog* self);
static void text_entry_dialog_finalize (GObject * obj);
-TextEntryDialog* text_entry_dialog_construct (GType object_type) {
+TextEntryDialog*
+text_entry_dialog_construct (GType object_type)
+{
TextEntryDialog * self = NULL;
- gint _tmp0_;
-#line 21 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp0_ = resources_use_header_bar ();
#line 21 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- self = (TextEntryDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
+ self = (TextEntryDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL);
#line 20 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
return self;
-#line 113 "TextEntry.c"
+#line 126 "TextEntry.c"
}
-TextEntryDialog* text_entry_dialog_new (void) {
+TextEntryDialog*
+text_entry_dialog_new (void)
+{
#line 20 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
return text_entry_dialog_construct (TYPE_TEXT_ENTRY_DIALOG);
-#line 120 "TextEntry.c"
+#line 135 "TextEntry.c"
}
-static void _text_entry_dialog_on_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_text_entry_dialog_on_entry_changed_gtk_editable_changed (GtkEditable* _sender,
+ gpointer self)
+{
#line 35 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
text_entry_dialog_on_entry_changed ((TextEntryDialog*) self);
-#line 127 "TextEntry.c"
+#line 145 "TextEntry.c"
}
-void text_entry_dialog_setup (TextEntryDialog* self, TextEntryDialogOnModifyValidateType modify_validate, void* modify_validate_target, const gchar* title, const gchar* label, const gchar* initial_text, GeeCollection* completion_list, const gchar* completion_delimiter) {
- const gchar* _tmp0_;
+void
+text_entry_dialog_setup (TextEntryDialog* self,
+ TextEntryDialogOnModifyValidateType modify_validate,
+ void* modify_validate_target,
+ const gchar* title,
+ const gchar* label,
+ const gchar* initial_text,
+ GeeCollection* completion_list,
+ const gchar* completion_delimiter)
+{
+ AppWindow* _tmp0_;
AppWindow* _tmp1_;
- AppWindow* _tmp2_;
- GdkWindow* _tmp3_;
+ GdkWindow* _tmp2_;
+ AppWindow* _tmp3_;
AppWindow* _tmp4_;
- AppWindow* _tmp5_;
- TextEntryDialogOnModifyValidateType _tmp6_;
- void* _tmp6__target;
- GtkLabel* _tmp7_;
- const gchar* _tmp8_;
- const gchar* _tmp9_ = NULL;
- const gchar* _tmp10_;
- GtkEntry* _tmp12_;
- GtkEntry* _tmp13_;
- GtkEntry* _tmp14_;
- GeeCollection* _tmp15_;
+ GtkLabel* _tmp5_;
+ const gchar* _tmp6_ = NULL;
+ GtkEntry* _tmp7_;
+ GtkEntry* _tmp8_;
+ GtkEntry* _tmp9_;
#line 24 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
#line 24 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
@@ -153,115 +174,93 @@ void text_entry_dialog_setup (TextEntryDialog* self, TextEntryDialogOnModifyVali
#line 24 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
g_return_if_fail ((completion_list == NULL) || GEE_IS_COLLECTION (completion_list));
#line 26 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp0_ = title;
-#line 26 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_);
+ gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), title);
#line 27 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp1_ = app_window_get_instance ();
+ _tmp0_ = app_window_get_instance ();
#line 27 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 27 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
+ _tmp2_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
#line 27 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp3_);
+ gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp2_);
#line 27 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _g_object_unref0 (_tmp2_);
+ _g_object_unref0 (_tmp1_);
#line 28 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp4_ = app_window_get_instance ();
+ _tmp3_ = app_window_get_instance ();
#line 28 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 28 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
+ gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow));
#line 28 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _g_object_unref0 (_tmp5_);
-#line 29 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp6_ = modify_validate;
+ _g_object_unref0 (_tmp4_);
#line 29 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp6__target = modify_validate_target;
+ self->priv->on_modify_validate = modify_validate;
#line 29 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- self->priv->on_modify_validate = _tmp6_;
-#line 29 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- self->priv->on_modify_validate_target = _tmp6__target;
-#line 31 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp7_ = self->priv->label;
+ self->priv->on_modify_validate_target = modify_validate_target;
#line 31 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp8_ = label;
+ _tmp5_ = self->priv->label;
#line 31 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- gtk_label_set_text (_tmp7_, _tmp8_);
+ gtk_label_set_text (_tmp5_, label);
#line 33 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp10_ = initial_text;
+ if (initial_text != NULL) {
#line 33 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- if (_tmp10_ != NULL) {
-#line 196 "TextEntry.c"
- const gchar* _tmp11_;
-#line 33 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp11_ = initial_text;
-#line 33 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp9_ = _tmp11_;
-#line 202 "TextEntry.c"
+ _tmp6_ = initial_text;
+#line 209 "TextEntry.c"
} else {
#line 33 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp9_ = "";
-#line 206 "TextEntry.c"
+ _tmp6_ = "";
+#line 213 "TextEntry.c"
}
#line 33 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp12_ = self->priv->entry;
+ _tmp7_ = self->priv->entry;
#line 33 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- gtk_entry_set_text (_tmp12_, _tmp9_);
+ gtk_entry_set_text (_tmp7_, _tmp6_);
#line 34 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp13_ = self->priv->entry;
+ _tmp8_ = self->priv->entry;
#line 34 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
+ gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
#line 35 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp14_ = self->priv->entry;
+ _tmp9_ = self->priv->entry;
#line 35 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _text_entry_dialog_on_entry_changed_gtk_editable_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _text_entry_dialog_on_entry_changed_gtk_editable_changed, self, 0);
#line 37 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp15_ = completion_list;
-#line 37 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- if (_tmp15_ != NULL) {
-#line 224 "TextEntry.c"
+ if (completion_list != NULL) {
+#line 229 "TextEntry.c"
EntryMultiCompletion* completion = NULL;
- GeeCollection* _tmp16_;
- const gchar* _tmp17_;
- EntryMultiCompletion* _tmp18_;
- GtkEntry* _tmp19_;
- EntryMultiCompletion* _tmp20_;
-#line 38 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp16_ = completion_list;
-#line 38 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp17_ = completion_delimiter;
+ EntryMultiCompletion* _tmp10_;
+ GtkEntry* _tmp11_;
+ EntryMultiCompletion* _tmp12_;
#line 38 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp18_ = entry_multi_completion_new (_tmp16_, _tmp17_);
+ _tmp10_ = entry_multi_completion_new (completion_list, completion_delimiter);
#line 38 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- completion = _tmp18_;
+ completion = _tmp10_;
#line 40 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp19_ = self->priv->entry;
+ _tmp11_ = self->priv->entry;
#line 40 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp20_ = completion;
+ _tmp12_ = completion;
#line 40 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- gtk_entry_set_completion (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_entry_completion_get_type (), GtkEntryCompletion));
+ gtk_entry_set_completion (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_entry_completion_get_type (), GtkEntryCompletion));
#line 37 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
_g_object_unref0 (completion);
-#line 247 "TextEntry.c"
+#line 246 "TextEntry.c"
}
#line 43 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 251 "TextEntry.c"
+#line 250 "TextEntry.c"
}
-gchar* text_entry_dialog_execute (TextEntryDialog* self) {
+gchar*
+text_entry_dialog_execute (TextEntryDialog* self)
+{
gchar* result = NULL;
gchar* text = NULL;
TextEntryDialogOnModifyValidateType _tmp0_;
void* _tmp0__target;
GtkEntry* _tmp1_;
const gchar* _tmp2_;
- gboolean _tmp3_;
- gint _tmp4_;
- GtkEntry* _tmp8_;
- guint _tmp9_;
+ GtkEntry* _tmp6_;
+ guint _tmp7_;
#line 46 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
g_return_val_if_fail (IS_TEXT_ENTRY_DIALOG (self), NULL);
#line 47 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
@@ -275,53 +274,50 @@ gchar* text_entry_dialog_execute (TextEntryDialog* self) {
#line 50 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
_tmp2_ = gtk_entry_get_text (_tmp1_);
#line 50 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp3_ = _tmp0_ (_tmp2_, _tmp0__target);
-#line 50 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp3_);
+ gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp0_ (_tmp2_, _tmp0__target));
#line 52 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 54 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp4_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 54 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- if (_tmp4_ == ((gint) GTK_RESPONSE_OK)) {
-#line 288 "TextEntry.c"
- GtkEntry* _tmp5_;
- const gchar* _tmp6_;
- gchar* _tmp7_;
+ if (gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)) == ((gint) GTK_RESPONSE_OK)) {
+#line 283 "TextEntry.c"
+ GtkEntry* _tmp3_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
#line 55 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp5_ = self->priv->entry;
+ _tmp3_ = self->priv->entry;
#line 55 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp6_ = gtk_entry_get_text (_tmp5_);
+ _tmp4_ = gtk_entry_get_text (_tmp3_);
#line 55 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp7_ = g_strdup (_tmp6_);
+ _tmp5_ = g_strdup (_tmp4_);
#line 55 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
_g_free0 (text);
#line 55 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- text = _tmp7_;
-#line 302 "TextEntry.c"
+ text = _tmp5_;
+#line 297 "TextEntry.c"
}
#line 57 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp8_ = self->priv->entry;
+ _tmp6_ = self->priv->entry;
#line 57 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp9_, NULL, FALSE);
+ g_signal_parse_name ("changed", gtk_editable_get_type (), &_tmp7_, NULL, FALSE);
#line 57 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _text_entry_dialog_on_entry_changed_gtk_editable_changed, self);
+ g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_editable_get_type (), GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _text_entry_dialog_on_entry_changed_gtk_editable_changed, self);
#line 58 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 60 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
result = text;
#line 60 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
return result;
-#line 316 "TextEntry.c"
+#line 311 "TextEntry.c"
}
-void text_entry_dialog_on_entry_changed (TextEntryDialog* self) {
+void
+text_entry_dialog_on_entry_changed (TextEntryDialog* self)
+{
TextEntryDialogOnModifyValidateType _tmp0_;
void* _tmp0__target;
GtkEntry* _tmp1_;
const gchar* _tmp2_;
- gboolean _tmp3_;
#line 63 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
#line 64 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
@@ -333,14 +329,14 @@ void text_entry_dialog_on_entry_changed (TextEntryDialog* self) {
#line 64 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
_tmp2_ = gtk_entry_get_text (_tmp1_);
#line 64 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- _tmp3_ = _tmp0_ (_tmp2_, _tmp0__target);
-#line 64 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
- gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp3_);
-#line 340 "TextEntry.c"
+ gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp0_ (_tmp2_, _tmp0__target));
+#line 334 "TextEntry.c"
}
-static void text_entry_dialog_class_init (TextEntryDialogClass * klass) {
+static void
+text_entry_dialog_class_init (TextEntryDialogClass * klass)
+{
gint TextEntryDialog_private_offset;
#line 9 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
text_entry_dialog_parent_class = g_type_class_peek_parent (klass);
@@ -356,20 +352,24 @@ static void text_entry_dialog_class_init (TextEntryDialogClass * klass) {
gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "entry", FALSE, TextEntryDialog_private_offset + G_STRUCT_OFFSET (TextEntryDialogPrivate, entry));
#line 9 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "label", FALSE, TextEntryDialog_private_offset + G_STRUCT_OFFSET (TextEntryDialogPrivate, label));
-#line 360 "TextEntry.c"
+#line 356 "TextEntry.c"
}
-static void text_entry_dialog_instance_init (TextEntryDialog * self) {
+static void
+text_entry_dialog_instance_init (TextEntryDialog * self)
+{
#line 9 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
self->priv = TEXT_ENTRY_DIALOG_GET_PRIVATE (self);
#line 9 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
gtk_widget_init_template (GTK_WIDGET (self));
-#line 369 "TextEntry.c"
+#line 367 "TextEntry.c"
}
-static void text_entry_dialog_finalize (GObject * obj) {
+static void
+text_entry_dialog_finalize (GObject * obj)
+{
TextEntryDialog * self;
#line 9 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TEXT_ENTRY_DIALOG, TextEntryDialog);
@@ -383,7 +383,9 @@ static void text_entry_dialog_finalize (GObject * obj) {
}
-GType text_entry_dialog_get_type (void) {
+GType
+text_entry_dialog_get_type (void)
+{
static volatile gsize text_entry_dialog_type_id__volatile = 0;
if (g_once_init_enter (&text_entry_dialog_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (TextEntryDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) text_entry_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TextEntryDialog), 0, (GInstanceInitFunc) text_entry_dialog_instance_init, NULL };
diff --git a/src/dialogs/WelcomeDialog.c b/src/dialogs/WelcomeDialog.c
index 153175b..5cbd541 100644
--- a/src/dialogs/WelcomeDialog.c
+++ b/src/dialogs/WelcomeDialog.c
@@ -1,4 +1,4 @@
-/* WelcomeDialog.c generated by valac 0.36.6, the Vala compiler
+/* WelcomeDialog.c generated by valac 0.40.4, the Vala compiler
* generated from WelcomeDialog.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8,6 +8,7 @@
* See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <stdlib.h>
@@ -46,6 +47,11 @@ typedef struct _WelcomeDialogPrivate WelcomeDialogPrivate;
typedef struct _SpitDataImportsWelcomeImportMetaHost SpitDataImportsWelcomeImportMetaHost;
typedef struct _SpitDataImportsWelcomeImportMetaHostClass SpitDataImportsWelcomeImportMetaHostClass;
+enum {
+ WELCOME_DIALOG_0_PROPERTY,
+ WELCOME_DIALOG_NUM_PROPERTIES
+};
+static GParamSpec* welcome_dialog_properties[WELCOME_DIALOG_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define _g_free0(var) (var = (g_free (var), NULL))
#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
@@ -93,64 +99,92 @@ void welcome_service_entry_execute (WelcomeServiceEntry* self);
GType welcome_dialog_get_type (void) G_GNUC_CONST;
GType spit_data_imports_welcome_import_meta_host_get_type (void) G_GNUC_CONST;
#define WELCOME_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_WELCOME_DIALOG, WelcomeDialogPrivate))
-enum {
- WELCOME_DIALOG_DUMMY_PROPERTY
-};
WelcomeDialog* welcome_dialog_new (GtkWindow* owner);
-WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner);
+WelcomeDialog* welcome_dialog_construct (GType object_type,
+ GtkWindow* owner);
gint resources_use_header_bar (void);
SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_new (WelcomeDialog* dialog);
-SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_construct (GType object_type, WelcomeDialog* dialog);
+SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_construct (GType object_type,
+ WelcomeDialog* dialog);
static gboolean welcome_dialog_is_system_pictures_import_possible (void);
#define RESOURCES_OK_LABEL _ ("_OK")
gchar* get_display_pathname (GFile* file);
GFile* app_dirs_get_import_dir (void);
static void welcome_dialog_install_import_content (WelcomeDialog* self);
void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImportMetaHost* self);
-void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEntry* entry);
-static void _vala_array_add4 (WelcomeServiceEntry** * array, int* length, int* size, WelcomeServiceEntry* value);
-static void _vala_array_add5 (GtkCheckButton** * array, int* length, int* size, GtkCheckButton* value);
-static void welcome_dialog_on_dismiss (WelcomeDialog* self, gint resp);
-gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** selected_import_entries, int* selected_import_entries_length1, gboolean* do_system_pictures_import);
-static void _welcome_dialog_on_dismiss_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self);
-static void _vala_array_add6 (WelcomeServiceEntry** * array, int* length, int* size, WelcomeServiceEntry* value);
-static WelcomeServiceEntry** _vala_array_dup1 (WelcomeServiceEntry** self, int length);
+void welcome_dialog_install_service_entry (WelcomeDialog* self,
+ WelcomeServiceEntry* entry);
+static void _vala_array_add4 (WelcomeServiceEntry** * array,
+ int* length,
+ int* size,
+ WelcomeServiceEntry* value);
+static void _vala_array_add5 (GtkCheckButton** * array,
+ int* length,
+ int* size,
+ GtkCheckButton* value);
+static void welcome_dialog_on_dismiss (WelcomeDialog* self,
+ gint resp);
+gboolean welcome_dialog_execute (WelcomeDialog* self,
+ WelcomeServiceEntry*** selected_import_entries,
+ int* selected_import_entries_length1,
+ gboolean* do_system_pictures_import);
+static void _welcome_dialog_on_dismiss_gtk_dialog_response (GtkDialog* _sender,
+ gint response_id,
+ gpointer self);
+static void _vala_array_add6 (WelcomeServiceEntry** * array,
+ int* length,
+ int* size,
+ WelcomeServiceEntry* value);
+static WelcomeServiceEntry** _vala_array_dup1 (WelcomeServiceEntry** self,
+ int length);
static void welcome_dialog_finalize (GObject * obj);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static void _vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
-gchar* welcome_service_entry_get_service_name (WelcomeServiceEntry* self) {
+gchar*
+welcome_service_entry_get_service_name (WelcomeServiceEntry* self)
+{
#line 9 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
g_return_val_if_fail (IS_WELCOME_SERVICE_ENTRY (self), NULL);
#line 9 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
return WELCOME_SERVICE_ENTRY_GET_INTERFACE (self)->get_service_name (self);
-#line 129 "WelcomeDialog.c"
+#line 157 "WelcomeDialog.c"
}
-void welcome_service_entry_execute (WelcomeServiceEntry* self) {
+void
+welcome_service_entry_execute (WelcomeServiceEntry* self)
+{
#line 11 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
g_return_if_fail (IS_WELCOME_SERVICE_ENTRY (self));
#line 11 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
WELCOME_SERVICE_ENTRY_GET_INTERFACE (self)->execute (self);
-#line 138 "WelcomeDialog.c"
+#line 168 "WelcomeDialog.c"
}
-static void welcome_service_entry_base_init (WelcomeServiceEntryIface * iface) {
+static void
+welcome_service_entry_base_init (WelcomeServiceEntryIface * iface)
+{
#line 8 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
static gboolean initialized = FALSE;
#line 8 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
if (!initialized) {
#line 8 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
initialized = TRUE;
-#line 149 "WelcomeDialog.c"
+#line 181 "WelcomeDialog.c"
}
}
-GType welcome_service_entry_get_type (void) {
+GType
+welcome_service_entry_get_type (void)
+{
static volatile gsize welcome_service_entry_type_id__volatile = 0;
if (g_once_init_enter (&welcome_service_entry_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (WelcomeServiceEntryIface), (GBaseInitFunc) welcome_service_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -163,122 +197,119 @@ GType welcome_service_entry_get_type (void) {
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 32 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
return self ? g_object_ref (self) : NULL;
-#line 170 "WelcomeDialog.c"
+#line 206 "WelcomeDialog.c"
}
-WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) {
+WelcomeDialog*
+welcome_dialog_construct (GType object_type,
+ GtkWindow* owner)
+{
WelcomeDialog * self = NULL;
- gint _tmp0_;
- SpitDataImportsWelcomeImportMetaHost* _tmp1_;
+ SpitDataImportsWelcomeImportMetaHost* _tmp0_;
gboolean show_system_pictures_import = FALSE;
- gboolean _tmp2_;
GtkWidget* ok_button = NULL;
- GtkWidget* _tmp3_;
- GtkWidget* _tmp4_;
- GtkWindow* _tmp5_;
+ GtkWidget* _tmp1_;
+ GtkWidget* _tmp2_;
GtkLabel* primary_text = NULL;
- GtkLabel* _tmp6_;
+ GtkLabel* _tmp3_;
+ GtkLabel* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
GtkLabel* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
+ GtkLabel* _tmp8_;
+ GtkLabel* _tmp9_;
GtkLabel* _tmp10_;
- GtkLabel* _tmp11_;
- GtkLabel* _tmp12_;
+ gchar* _tmp11_;
+ gchar* _tmp12_;
GtkLabel* _tmp13_;
- gchar* _tmp14_;
- gchar* _tmp15_;
- GtkLabel* _tmp16_;
- GtkLabel* _tmp17_;
+ GtkLabel* _tmp14_;
GtkImage* image = NULL;
- GtkImage* _tmp18_;
+ GtkImage* _tmp15_;
GtkBox* header_text = NULL;
+ GtkBox* _tmp16_;
+ GtkBox* _tmp17_;
+ GtkLabel* _tmp18_;
GtkBox* _tmp19_;
- GtkBox* _tmp20_;
- GtkLabel* _tmp21_;
- GtkBox* _tmp22_;
- GtkLabel* _tmp23_;
+ GtkLabel* _tmp20_;
GtkBox* header_content = NULL;
+ GtkBox* _tmp21_;
+ GtkBox* _tmp22_;
+ GtkImage* _tmp23_;
GtkBox* _tmp24_;
GtkBox* _tmp25_;
- GtkImage* _tmp26_;
- GtkBox* _tmp27_;
- GtkBox* _tmp28_;
GtkLabel* instructions = NULL;
- GtkLabel* _tmp29_;
+ GtkLabel* _tmp26_;
gchar* indent_prefix = NULL;
- gchar* _tmp30_;
- const gchar* _tmp31_ = NULL;
- GtkTextDirection _tmp32_;
+ gchar* _tmp27_;
+ const gchar* _tmp28_ = NULL;
gchar* arrow_glyph = NULL;
+ gchar* _tmp29_;
+ GtkLabel* _tmp30_;
+ const gchar* _tmp31_;
+ gchar* _tmp32_;
gchar* _tmp33_;
- GtkLabel* _tmp34_;
- const gchar* _tmp35_;
+ const gchar* _tmp34_;
+ gchar* _tmp35_;
gchar* _tmp36_;
gchar* _tmp37_;
- const gchar* _tmp38_;
- gchar* _tmp39_;
+ gchar* _tmp38_;
+ const gchar* _tmp39_;
gchar* _tmp40_;
gchar* _tmp41_;
gchar* _tmp42_;
- const gchar* _tmp43_;
- gchar* _tmp44_;
+ gchar* _tmp43_;
+ const gchar* _tmp44_;
gchar* _tmp45_;
gchar* _tmp46_;
gchar* _tmp47_;
- const gchar* _tmp48_;
- gchar* _tmp49_;
- gchar* _tmp50_;
- gchar* _tmp51_;
- gchar* _tmp52_;
- GtkLabel* _tmp53_;
- GtkLabel* _tmp54_;
- GtkBox* _tmp55_;
- GtkBox* _tmp56_;
- GtkBox* _tmp57_;
- GtkBox* _tmp58_;
- gboolean _tmp59_;
- GtkLabel* _tmp70_;
- GtkLabel* _tmp71_;
- GtkLabel* _tmp72_;
- GtkLabel* _tmp73_;
+ gchar* _tmp48_;
+ GtkLabel* _tmp49_;
+ GtkLabel* _tmp50_;
+ GtkBox* _tmp51_;
+ GtkBox* _tmp52_;
+ GtkBox* _tmp53_;
+ GtkBox* _tmp54_;
+ gboolean _tmp55_;
+ GtkLabel* _tmp66_;
+ GtkLabel* _tmp67_;
+ GtkLabel* _tmp68_;
+ GtkLabel* _tmp69_;
GtkBox* content = NULL;
- GtkBox* _tmp74_;
- GtkBox* _tmp75_;
- GtkBox* _tmp76_;
- GtkBox* _tmp77_;
- GtkLabel* _tmp78_;
- GtkCheckButton* _tmp79_;
- GtkCheckButton* _tmp80_;
- GtkCheckButton* _tmp81_;
- GtkBox* _tmp82_;
- GtkWidget* _tmp83_;
- SpitDataImportsWelcomeImportMetaHost* _tmp84_;
+ GtkBox* _tmp70_;
+ GtkBox* _tmp71_;
+ GtkBox* _tmp72_;
+ GtkBox* _tmp73_;
+ GtkLabel* _tmp74_;
+ GtkCheckButton* _tmp75_;
+ GtkCheckButton* _tmp76_;
+ GtkCheckButton* _tmp77_;
+ GtkBox* _tmp78_;
+ GtkWidget* _tmp79_;
+ SpitDataImportsWelcomeImportMetaHost* _tmp80_;
#line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
g_return_val_if_fail (GTK_IS_WINDOW (owner), NULL);
#line 29 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp0_ = resources_use_header_bar ();
-#line 29 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- self = (WelcomeDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
+ self = (WelcomeDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL);
#line 30 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp1_ = spit_data_imports_welcome_import_meta_host_new (self);
+ _tmp0_ = spit_data_imports_welcome_import_meta_host_new (self);
#line 30 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_g_object_unref0 (self->priv->import_meta_host);
#line 30 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- self->priv->import_meta_host = _tmp1_;
-#line 31 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp2_ = welcome_dialog_is_system_pictures_import_possible ();
+ self->priv->import_meta_host = _tmp0_;
#line 31 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- show_system_pictures_import = _tmp2_;
+ show_system_pictures_import = welcome_dialog_is_system_pictures_import_possible ();
#line 32 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp3_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_CLOSE);
+ _tmp1_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_CLOSE);
#line 32 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp4_ = _g_object_ref0 (_tmp3_);
+ _tmp2_ = _g_object_ref0 (_tmp1_);
#line 32 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- ok_button = _tmp4_;
+ ok_button = _tmp2_;
#line 33 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CLOSE);
#line 35 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
@@ -288,326 +319,322 @@ WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) {
#line 37 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG);
#line 38 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp5_ = owner;
-#line 38 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp5_);
+ gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), owner);
#line 40 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp6_ = (GtkLabel*) gtk_label_new ("");
+ _tmp3_ = (GtkLabel*) gtk_label_new ("");
#line 40 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- g_object_ref_sink (_tmp6_);
+ g_object_ref_sink (_tmp3_);
#line 40 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- primary_text = _tmp6_;
+ primary_text = _tmp3_;
#line 41 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp7_ = primary_text;
+ _tmp4_ = primary_text;
#line 41 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp8_ = g_strdup_printf ("<span size=\"large\" weight=\"bold\">%s</span>", _ ("Welcome to Shotwell!"));
+ _tmp5_ = g_strdup_printf ("<span size=\"large\" weight=\"bold\">%s</span>", _ ("Welcome to Shotwell!"));
#line 41 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp9_ = _tmp8_;
+ _tmp6_ = _tmp5_;
#line 41 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_label_set_markup (_tmp7_, _tmp9_);
+ gtk_label_set_markup (_tmp4_, _tmp6_);
#line 41 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp6_);
#line 43 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp10_ = primary_text;
+ _tmp7_ = primary_text;
#line 43 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_label_set_xalign (_tmp10_, 0.0f);
+ gtk_label_set_xalign (_tmp7_, 0.0f);
#line 44 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp11_ = primary_text;
+ _tmp8_ = primary_text;
#line 44 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_label_set_yalign (_tmp11_, 0.5f);
+ gtk_label_set_yalign (_tmp8_, 0.5f);
#line 45 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp12_ = (GtkLabel*) gtk_label_new ("");
+ _tmp9_ = (GtkLabel*) gtk_label_new ("");
#line 45 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- g_object_ref_sink (_tmp12_);
+ g_object_ref_sink (_tmp9_);
#line 45 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_g_object_unref0 (self->priv->secondary_text);
#line 45 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- self->priv->secondary_text = _tmp12_;
+ self->priv->secondary_text = _tmp9_;
#line 46 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp13_ = self->priv->secondary_text;
+ _tmp10_ = self->priv->secondary_text;
#line 46 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp14_ = g_strdup_printf ("<span weight=\"normal\">%s</span>", _ ("To get started, import photos in any of these ways:"));
+ _tmp11_ = g_strdup_printf ("<span weight=\"normal\">%s</span>", _ ("To get started, import photos in any of these ways:"));
#line 46 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp15_ = _tmp14_;
+ _tmp12_ = _tmp11_;
#line 46 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_label_set_markup (_tmp13_, _tmp15_);
+ gtk_label_set_markup (_tmp10_, _tmp12_);
#line 46 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _g_free0 (_tmp15_);
+ _g_free0 (_tmp12_);
#line 48 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp16_ = self->priv->secondary_text;
+ _tmp13_ = self->priv->secondary_text;
#line 48 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_label_set_xalign (_tmp16_, 0.0f);
+ gtk_label_set_xalign (_tmp13_, 0.0f);
#line 49 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp17_ = self->priv->secondary_text;
+ _tmp14_ = self->priv->secondary_text;
#line 49 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_label_set_yalign (_tmp17_, 0.5f);
+ gtk_label_set_yalign (_tmp14_, 0.5f);
#line 50 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp18_ = (GtkImage*) gtk_image_new_from_icon_name ("shotwell", GTK_ICON_SIZE_DIALOG);
+ _tmp15_ = (GtkImage*) gtk_image_new_from_icon_name ("shotwell", (GtkIconSize) GTK_ICON_SIZE_DIALOG);
#line 50 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- g_object_ref_sink (_tmp18_);
+ g_object_ref_sink (_tmp15_);
#line 50 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- image = _tmp18_;
+ image = _tmp15_;
#line 52 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp19_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ _tmp16_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
#line 52 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- g_object_ref_sink (_tmp19_);
+ g_object_ref_sink (_tmp16_);
#line 52 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- header_text = _tmp19_;
+ header_text = _tmp16_;
#line 53 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp20_ = header_text;
+ _tmp17_ = header_text;
#line 53 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp21_ = primary_text;
+ _tmp18_ = primary_text;
#line 53 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_box_pack_start (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 5);
+ gtk_box_pack_start (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 5);
#line 54 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp22_ = header_text;
+ _tmp19_ = header_text;
#line 54 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp23_ = self->priv->secondary_text;
+ _tmp20_ = self->priv->secondary_text;
#line 54 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+ gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
#line 56 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp24_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+ _tmp21_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
#line 56 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- g_object_ref_sink (_tmp24_);
+ g_object_ref_sink (_tmp21_);
#line 56 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- header_content = _tmp24_;
+ header_content = _tmp21_;
#line 57 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp25_ = header_content;
+ _tmp22_ = header_content;
#line 57 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp26_ = image;
+ _tmp23_ = image;
#line 57 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_box_pack_start (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+ gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
#line 58 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp27_ = header_content;
+ _tmp24_ = header_content;
#line 58 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp28_ = header_text;
+ _tmp25_ = header_text;
#line 58 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_box_pack_start (_tmp27_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+ gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
#line 60 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp29_ = (GtkLabel*) gtk_label_new ("");
+ _tmp26_ = (GtkLabel*) gtk_label_new ("");
#line 60 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- g_object_ref_sink (_tmp29_);
+ g_object_ref_sink (_tmp26_);
#line 60 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- instructions = _tmp29_;
+ instructions = _tmp26_;
#line 61 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp30_ = g_strdup (" ");
+ _tmp27_ = g_strdup (" ");
#line 61 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- indent_prefix = _tmp30_;
+ indent_prefix = _tmp27_;
#line 63 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp32_ = gtk_widget_get_direction (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+ if (gtk_widget_get_direction (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)) == GTK_TEXT_DIR_RTL) {
#line 63 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- if (_tmp32_ == GTK_TEXT_DIR_RTL) {
-#line 63 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp31_ = "◂";
-#line 403 "WelcomeDialog.c"
+ _tmp28_ = "◂";
+#line 430 "WelcomeDialog.c"
} else {
#line 63 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp31_ = "▸";
-#line 407 "WelcomeDialog.c"
+ _tmp28_ = "▸";
+#line 434 "WelcomeDialog.c"
}
#line 63 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp33_ = g_strdup (_tmp31_);
+ _tmp29_ = g_strdup (_tmp28_);
#line 63 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- arrow_glyph = _tmp33_;
+ arrow_glyph = _tmp29_;
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp34_ = instructions;
+ _tmp30_ = instructions;
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp35_ = indent_prefix;
+ _tmp31_ = indent_prefix;
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp36_ = g_strconcat (_tmp35_, "&#8226; %s\n", NULL);
+ _tmp32_ = g_strconcat (_tmp31_, "&#8226; %s\n", NULL);
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp37_ = _tmp36_;
+ _tmp33_ = _tmp32_;
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp38_ = indent_prefix;
+ _tmp34_ = indent_prefix;
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp39_ = g_strconcat (_tmp38_, "&#8226; %s\n", NULL);
+ _tmp35_ = g_strconcat (_tmp34_, "&#8226; %s\n", NULL);
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp40_ = _tmp39_;
+ _tmp36_ = _tmp35_;
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp41_ = g_strconcat (_tmp37_, _tmp40_, NULL);
+ _tmp37_ = g_strconcat (_tmp33_, _tmp36_, NULL);
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp42_ = _tmp41_;
+ _tmp38_ = _tmp37_;
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp43_ = indent_prefix;
+ _tmp39_ = indent_prefix;
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp44_ = g_strconcat (_tmp43_, "&#8226; %s", NULL);
+ _tmp40_ = g_strconcat (_tmp39_, "&#8226; %s", NULL);
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp45_ = _tmp44_;
+ _tmp41_ = _tmp40_;
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp46_ = g_strconcat (_tmp42_, _tmp45_, NULL);
+ _tmp42_ = g_strconcat (_tmp38_, _tmp41_, NULL);
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp47_ = _tmp46_;
+ _tmp43_ = _tmp42_;
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp48_ = arrow_glyph;
+ _tmp44_ = arrow_glyph;
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp49_ = g_strdup_printf (_ ("Choose <span weight=\"bold\">File %s Import From Folder</span>"), _tmp48_);
+ _tmp45_ = g_strdup_printf (_ ("Choose <span weight=\"bold\">File %s Import From Folder</span>"), _tmp44_);
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp50_ = _tmp49_;
+ _tmp46_ = _tmp45_;
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp51_ = g_strdup_printf (_tmp47_, _tmp50_, _ ("Drag and drop photos onto the Shotwell window"), _ ("Connect a camera to your computer and import"));
+ _tmp47_ = g_strdup_printf (_tmp43_, _tmp46_, _ ("Drag and drop photos onto the Shotwell window"), _ ("Connect a camera to your computer and import"));
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp52_ = _tmp51_;
+ _tmp48_ = _tmp47_;
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_label_set_markup (_tmp34_, _tmp52_);
+ gtk_label_set_markup (_tmp30_, _tmp48_);
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _g_free0 (_tmp52_);
+ _g_free0 (_tmp48_);
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _g_free0 (_tmp50_);
+ _g_free0 (_tmp46_);
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _g_free0 (_tmp47_);
+ _g_free0 (_tmp43_);
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _g_free0 (_tmp45_);
+ _g_free0 (_tmp41_);
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _g_free0 (_tmp42_);
+ _g_free0 (_tmp38_);
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _g_free0 (_tmp40_);
+ _g_free0 (_tmp36_);
#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _g_free0 (_tmp37_);
+ _g_free0 (_tmp33_);
#line 70 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp53_ = instructions;
+ _tmp49_ = instructions;
#line 70 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_label_set_xalign (_tmp53_, 0.0f);
+ gtk_label_set_xalign (_tmp49_, 0.0f);
#line 71 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp54_ = instructions;
+ _tmp50_ = instructions;
#line 71 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_label_set_yalign (_tmp54_, 0.5f);
+ gtk_label_set_yalign (_tmp50_, 0.5f);
#line 73 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp55_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+ _tmp51_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
#line 73 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- g_object_ref_sink (_tmp55_);
+ g_object_ref_sink (_tmp51_);
#line 73 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_g_object_unref0 (self->priv->import_action_checkbox_packer);
#line 73 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- self->priv->import_action_checkbox_packer = _tmp55_;
+ self->priv->import_action_checkbox_packer = _tmp51_;
#line 75 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp56_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+ _tmp52_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
#line 75 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- g_object_ref_sink (_tmp56_);
+ g_object_ref_sink (_tmp52_);
#line 75 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_g_object_unref0 (self->priv->external_import_action_checkbox_packer);
#line 75 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- self->priv->external_import_action_checkbox_packer = _tmp56_;
+ self->priv->external_import_action_checkbox_packer = _tmp52_;
#line 76 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp57_ = self->priv->import_action_checkbox_packer;
+ _tmp53_ = self->priv->import_action_checkbox_packer;
#line 76 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp58_ = self->priv->external_import_action_checkbox_packer;
+ _tmp54_ = self->priv->external_import_action_checkbox_packer;
#line 76 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget));
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget));
#line 78 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp59_ = show_system_pictures_import;
+ _tmp55_ = show_system_pictures_import;
#line 78 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- if (_tmp59_) {
-#line 501 "WelcomeDialog.c"
- GFile* _tmp60_;
- GFile* _tmp61_;
- gchar* _tmp62_;
- gchar* _tmp63_;
- gchar* _tmp64_;
- gchar* _tmp65_;
- GtkCheckButton* _tmp66_;
- GtkBox* _tmp67_;
- GtkCheckButton* _tmp68_;
- GtkCheckButton* _tmp69_;
+ if (_tmp55_) {
+#line 528 "WelcomeDialog.c"
+ GFile* _tmp56_;
+ GFile* _tmp57_;
+ gchar* _tmp58_;
+ gchar* _tmp59_;
+ gchar* _tmp60_;
+ gchar* _tmp61_;
+ GtkCheckButton* _tmp62_;
+ GtkBox* _tmp63_;
+ GtkCheckButton* _tmp64_;
+ GtkCheckButton* _tmp65_;
#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp60_ = app_dirs_get_import_dir ();
+ _tmp56_ = app_dirs_get_import_dir ();
#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp61_ = _tmp60_;
+ _tmp57_ = _tmp56_;
#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp62_ = get_display_pathname (_tmp61_);
+ _tmp58_ = get_display_pathname (_tmp57_);
#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp63_ = _tmp62_;
+ _tmp59_ = _tmp58_;
#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp64_ = g_strdup_printf (_ ("_Import photos from your %s folder"), _tmp63_);
+ _tmp60_ = g_strdup_printf (_ ("_Import photos from your %s folder"), _tmp59_);
#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp65_ = _tmp64_;
+ _tmp61_ = _tmp60_;
#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp66_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp65_);
+ _tmp62_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp61_);
#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- g_object_ref_sink (_tmp66_);
+ g_object_ref_sink (_tmp62_);
#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_g_object_unref0 (self->priv->system_pictures_import_check);
#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- self->priv->system_pictures_import_check = _tmp66_;
+ self->priv->system_pictures_import_check = _tmp62_;
#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _g_free0 (_tmp65_);
+ _g_free0 (_tmp61_);
#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _g_free0 (_tmp63_);
+ _g_free0 (_tmp59_);
#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _g_object_unref0 (_tmp61_);
+ _g_object_unref0 (_tmp57_);
#line 82 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp67_ = self->priv->import_action_checkbox_packer;
+ _tmp63_ = self->priv->import_action_checkbox_packer;
#line 82 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp68_ = self->priv->system_pictures_import_check;
+ _tmp64_ = self->priv->system_pictures_import_check;
#line 82 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_widget_get_type (), GtkWidget));
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget));
#line 83 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp69_ = self->priv->system_pictures_import_check;
+ _tmp65_ = self->priv->system_pictures_import_check;
#line 83 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 548 "WelcomeDialog.c"
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+#line 575 "WelcomeDialog.c"
}
#line 86 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp70_ = (GtkLabel*) gtk_label_new (_ ("You can also import photos in any of these ways:"));
+ _tmp66_ = (GtkLabel*) gtk_label_new (_ ("You can also import photos in any of these ways:"));
#line 86 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- g_object_ref_sink (_tmp70_);
+ g_object_ref_sink (_tmp66_);
#line 86 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_g_object_unref0 (self->priv->instruction_header);
#line 86 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- self->priv->instruction_header = _tmp70_;
+ self->priv->instruction_header = _tmp66_;
#line 88 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp71_ = self->priv->instruction_header;
+ _tmp67_ = self->priv->instruction_header;
#line 88 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_label_set_xalign (_tmp71_, 0.0f);
+ gtk_label_set_xalign (_tmp67_, 0.0f);
#line 89 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp72_ = self->priv->instruction_header;
+ _tmp68_ = self->priv->instruction_header;
#line 89 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_label_set_yalign (_tmp72_, 0.5f);
+ gtk_label_set_yalign (_tmp68_, 0.5f);
#line 90 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp73_ = self->priv->instruction_header;
+ _tmp69_ = self->priv->instruction_header;
#line 90 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_widget_get_type (), GtkWidget), 20);
+ gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget), 20);
#line 92 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp74_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 16);
+ _tmp70_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 16);
#line 92 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- g_object_ref_sink (_tmp74_);
+ g_object_ref_sink (_tmp70_);
#line 92 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- content = _tmp74_;
+ content = _tmp70_;
#line 93 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp75_ = header_content;
+ _tmp71_ = header_content;
#line 93 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+ gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
#line 94 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp76_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+ _tmp72_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
#line 94 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- g_object_ref_sink (_tmp76_);
+ g_object_ref_sink (_tmp72_);
#line 94 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_g_object_unref0 (self->priv->import_content);
#line 94 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- self->priv->import_content = _tmp76_;
+ self->priv->import_content = _tmp72_;
#line 95 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp77_ = self->priv->import_content;
+ _tmp73_ = self->priv->import_content;
#line 95 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget));
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_widget_get_type (), GtkWidget));
#line 96 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp78_ = instructions;
+ _tmp74_ = instructions;
#line 96 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+ gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
#line 98 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp79_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_ ("_Don’t show this message again"));
+ _tmp75_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_ ("_Don’t show this message again"));
#line 98 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- g_object_ref_sink (_tmp79_);
+ g_object_ref_sink (_tmp75_);
#line 98 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_g_object_unref0 (self->priv->hide_button);
#line 98 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- self->priv->hide_button = _tmp79_;
+ self->priv->hide_button = _tmp75_;
#line 99 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp80_ = self->priv->hide_button;
+ _tmp76_ = self->priv->hide_button;
#line 99 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
#line 100 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp81_ = self->priv->hide_button;
+ _tmp77_ = self->priv->hide_button;
#line 100 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6);
+ gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6);
#line 101 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
#line 102 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
@@ -625,19 +652,19 @@ WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) {
#line 108 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 12);
#line 110 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp82_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+ _tmp78_ = gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
#line 110 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+ gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
#line 112 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp83_ = ok_button;
+ _tmp79_ = ok_button;
#line 112 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_widget_grab_focus (_tmp83_);
+ gtk_widget_grab_focus (_tmp79_);
#line 114 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
welcome_dialog_install_import_content (self);
#line 116 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp84_ = self->priv->import_meta_host;
+ _tmp80_ = self->priv->import_meta_host;
#line 116 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- spit_data_imports_welcome_import_meta_host_start (_tmp84_);
+ spit_data_imports_welcome_import_meta_host_start (_tmp80_);
#line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_g_object_unref0 (content);
#line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
@@ -658,18 +685,22 @@ WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) {
_g_object_unref0 (ok_button);
#line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
return self;
-#line 662 "WelcomeDialog.c"
+#line 689 "WelcomeDialog.c"
}
-WelcomeDialog* welcome_dialog_new (GtkWindow* owner) {
+WelcomeDialog*
+welcome_dialog_new (GtkWindow* owner)
+{
#line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
return welcome_dialog_construct (TYPE_WELCOME_DIALOG, owner);
-#line 669 "WelcomeDialog.c"
+#line 698 "WelcomeDialog.c"
}
-static void welcome_dialog_install_import_content (WelcomeDialog* self) {
+static void
+welcome_dialog_install_import_content (WelcomeDialog* self)
+{
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
GtkCheckButton** _tmp2_;
@@ -684,32 +715,32 @@ static void welcome_dialog_install_import_content (WelcomeDialog* self) {
if (_tmp2__length1 > 0) {
#line 121 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_tmp1_ = TRUE;
-#line 688 "WelcomeDialog.c"
+#line 719 "WelcomeDialog.c"
} else {
GtkCheckButton* _tmp3_;
#line 121 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_tmp3_ = self->priv->system_pictures_import_check;
#line 121 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_tmp1_ = _tmp3_ != NULL;
-#line 695 "WelcomeDialog.c"
+#line 726 "WelcomeDialog.c"
}
#line 121 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
if (_tmp1_) {
-#line 699 "WelcomeDialog.c"
+#line 730 "WelcomeDialog.c"
gboolean _tmp4_;
#line 122 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_tmp4_ = self->priv->import_content_already_installed;
#line 122 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_tmp0_ = _tmp4_ == FALSE;
-#line 705 "WelcomeDialog.c"
+#line 736 "WelcomeDialog.c"
} else {
#line 121 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_tmp0_ = FALSE;
-#line 709 "WelcomeDialog.c"
+#line 740 "WelcomeDialog.c"
}
#line 120 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
if (_tmp0_) {
-#line 713 "WelcomeDialog.c"
+#line 744 "WelcomeDialog.c"
GtkLabel* _tmp5_;
GtkBox* _tmp6_;
GtkBox* _tmp7_;
@@ -733,138 +764,142 @@ static void welcome_dialog_install_import_content (WelcomeDialog* self) {
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
#line 127 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
self->priv->import_content_already_installed = TRUE;
-#line 737 "WelcomeDialog.c"
+#line 768 "WelcomeDialog.c"
}
}
-static void _vala_array_add4 (WelcomeServiceEntry** * array, int* length, int* size, WelcomeServiceEntry* value) {
+static void
+_vala_array_add4 (WelcomeServiceEntry** * array,
+ int* length,
+ int* size,
+ WelcomeServiceEntry* value)
+{
#line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
if ((*length) == (*size)) {
#line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
*array = g_renew (WelcomeServiceEntry*, *array, (*size) + 1);
-#line 749 "WelcomeDialog.c"
+#line 785 "WelcomeDialog.c"
}
#line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
(*array)[(*length)++] = value;
#line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
(*array)[*length] = NULL;
-#line 755 "WelcomeDialog.c"
+#line 791 "WelcomeDialog.c"
}
-static void _vala_array_add5 (GtkCheckButton** * array, int* length, int* size, GtkCheckButton* value) {
+static void
+_vala_array_add5 (GtkCheckButton** * array,
+ int* length,
+ int* size,
+ GtkCheckButton* value)
+{
#line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
if ((*length) == (*size)) {
#line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
*array = g_renew (GtkCheckButton*, *array, (*size) + 1);
-#line 766 "WelcomeDialog.c"
+#line 807 "WelcomeDialog.c"
}
#line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
(*array)[(*length)++] = value;
#line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
(*array)[*length] = NULL;
-#line 772 "WelcomeDialog.c"
+#line 813 "WelcomeDialog.c"
}
-void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEntry* entry) {
- WelcomeServiceEntry* _tmp0_;
+void
+welcome_dialog_install_service_entry (WelcomeDialog* self,
+ WelcomeServiceEntry* entry)
+{
+ gchar* _tmp0_;
gchar* _tmp1_;
gchar* _tmp2_;
gchar* _tmp3_;
- gchar* _tmp4_;
- WelcomeServiceEntry** _tmp5_;
- gint _tmp5__length1;
- WelcomeServiceEntry* _tmp6_;
- WelcomeServiceEntry* _tmp7_;
+ WelcomeServiceEntry** _tmp4_;
+ gint _tmp4__length1;
+ WelcomeServiceEntry* _tmp5_;
GtkCheckButton* entry_check = NULL;
- WelcomeServiceEntry* _tmp8_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
gchar* _tmp9_;
- gchar* _tmp10_;
- gchar* _tmp11_;
- gchar* _tmp12_;
+ GtkCheckButton* _tmp10_;
+ GtkCheckButton* _tmp11_;
+ GtkCheckButton** _tmp12_;
+ gint _tmp12__length1;
GtkCheckButton* _tmp13_;
- GtkCheckButton* _tmp14_;
- GtkCheckButton** _tmp15_;
- gint _tmp15__length1;
- GtkCheckButton* _tmp16_;
- GtkBox* _tmp17_;
+ GtkBox* _tmp14_;
#line 131 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
g_return_if_fail (IS_WELCOME_DIALOG (self));
#line 131 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
g_return_if_fail (IS_WELCOME_SERVICE_ENTRY (entry));
#line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp0_ = entry;
-#line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp1_ = welcome_service_entry_get_service_name (_tmp0_);
+ _tmp0_ = welcome_service_entry_get_service_name (entry);
#line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp3_ = g_strdup_printf ("WelcomeDialog: Installing service entry for %s", _tmp2_);
+ _tmp2_ = g_strdup_printf ("WelcomeDialog: Installing service entry for %s", _tmp1_);
#line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- g_debug ("WelcomeDialog.vala:132: %s", _tmp4_);
+ g_debug ("WelcomeDialog.vala:132: %s", _tmp3_);
#line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _g_free0 (_tmp4_);
+ _g_free0 (_tmp3_);
#line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _g_free0 (_tmp2_);
+ _g_free0 (_tmp1_);
#line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp5_ = self->priv->external_import_entries;
+ _tmp4_ = self->priv->external_import_entries;
#line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp5__length1 = self->priv->external_import_entries_length1;
+ _tmp4__length1 = self->priv->external_import_entries_length1;
#line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp6_ = entry;
+ _tmp5_ = _g_object_ref0 (entry);
#line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp7_ = _g_object_ref0 (_tmp6_);
-#line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _vala_array_add4 (&self->priv->external_import_entries, &self->priv->external_import_entries_length1, &self->priv->_external_import_entries_size_, _tmp7_);
-#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp8_ = entry;
+ _vala_array_add4 (&self->priv->external_import_entries, &self->priv->external_import_entries_length1, &self->priv->_external_import_entries_size_, _tmp5_);
#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp9_ = welcome_service_entry_get_service_name (_tmp8_);
+ _tmp6_ = welcome_service_entry_get_service_name (entry);
#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp10_ = _tmp9_;
+ _tmp7_ = _tmp6_;
#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp11_ = g_strdup_printf (_ ("Import photos from your %s library"), _tmp10_);
+ _tmp8_ = g_strdup_printf (_ ("Import photos from your %s library"), _tmp7_);
#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp12_ = _tmp11_;
+ _tmp9_ = _tmp8_;
#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp13_ = (GtkCheckButton*) gtk_check_button_new_with_label (_tmp12_);
+ _tmp10_ = (GtkCheckButton*) gtk_check_button_new_with_label (_tmp9_);
#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- g_object_ref_sink (_tmp13_);
+ g_object_ref_sink (_tmp10_);
#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp14_ = _tmp13_;
+ _tmp11_ = _tmp10_;
#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _g_free0 (_tmp12_);
+ _g_free0 (_tmp9_);
#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _g_free0 (_tmp10_);
+ _g_free0 (_tmp7_);
#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- entry_check = _tmp14_;
+ entry_check = _tmp11_;
#line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp15_ = self->priv->external_import_checks;
+ _tmp12_ = self->priv->external_import_checks;
#line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp15__length1 = self->priv->external_import_checks_length1;
+ _tmp12__length1 = self->priv->external_import_checks_length1;
#line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp16_ = _g_object_ref0 (entry_check);
+ _tmp13_ = _g_object_ref0 (entry_check);
#line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _vala_array_add5 (&self->priv->external_import_checks, &self->priv->external_import_checks_length1, &self->priv->_external_import_checks_size_, _tmp16_);
+ _vala_array_add5 (&self->priv->external_import_checks, &self->priv->external_import_checks_length1, &self->priv->_external_import_checks_size_, _tmp13_);
#line 137 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
#line 138 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp17_ = self->priv->external_import_action_checkbox_packer;
+ _tmp14_ = self->priv->external_import_action_checkbox_packer;
#line 138 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_widget_get_type (), GtkWidget));
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_widget_get_type (), GtkWidget));
#line 139 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
welcome_dialog_install_import_content (self);
#line 131 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_g_object_unref0 (entry_check);
-#line 868 "WelcomeDialog.c"
+#line 903 "WelcomeDialog.c"
}
@@ -873,72 +908,89 @@ void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEn
* for the fact that run()-ning this dialog can interfere with displaying
* images from a camera; please see #4997 for details.
*/
-static void welcome_dialog_on_dismiss (WelcomeDialog* self, gint resp) {
- gint _tmp0_;
+static void
+welcome_dialog_on_dismiss (WelcomeDialog* self,
+ gint resp)
+{
#line 147 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
g_return_if_fail (IS_WELCOME_DIALOG (self));
#line 148 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp0_ = resp;
-#line 148 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- if (_tmp0_ == ((gint) GTK_RESPONSE_CLOSE)) {
+ if (resp == ((gint) GTK_RESPONSE_CLOSE)) {
#line 149 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
self->priv->ok_clicked = TRUE;
-#line 887 "WelcomeDialog.c"
+#line 922 "WelcomeDialog.c"
}
#line 151 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 152 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
gtk_main_quit ();
-#line 893 "WelcomeDialog.c"
+#line 928 "WelcomeDialog.c"
}
-static void _welcome_dialog_on_dismiss_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
+static void
+_welcome_dialog_on_dismiss_gtk_dialog_response (GtkDialog* _sender,
+ gint response_id,
+ gpointer self)
+{
#line 158 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
welcome_dialog_on_dismiss ((WelcomeDialog*) self, response_id);
-#line 900 "WelcomeDialog.c"
+#line 939 "WelcomeDialog.c"
}
-static void _vala_array_add6 (WelcomeServiceEntry** * array, int* length, int* size, WelcomeServiceEntry* value) {
+static void
+_vala_array_add6 (WelcomeServiceEntry** * array,
+ int* length,
+ int* size,
+ WelcomeServiceEntry* value)
+{
#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
if ((*length) == (*size)) {
#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
*array = g_renew (WelcomeServiceEntry*, *array, (*size) + 1);
-#line 911 "WelcomeDialog.c"
+#line 955 "WelcomeDialog.c"
}
#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
(*array)[(*length)++] = value;
#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
(*array)[*length] = NULL;
-#line 917 "WelcomeDialog.c"
+#line 961 "WelcomeDialog.c"
}
-static WelcomeServiceEntry** _vala_array_dup1 (WelcomeServiceEntry** self, int length) {
+static WelcomeServiceEntry**
+_vala_array_dup1 (WelcomeServiceEntry** self,
+ int length)
+{
WelcomeServiceEntry** result;
int i;
#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
result = g_new0 (WelcomeServiceEntry*, length + 1);
#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
for (i = 0; i < length; i++) {
-#line 928 "WelcomeDialog.c"
+#line 975 "WelcomeDialog.c"
WelcomeServiceEntry* _tmp0_;
#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
result[i] = _tmp0_;
-#line 934 "WelcomeDialog.c"
+#line 981 "WelcomeDialog.c"
}
#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
return result;
-#line 938 "WelcomeDialog.c"
+#line 985 "WelcomeDialog.c"
}
-gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** selected_import_entries, int* selected_import_entries_length1, gboolean* do_system_pictures_import) {
+gboolean
+welcome_dialog_execute (WelcomeDialog* self,
+ WelcomeServiceEntry*** selected_import_entries,
+ int* selected_import_entries_length1,
+ gboolean* do_system_pictures_import)
+{
WelcomeServiceEntry** _vala_selected_import_entries = NULL;
int _vala_selected_import_entries_length1 = 0;
gboolean _vala_do_system_pictures_import = FALSE;
@@ -949,15 +1001,15 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
gboolean show_dialog = FALSE;
gboolean _tmp2_;
WelcomeServiceEntry** _result_ = NULL;
- WelcomeServiceEntry** _tmp5_;
+ WelcomeServiceEntry** _tmp4_;
gint _result__length1;
gint __result__size_;
- WelcomeServiceEntry** _tmp19_;
- gint _tmp19__length1;
- WelcomeServiceEntry** _tmp20_;
- gint _tmp20__length1;
- gboolean _tmp21_ = FALSE;
- GtkCheckButton* _tmp22_;
+ WelcomeServiceEntry** _tmp17_;
+ gint _tmp17__length1;
+ WelcomeServiceEntry** _tmp18_;
+ gint _tmp18__length1;
+ gboolean _tmp19_ = FALSE;
+ GtkCheckButton* _tmp20_;
#line 155 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
g_return_val_if_fail (IS_WELCOME_DIALOG (self), FALSE);
#line 158 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
@@ -982,146 +1034,137 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
_tmp2_ = ok;
#line 174 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
if (_tmp2_) {
-#line 986 "WelcomeDialog.c"
+#line 1038 "WelcomeDialog.c"
GtkCheckButton* _tmp3_;
- gboolean _tmp4_;
#line 175 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_tmp3_ = self->priv->hide_button;
#line 175 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp4_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 175 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- show_dialog = !_tmp4_;
-#line 995 "WelcomeDialog.c"
+ show_dialog = !gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 1044 "WelcomeDialog.c"
}
#line 178 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp5_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
+ _tmp4_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
#line 178 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _result_ = _tmp5_;
+ _result_ = _tmp4_;
#line 178 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_result__length1 = 0;
#line 178 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
__result__size_ = _result__length1;
-#line 1005 "WelcomeDialog.c"
+#line 1054 "WelcomeDialog.c"
{
gint i = 0;
#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
i = 0;
-#line 1010 "WelcomeDialog.c"
+#line 1059 "WelcomeDialog.c"
{
- gboolean _tmp6_ = FALSE;
+ gboolean _tmp5_ = FALSE;
#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp6_ = TRUE;
+ _tmp5_ = TRUE;
#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
while (TRUE) {
-#line 1017 "WelcomeDialog.c"
- gint _tmp8_;
- WelcomeServiceEntry** _tmp9_;
+#line 1066 "WelcomeDialog.c"
+ gint _tmp7_;
+ WelcomeServiceEntry** _tmp8_;
+ gint _tmp8__length1;
+ GtkCheckButton** _tmp9_;
gint _tmp9__length1;
- GtkCheckButton** _tmp10_;
- gint _tmp10__length1;
- gint _tmp11_;
- GtkCheckButton* _tmp12_;
- gboolean _tmp13_;
+ gint _tmp10_;
+ GtkCheckButton* _tmp11_;
#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- if (!_tmp6_) {
-#line 1028 "WelcomeDialog.c"
- gint _tmp7_;
+ if (!_tmp5_) {
+#line 1076 "WelcomeDialog.c"
+ gint _tmp6_;
#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp7_ = i;
+ _tmp6_ = i;
#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- i = _tmp7_ + 1;
-#line 1034 "WelcomeDialog.c"
+ i = _tmp6_ + 1;
+#line 1082 "WelcomeDialog.c"
}
#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp6_ = FALSE;
+ _tmp5_ = FALSE;
#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp8_ = i;
+ _tmp7_ = i;
#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp9_ = self->priv->external_import_entries;
+ _tmp8_ = self->priv->external_import_entries;
#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp9__length1 = self->priv->external_import_entries_length1;
+ _tmp8__length1 = self->priv->external_import_entries_length1;
#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- if (!(_tmp8_ < _tmp9__length1)) {
+ if (!(_tmp7_ < _tmp8__length1)) {
#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
break;
-#line 1048 "WelcomeDialog.c"
+#line 1096 "WelcomeDialog.c"
}
#line 180 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp10_ = self->priv->external_import_checks;
-#line 180 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp10__length1 = self->priv->external_import_checks_length1;
+ _tmp9_ = self->priv->external_import_checks;
#line 180 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp11_ = i;
+ _tmp9__length1 = self->priv->external_import_checks_length1;
#line 180 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp12_ = _tmp10_[_tmp11_];
+ _tmp10_ = i;
#line 180 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp13_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_toggle_button_get_type (), GtkToggleButton));
+ _tmp11_ = _tmp9_[_tmp10_];
#line 180 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- if (_tmp13_ == TRUE) {
-#line 1062 "WelcomeDialog.c"
- WelcomeServiceEntry** _tmp14_;
- gint _tmp14__length1;
- WelcomeServiceEntry** _tmp15_;
- gint _tmp15__length1;
- gint _tmp16_;
- WelcomeServiceEntry* _tmp17_;
- WelcomeServiceEntry* _tmp18_;
+ if (gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_toggle_button_get_type (), GtkToggleButton)) == TRUE) {
+#line 1108 "WelcomeDialog.c"
+ WelcomeServiceEntry** _tmp12_;
+ gint _tmp12__length1;
+ WelcomeServiceEntry** _tmp13_;
+ gint _tmp13__length1;
+ gint _tmp14_;
+ WelcomeServiceEntry* _tmp15_;
+ WelcomeServiceEntry* _tmp16_;
#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp14_ = _result_;
+ _tmp12_ = _result_;
#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp14__length1 = _result__length1;
+ _tmp12__length1 = _result__length1;
#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp15_ = self->priv->external_import_entries;
+ _tmp13_ = self->priv->external_import_entries;
#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp15__length1 = self->priv->external_import_entries_length1;
+ _tmp13__length1 = self->priv->external_import_entries_length1;
#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp16_ = i;
+ _tmp14_ = i;
#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp17_ = _tmp15_[_tmp16_];
+ _tmp15_ = _tmp13_[_tmp14_];
#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp18_ = _g_object_ref0 (_tmp17_);
+ _tmp16_ = _g_object_ref0 (_tmp15_);
#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _vala_array_add6 (&_result_, &_result__length1, &__result__size_, _tmp18_);
-#line 1086 "WelcomeDialog.c"
+ _vala_array_add6 (&_result_, &_result__length1, &__result__size_, _tmp16_);
+#line 1132 "WelcomeDialog.c"
}
}
}
}
#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp19_ = _result_;
+ _tmp17_ = _result_;
#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp19__length1 = _result__length1;
+ _tmp17__length1 = _result__length1;
#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp20_ = (_tmp19_ != NULL) ? _vala_array_dup1 (_tmp19_, _tmp19__length1) : ((gpointer) _tmp19_);
+ _tmp18_ = (_tmp17_ != NULL) ? _vala_array_dup1 (_tmp17_, _tmp17__length1) : ((gpointer) _tmp17_);
#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp20__length1 = _tmp19__length1;
+ _tmp18__length1 = _tmp17__length1;
#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_vala_selected_import_entries = (_vala_array_free (_vala_selected_import_entries, _vala_selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _vala_selected_import_entries = _tmp20_;
+ _vala_selected_import_entries = _tmp18_;
#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _vala_selected_import_entries_length1 = _tmp20__length1;
-#line 185 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp22_ = self->priv->system_pictures_import_check;
+ _vala_selected_import_entries_length1 = _tmp18__length1;
#line 185 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- if (_tmp22_ != NULL) {
-#line 1109 "WelcomeDialog.c"
- GtkCheckButton* _tmp23_;
- gboolean _tmp24_;
+ _tmp20_ = self->priv->system_pictures_import_check;
#line 185 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp23_ = self->priv->system_pictures_import_check;
+ if (_tmp20_ != NULL) {
+#line 1155 "WelcomeDialog.c"
+ GtkCheckButton* _tmp21_;
#line 185 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp24_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_toggle_button_get_type (), GtkToggleButton));
+ _tmp21_ = self->priv->system_pictures_import_check;
#line 185 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp21_ = _tmp24_;
-#line 1118 "WelcomeDialog.c"
+ _tmp19_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 1161 "WelcomeDialog.c"
} else {
#line 185 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp21_ = FALSE;
-#line 1122 "WelcomeDialog.c"
+ _tmp19_ = FALSE;
+#line 1165 "WelcomeDialog.c"
}
#line 184 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _vala_do_system_pictures_import = _tmp21_;
+ _vala_do_system_pictures_import = _tmp19_;
#line 187 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
@@ -1132,39 +1175,39 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
if (selected_import_entries) {
#line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
*selected_import_entries = _vala_selected_import_entries;
-#line 1136 "WelcomeDialog.c"
+#line 1179 "WelcomeDialog.c"
} else {
#line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_vala_selected_import_entries = (_vala_array_free (_vala_selected_import_entries, _vala_selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 1140 "WelcomeDialog.c"
+#line 1183 "WelcomeDialog.c"
}
#line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
if (selected_import_entries_length1) {
#line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
*selected_import_entries_length1 = _vala_selected_import_entries_length1;
-#line 1146 "WelcomeDialog.c"
+#line 1189 "WelcomeDialog.c"
}
#line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
if (do_system_pictures_import) {
#line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
*do_system_pictures_import = _vala_do_system_pictures_import;
-#line 1152 "WelcomeDialog.c"
+#line 1195 "WelcomeDialog.c"
}
#line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
return result;
-#line 1156 "WelcomeDialog.c"
+#line 1199 "WelcomeDialog.c"
}
-static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
+static gboolean
+welcome_dialog_is_system_pictures_import_possible (void)
+{
gboolean result = FALSE;
GFile* system_pictures = NULL;
GFile* _tmp0_;
GFile* _tmp1_;
- gboolean _tmp2_;
- GFile* _tmp3_;
- GFileType _tmp4_;
- gboolean _tmp10_ = FALSE;
+ GFile* _tmp2_;
+ gboolean _tmp8_ = FALSE;
GError * _inner_error_ = NULL;
#line 193 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_tmp0_ = app_dirs_get_import_dir ();
@@ -1173,73 +1216,69 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
#line 194 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_tmp1_ = system_pictures;
#line 194 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp2_ = g_file_query_exists (_tmp1_, NULL);
-#line 194 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- if (!_tmp2_) {
+ if (!g_file_query_exists (_tmp1_, NULL)) {
#line 195 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
result = FALSE;
#line 195 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_g_object_unref0 (system_pictures);
#line 195 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
return result;
-#line 1186 "WelcomeDialog.c"
+#line 1227 "WelcomeDialog.c"
}
#line 197 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp3_ = system_pictures;
-#line 197 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp4_ = g_file_query_file_type (_tmp3_, G_FILE_QUERY_INFO_NONE, NULL);
+ _tmp2_ = system_pictures;
#line 197 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- if (!(_tmp4_ == G_FILE_TYPE_DIRECTORY)) {
+ if (!(g_file_query_file_type (_tmp2_, G_FILE_QUERY_INFO_NONE, NULL) == G_FILE_TYPE_DIRECTORY)) {
#line 198 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
result = FALSE;
#line 198 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_g_object_unref0 (system_pictures);
#line 198 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
return result;
-#line 1200 "WelcomeDialog.c"
+#line 1239 "WelcomeDialog.c"
}
{
GFileEnumerator* syspics_child_enum = NULL;
- GFile* _tmp5_;
+ GFile* _tmp3_;
+ GFileEnumerator* _tmp4_;
+ GFileInfo* _tmp5_ = NULL;
GFileEnumerator* _tmp6_;
- GFileInfo* _tmp7_ = NULL;
- GFileEnumerator* _tmp8_;
- GFileInfo* _tmp9_;
+ GFileInfo* _tmp7_;
#line 201 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp5_ = system_pictures;
+ _tmp3_ = system_pictures;
#line 201 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp6_ = g_file_enumerate_children (_tmp5_, "standard::*", G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
+ _tmp4_ = g_file_enumerate_children (_tmp3_, "standard::*", G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
#line 201 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- syspics_child_enum = _tmp6_;
+ syspics_child_enum = _tmp4_;
#line 201 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1217 "WelcomeDialog.c"
+#line 1256 "WelcomeDialog.c"
goto __catch24_g_error;
}
#line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp8_ = syspics_child_enum;
+ _tmp6_ = syspics_child_enum;
#line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp9_ = g_file_enumerator_next_file (_tmp8_, NULL, &_inner_error_);
+ _tmp7_ = g_file_enumerator_next_file (_tmp6_, NULL, &_inner_error_);
#line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _tmp7_ = _tmp9_;
+ _tmp5_ = _tmp7_;
#line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_g_object_unref0 (syspics_child_enum);
-#line 1230 "WelcomeDialog.c"
+#line 1269 "WelcomeDialog.c"
goto __catch24_g_error;
}
#line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- result = _tmp7_ != NULL;
+ result = _tmp5_ != NULL;
#line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- _g_object_unref0 (_tmp7_);
+ _g_object_unref0 (_tmp5_);
#line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_g_object_unref0 (syspics_child_enum);
#line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
_g_object_unref0 (system_pictures);
#line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
return result;
-#line 1243 "WelcomeDialog.c"
+#line 1282 "WelcomeDialog.c"
}
goto __finally24;
__catch24_g_error:
@@ -1257,7 +1296,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
_g_object_unref0 (system_pictures);
#line 205 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
return result;
-#line 1261 "WelcomeDialog.c"
+#line 1300 "WelcomeDialog.c"
}
__finally24:
#line 200 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
@@ -1267,23 +1306,27 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
#line 200 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
g_clear_error (&_inner_error_);
#line 200 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
- return _tmp10_;
-#line 1272 "WelcomeDialog.c"
+ return _tmp8_;
+#line 1311 "WelcomeDialog.c"
}
-static void welcome_dialog_class_init (WelcomeDialogClass * klass) {
+static void
+welcome_dialog_class_init (WelcomeDialogClass * klass)
+{
#line 14 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
welcome_dialog_parent_class = g_type_class_peek_parent (klass);
#line 14 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
g_type_class_add_private (klass, sizeof (WelcomeDialogPrivate));
#line 14 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
G_OBJECT_CLASS (klass)->finalize = welcome_dialog_finalize;
-#line 1283 "WelcomeDialog.c"
+#line 1324 "WelcomeDialog.c"
}
-static void welcome_dialog_instance_init (WelcomeDialog * self) {
+static void
+welcome_dialog_instance_init (WelcomeDialog * self)
+{
GtkCheckButton** _tmp0_;
WelcomeServiceEntry** _tmp1_;
#line 14 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
@@ -1310,11 +1353,13 @@ static void welcome_dialog_instance_init (WelcomeDialog * self) {
self->priv->import_content_already_installed = FALSE;
#line 26 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
self->priv->ok_clicked = FALSE;
-#line 1314 "WelcomeDialog.c"
+#line 1357 "WelcomeDialog.c"
}
-static void welcome_dialog_finalize (GObject * obj) {
+static void
+welcome_dialog_finalize (GObject * obj)
+{
WelcomeDialog * self;
#line 14 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_WELCOME_DIALOG, WelcomeDialog);
@@ -1340,11 +1385,13 @@ static void welcome_dialog_finalize (GObject * obj) {
_g_object_unref0 (self->priv->import_meta_host);
#line 14 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
G_OBJECT_CLASS (welcome_dialog_parent_class)->finalize (obj);
-#line 1344 "WelcomeDialog.c"
+#line 1389 "WelcomeDialog.c"
}
-GType welcome_dialog_get_type (void) {
+GType
+welcome_dialog_get_type (void)
+{
static volatile gsize welcome_dialog_type_id__volatile = 0;
if (g_once_init_enter (&welcome_dialog_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (WelcomeDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) welcome_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (WelcomeDialog), 0, (GInstanceInitFunc) welcome_dialog_instance_init, NULL };
@@ -1356,7 +1403,11 @@ GType welcome_dialog_get_type (void) {
}
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
if ((array != NULL) && (destroy_func != NULL)) {
int i;
for (i = 0; i < array_length; i = i + 1) {
@@ -1368,7 +1419,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
}
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
_vala_array_destroy (array, array_length, destroy_func);
g_free (array);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 15:25:10 +0000