From dce5bdc3699faf592453492fe201606ed47e06b9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 2 Nov 2010 11:49:38 -0400 Subject: Move calendar preferences to the calendar module. Continue replacing the use of calendar-config functions with GObject property bindings to EShellSettings properties. --- calendar/gui/dialogs/delete-comp.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'calendar/gui/dialogs/delete-comp.c') diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index ecdaf58762..b0ccb953b2 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -28,7 +28,6 @@ #include #include "e-util/e-alert-dialog.h" -#include "../calendar-config.h" #include "delete-comp.h" @@ -57,9 +56,10 @@ **/ gboolean delete_component_dialog (ECalComponent *comp, - gboolean consider_as_untitled, - gint n_comps, ECalComponentVType vtype, - GtkWidget *widget) + gboolean consider_as_untitled, + gint n_comps, + ECalComponentVType vtype, + GtkWidget *widget) { const gchar *id; gchar *arg0 = NULL; @@ -74,12 +74,8 @@ delete_component_dialog (ECalComponent *comp, g_return_val_if_fail (vtype != E_CAL_COMPONENT_NO_TYPE, FALSE); } - g_return_val_if_fail (widget != NULL, FALSE); g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); - if (!calendar_config_get_confirm_delete ()) - return TRUE; - if (comp) { ECalComponentText summary; -- cgit v1.2.3 From dbc22f9de50142b8339fa843575a5e15bd3fe8ff Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 30 Jan 2011 11:32:55 -0500 Subject: More whitespace cleanup. --- calendar/gui/dialogs/delete-comp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/gui/dialogs/delete-comp.c') diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index b0ccb953b2..850728449e 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -88,7 +88,7 @@ delete_component_dialog (ECalComponent *comp, switch (vtype) { case E_CAL_COMPONENT_EVENT: - attendees = e_cal_component_has_attendees (comp); + attendees = e_cal_component_has_attendees (comp); if (arg0) { if (attendees) id = "calendar:prompt-delete-titled-meeting"; -- cgit v1.2.3 From 54da4fc09cf226fdb59b9f0c70555e2e57dc1f91 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 8 May 2011 13:24:42 -0400 Subject: Coding style cleanups. --- calendar/gui/dialogs/delete-comp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'calendar/gui/dialogs/delete-comp.c') diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index 850728449e..f5ac9c9ce4 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -216,19 +216,19 @@ prompt_retract_dialog (ECalComponent *comp, gchar **retract_text, GtkWidget *par gtk_frame_set_label_widget ((GtkFrame *) frame, label); gtk_frame_set_label_align ((GtkFrame *) frame, 0, 0); gtk_container_add (GTK_CONTAINER (vbox), frame); - gtk_frame_set_shadow_type ((GtkFrame *)frame, GTK_SHADOW_NONE); + gtk_frame_set_shadow_type ((GtkFrame *) frame, GTK_SHADOW_NONE); sw = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy ((GtkScrolledWindow *)sw, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_policy ((GtkScrolledWindow *) sw, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); entry = gtk_text_view_new (); - gtk_scrolled_window_add_with_viewport ((GtkScrolledWindow *)sw, entry); - gtk_label_set_mnemonic_widget ((GtkLabel *)label, entry); + gtk_scrolled_window_add_with_viewport ((GtkScrolledWindow *) sw, entry); + gtk_label_set_mnemonic_widget ((GtkLabel *) label, entry); gtk_container_add (GTK_CONTAINER (frame), sw); g_signal_connect ((GtkToggleButton *)cb, "toggled", G_CALLBACK (cb_toggled_cb), entry); - gtk_widget_show_all ((GtkWidget *)dialog); + gtk_widget_show_all ((GtkWidget *) dialog); ret_val = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK); -- cgit v1.2.3 From 777c1cbd40eb63365f2c28e38f6a93beb2d1c9d1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 16 Aug 2011 11:25:56 -0400 Subject: Coding style and whitespace cleanup. --- calendar/gui/dialogs/delete-comp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'calendar/gui/dialogs/delete-comp.c') diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index f5ac9c9ce4..a28fa00221 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -162,7 +162,8 @@ delete_component_dialog (ECalComponent *comp, } static void -cb_toggled_cb (GtkToggleButton *toggle, gpointer data) +cb_toggled_cb (GtkToggleButton *toggle, + gpointer data) { gboolean active = FALSE; GtkWidget *entry = (GtkWidget *) data; @@ -172,7 +173,10 @@ cb_toggled_cb (GtkToggleButton *toggle, gpointer data) } gboolean -prompt_retract_dialog (ECalComponent *comp, gchar **retract_text, GtkWidget *parent, gboolean *retract) +prompt_retract_dialog (ECalComponent *comp, + gchar **retract_text, + GtkWidget *parent, + gboolean *retract) { gchar *message = NULL; ECalComponentVType type = E_CAL_COMPONENT_NO_TYPE; -- cgit v1.2.3 From e64d6fe05c30c2cc1d7625a202afba3ba2da07cd Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 22 Nov 2011 18:22:14 -0500 Subject: Miscellaneous cleanups. --- calendar/gui/dialogs/delete-comp.c | 1 - 1 file changed, 1 deletion(-) (limited to 'calendar/gui/dialogs/delete-comp.c') diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index 44c133afbe..87330ed0dd 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -30,7 +30,6 @@ #include "e-util/e-alert-dialog.h" #include "delete-comp.h" - /** * delete_component_dialog: * @comp: A calendar component if a single component is to be deleted, or NULL -- cgit v1.2.3