diff options
Diffstat (limited to 'src/dialogs/ProgressDialog.c')
| -rw-r--r-- | src/dialogs/ProgressDialog.c | 529 | 
1 files changed, 264 insertions, 265 deletions
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 };  | 
