aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/dialogs
diff options
context:
space:
mode:
Diffstat (limited to 'calendar/gui/dialogs')
-rw-r--r--calendar/gui/dialogs/alarm-dialog.c10
-rw-r--r--calendar/gui/dialogs/calendar-setup.c12
-rw-r--r--calendar/gui/dialogs/comp-editor-page.c39
-rw-r--r--calendar/gui/dialogs/comp-editor.c15
-rw-r--r--calendar/gui/dialogs/delete-comp.c4
-rw-r--r--calendar/gui/dialogs/e-delegate-dialog.c78
-rw-r--r--calendar/gui/dialogs/event-editor.c31
-rw-r--r--calendar/gui/dialogs/event-page.c51
-rw-r--r--calendar/gui/dialogs/memo-editor.c13
-rw-r--r--calendar/gui/dialogs/memo-page.c16
-rw-r--r--calendar/gui/dialogs/recurrence-page.c54
-rw-r--r--calendar/gui/dialogs/schedule-page.c13
-rw-r--r--calendar/gui/dialogs/task-details-page.c9
-rw-r--r--calendar/gui/dialogs/task-editor.c12
-rw-r--r--calendar/gui/dialogs/task-page.c48
15 files changed, 224 insertions, 181 deletions
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index d18594e826..065d11b9b5 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -927,8 +927,9 @@ setup_select_names (Dialog *dialog)
G_CALLBACK (addressbook_clicked_cb), dialog);
name_selector_dialog = e_name_selector_peek_dialog (dialog->name_selector);
- g_signal_connect (name_selector_dialog, "response",
- G_CALLBACK (addressbook_response_cb), dialog);
+ g_signal_connect (
+ name_selector_dialog, "response",
+ G_CALLBACK (addressbook_response_cb), dialog);
return TRUE;
}
@@ -1208,8 +1209,9 @@ init_widgets (Dialog *dialog)
text_buffer, "changed",
G_CALLBACK (malarm_description_changed_cb), dialog);
- g_signal_connect (dialog->malarm_addresses, "changed",
- G_CALLBACK (malarm_addresses_changed_cb), dialog);
+ g_signal_connect (
+ dialog->malarm_addresses, "changed",
+ G_CALLBACK (malarm_addresses_changed_cb), dialog);
}
gboolean
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index 8aa82c29e5..377fd5ca7e 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.c
@@ -206,7 +206,9 @@ eccp_get_source_type (EConfig *ec,
gtk_cell_layout_set_attributes ((GtkCellLayout *) type, cell, "text", 0, NULL);
gtk_combo_box_set_model ((GtkComboBox *) type, (GtkTreeModel *) store);
gtk_combo_box_set_active ((GtkComboBox *) type, active);
- g_signal_connect (type, "changed", G_CALLBACK (eccp_type_changed), sdialog);
+ g_signal_connect (
+ type, "changed",
+ G_CALLBACK (eccp_type_changed), sdialog);
gtk_widget_show (type);
gtk_table_attach (GTK_TABLE (parent), type, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), type);
@@ -318,7 +320,9 @@ eccp_general_offline (EConfig *ec,
offline_setting = gtk_check_button_new_with_mnemonic (_("Cop_y memo list contents locally for offline operation"));
gtk_widget_show (offline_setting);
- g_signal_connect (offline_setting, "toggled", G_CALLBACK (offline_status_changed_cb), sdialog);
+ g_signal_connect (
+ offline_setting, "toggled",
+ G_CALLBACK (offline_status_changed_cb), sdialog);
gtk_table_attach (GTK_TABLE (parent), offline_setting, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
}
@@ -365,7 +369,9 @@ eccp_notify_reminders (EConfig *ec,
gtk_widget_show (reminder_setting);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (reminder_setting), alarm && g_str_equal (alarm, "true"));
- g_signal_connect (reminder_setting, "toggled", G_CALLBACK (alarm_status_changed_cb), sdialog);
+ g_signal_connect (
+ reminder_setting, "toggled",
+ G_CALLBACK (alarm_status_changed_cb), sdialog);
gtk_table_attach (GTK_TABLE (parent), reminder_setting, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
return reminder_setting;
diff --git a/calendar/gui/dialogs/comp-editor-page.c b/calendar/gui/dialogs/comp-editor-page.c
index 3d8af28153..2f4e942bf1 100644
--- a/calendar/gui/dialogs/comp-editor-page.c
+++ b/calendar/gui/dialogs/comp-editor-page.c
@@ -31,6 +31,10 @@
#include "comp-editor.h"
#include "comp-editor-page.h"
+#define COMP_EDITOR_PAGE_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), TYPE_COMP_EDITOR_PAGE, CompEditorPagePrivate))
+
struct _CompEditorPagePrivate {
CompEditor *editor; /* not referenced */
gboolean updating;
@@ -50,6 +54,8 @@ enum {
static gpointer parent_class;
static guint comp_editor_page_signals[LAST_SIGNAL];
+G_DEFINE_TYPE (CompEditorPage, comp_editor_page, G_TYPE_OBJECT)
+
static void
comp_editor_page_set_property (GObject *object,
guint property_id,
@@ -58,7 +64,7 @@ comp_editor_page_set_property (GObject *object,
{
CompEditorPagePrivate *priv;
- priv = COMP_EDITOR_PAGE (object)->priv;
+ priv = COMP_EDITOR_PAGE_GET_PRIVATE (object);
switch (property_id) {
case PROP_EDITOR:
@@ -163,36 +169,7 @@ comp_editor_page_class_init (CompEditorPageClass *class)
static void
comp_editor_page_init (CompEditorPage *page)
{
- page->priv = G_TYPE_INSTANCE_GET_PRIVATE (
- page, TYPE_COMP_EDITOR_PAGE, CompEditorPagePrivate);
-
- page->accel_group = NULL;
-}
-
-GType
-comp_editor_page_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0)) {
- static const GTypeInfo type_info = {
- sizeof (CompEditorPageClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) comp_editor_page_class_init,
- (GClassFinalizeFunc) NULL,
- NULL, /* class_data */
- sizeof (CompEditorPage),
- 0, /* n_preallocs */
- (GInstanceInitFunc) comp_editor_page_init,
- NULL /* value_table */
- };
-
- type = g_type_register_static (
- G_TYPE_OBJECT, "CompEditorPage", &type_info, 0);
- }
-
- return type;
+ page->priv = COMP_EDITOR_PAGE_GET_PRIVATE (page);
}
/**
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index e3676e60c2..f148f1e15e 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -64,6 +64,10 @@
#include "e-util/e-alert-dialog.h"
#include "e-util/e-ui-manager.h"
+#define COMP_EDITOR_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), TYPE_COMP_EDITOR, CompEditorPrivate))
+
#define d(x)
/* Private part of the CompEditor structure */
@@ -1522,7 +1526,7 @@ comp_editor_dispose (GObject *object)
{
CompEditorPrivate *priv;
- priv = COMP_EDITOR (object)->priv;
+ priv = COMP_EDITOR_GET_PRIVATE (object);
if (priv->shell != NULL) {
g_object_remove_weak_pointer (
@@ -1602,7 +1606,7 @@ comp_editor_finalize (GObject *object)
{
CompEditorPrivate *priv;
- priv = COMP_EDITOR (object)->priv;
+ priv = COMP_EDITOR_GET_PRIVATE (object);
g_object_unref (priv->calendar_settings);
g_free (priv->summary);
@@ -1700,7 +1704,7 @@ comp_editor_drag_motion (GtkWidget *widget,
CompEditorPrivate *priv;
EAttachmentView *view;
- priv = COMP_EDITOR (widget)->priv;
+ priv = COMP_EDITOR_GET_PRIVATE (widget);
view = E_ATTACHMENT_VIEW (priv->attachment_view);
return e_attachment_view_drag_motion (view, context, x, y, time);
@@ -1718,7 +1722,7 @@ comp_editor_drag_data_received (GtkWidget *widget,
CompEditorPrivate *priv;
EAttachmentView *view;
- priv = COMP_EDITOR (widget)->priv;
+ priv = COMP_EDITOR_GET_PRIVATE (widget);
view = E_ATTACHMENT_VIEW (priv->attachment_view);
/* Forward the data to the attachment view. Note that calling
@@ -1936,8 +1940,7 @@ comp_editor_init (CompEditor *editor)
express_mode = e_shell_get_express_mode (shell);
meego_mode = e_shell_get_meego_mode (shell);
- editor->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (
- editor, TYPE_COMP_EDITOR, CompEditorPrivate);
+ editor->priv = priv = COMP_EDITOR_GET_PRIVATE (editor);
g_object_weak_ref (
G_OBJECT (editor), (GWeakNotify)
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index 87330ed0dd..4ad1bf7451 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -228,7 +228,9 @@ prompt_retract_dialog (ECalComponent *comp,
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);
+ g_signal_connect (
+ cb, "toggled",
+ G_CALLBACK (cb_toggled_cb), entry);
gtk_widget_show_all ((GtkWidget *) dialog);
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
index fc7ae7d121..9b9d7b4bbd 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ b/calendar/gui/dialogs/e-delegate-dialog.c
@@ -34,6 +34,10 @@
#include "e-util/e-util-private.h"
#include "e-delegate-dialog.h"
+#define E_DELEGATE_DIALOG_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), E_TYPE_DELEGATE_DIALOG, EDelegateDialogPrivate))
+
struct _EDelegateDialogPrivate {
gchar *name;
gchar *address;
@@ -51,68 +55,50 @@ struct _EDelegateDialogPrivate {
static const gchar *section_name = "Delegate To";
-static void e_delegate_dialog_finalize (GObject *object);
-
static gboolean get_widgets (EDelegateDialog *edd);
static void addressbook_clicked_cb (GtkWidget *widget, gpointer data);
static void addressbook_response_cb (GtkWidget *widget, gint response, gpointer data);
G_DEFINE_TYPE (EDelegateDialog, e_delegate_dialog, G_TYPE_OBJECT)
-/* Class initialization function for the event editor */
-static void
-e_delegate_dialog_class_init (EDelegateDialogClass *class)
-{
- GObjectClass *gobject_class;
-
- gobject_class = (GObjectClass *) class;
-
- gobject_class->finalize = e_delegate_dialog_finalize;
-}
-
-/* Object initialization function for the event editor */
-static void
-e_delegate_dialog_init (EDelegateDialog *edd)
-{
- EDelegateDialogPrivate *priv;
-
- priv = g_new0 (EDelegateDialogPrivate, 1);
- edd->priv = priv;
-
- priv->address = NULL;
-}
-
-/* Destroy handler for the event editor */
static void
e_delegate_dialog_finalize (GObject *object)
{
- EDelegateDialog *edd;
EDelegateDialogPrivate *priv;
GtkWidget *dialog;
- g_return_if_fail (object != NULL);
- g_return_if_fail (E_IS_DELEGATE_DIALOG (object));
-
- edd = E_DELEGATE_DIALOG (object);
- priv = edd->priv;
+ priv = E_DELEGATE_DIALOG_GET_PRIVATE (object);
e_name_selector_cancel_loading (priv->name_selector);
g_object_unref (priv->name_selector);
/* Destroy the actual dialog. */
- dialog = e_delegate_dialog_get_toplevel (edd);
+ dialog = e_delegate_dialog_get_toplevel (E_DELEGATE_DIALOG (object));
gtk_widget_destroy (dialog);
g_free (priv->address);
- priv->address = NULL;
-
- g_free (priv);
- edd->priv = NULL;
/* Chain up to parent's finalize() method. */
G_OBJECT_CLASS (e_delegate_dialog_parent_class)->finalize (object);
}
+static void
+e_delegate_dialog_class_init (EDelegateDialogClass *class)
+{
+ GObjectClass *object_class;
+
+ g_type_class_add_private (class, sizeof (EDelegateDialogPrivate));
+
+ object_class = G_OBJECT_CLASS (class);
+ object_class->finalize = e_delegate_dialog_finalize;
+}
+
+static void
+e_delegate_dialog_init (EDelegateDialog *edd)
+{
+ edd->priv = E_DELEGATE_DIALOG_GET_PRIVATE (edd);
+}
+
EDelegateDialog *
e_delegate_dialog_construct (EDelegateDialog *edd,
const gchar *name,
@@ -158,11 +144,14 @@ e_delegate_dialog_construct (EDelegateDialog *edd,
e_destination_store_append_destination (destination_store, dest);
g_object_unref (dest);
- g_signal_connect ((priv->addressbook), "clicked",
- G_CALLBACK (addressbook_clicked_cb), edd);
+ g_signal_connect (
+ priv->addressbook, "clicked",
+ G_CALLBACK (addressbook_clicked_cb), edd);
name_selector_dialog = e_name_selector_peek_dialog (priv->name_selector);
- g_signal_connect (name_selector_dialog, "response", G_CALLBACK (addressbook_response_cb), edd);
+ g_signal_connect (
+ name_selector_dialog, "response",
+ G_CALLBACK (addressbook_response_cb), edd);
return edd;
@@ -242,7 +231,6 @@ e_delegate_dialog_get_delegate (EDelegateDialog *edd)
GList *destinations;
EDestination *destination;
- g_return_val_if_fail (edd != NULL, NULL);
g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL);
priv = edd->priv;
@@ -273,7 +261,6 @@ e_delegate_dialog_get_delegate_name (EDelegateDialog *edd)
GList *destinations;
EDestination *destination;
- g_return_val_if_fail (edd != NULL, NULL);
g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL);
priv = edd->priv;
@@ -298,13 +285,8 @@ e_delegate_dialog_get_delegate_name (EDelegateDialog *edd)
GtkWidget *
e_delegate_dialog_get_toplevel (EDelegateDialog *edd)
{
- EDelegateDialogPrivate *priv;
-
- g_return_val_if_fail (edd != NULL, NULL);
g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL);
- priv = edd->priv;
-
- return priv->app;
+ return edd->priv->app;
}
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 79e951244e..7d679e6bbf 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -43,6 +43,10 @@
#include "cancel-comp.h"
#include "event-editor.h"
+#define EVENT_EDITOR_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), TYPE_EVENT_EDITOR, EventEditorPrivate))
+
struct _EventEditorPrivate {
EventPage *event_page;
RecurrencePage *recur_page;
@@ -117,7 +121,7 @@ create_schedule_page (CompEditor *editor)
CompEditorPage *page;
GtkWidget *content_area;
- priv = EVENT_EDITOR (editor)->priv;
+ priv = EVENT_EDITOR_GET_PRIVATE (editor);
priv->sched_window = gtk_dialog_new_with_buttons (
_("Free/Busy"), GTK_WINDOW (editor), GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -296,7 +300,7 @@ event_editor_constructor (GType type,
type, n_construct_properties, construct_properties);
editor = COMP_EDITOR (object);
- priv = EVENT_EDITOR (object)->priv;
+ priv = EVENT_EDITOR_GET_PRIVATE (object);
shell = comp_editor_get_shell (editor);
@@ -394,7 +398,7 @@ event_editor_dispose (GObject *object)
{
EventEditorPrivate *priv;
- priv = EVENT_EDITOR (object)->priv;
+ priv = EVENT_EDITOR_GET_PRIVATE (object);
if (priv->event_page) {
g_object_unref (priv->event_page);
@@ -427,7 +431,7 @@ event_editor_constructed (GObject *object)
{
EventEditorPrivate *priv;
- priv = EVENT_EDITOR (object)->priv;
+ priv = EVENT_EDITOR_GET_PRIVATE (object);
g_object_bind_property (
object, "client",
@@ -444,7 +448,7 @@ event_editor_show_categories (CompEditor *editor,
{
EventEditorPrivate *priv;
- priv = EVENT_EDITOR (editor)->priv;
+ priv = EVENT_EDITOR_GET_PRIVATE (editor);
event_page_set_show_categories (priv->event_page, visible);
}
@@ -455,7 +459,7 @@ event_editor_show_role (CompEditor *editor,
{
EventEditorPrivate *priv;
- priv = EVENT_EDITOR (editor)->priv;
+ priv = EVENT_EDITOR_GET_PRIVATE (editor);
event_page_set_view_role (priv->event_page, visible);
}
@@ -466,7 +470,7 @@ event_editor_show_rsvp (CompEditor *editor,
{
EventEditorPrivate *priv;
- priv = EVENT_EDITOR (editor)->priv;
+ priv = EVENT_EDITOR_GET_PRIVATE (editor);
event_page_set_view_rsvp (priv->event_page, visible);
}
@@ -477,7 +481,7 @@ event_editor_show_status (CompEditor *editor,
{
EventEditorPrivate *priv;
- priv = EVENT_EDITOR (editor)->priv;
+ priv = EVENT_EDITOR_GET_PRIVATE (editor);
event_page_set_view_status (priv->event_page, visible);
}
@@ -488,7 +492,7 @@ event_editor_show_time_zone (CompEditor *editor,
{
EventEditorPrivate *priv;
- priv = EVENT_EDITOR (editor)->priv;
+ priv = EVENT_EDITOR_GET_PRIVATE (editor);
event_page_set_show_timezone (priv->event_page, visible);
}
@@ -499,7 +503,7 @@ event_editor_show_type (CompEditor *editor,
{
EventEditorPrivate *priv;
- priv = EVENT_EDITOR (editor)->priv;
+ priv = EVENT_EDITOR_GET_PRIVATE (editor);
event_page_set_view_type (priv->event_page, visible);
}
@@ -539,8 +543,7 @@ event_editor_init (EventEditor *ee)
const gchar *id;
GError *error = NULL;
- ee->priv = G_TYPE_INSTANCE_GET_PRIVATE (
- ee, TYPE_EVENT_EDITOR, EventEditorPrivate);
+ ee->priv = EVENT_EDITOR_GET_PRIVATE (ee);
ee->priv->model = E_MEETING_STORE (e_meeting_store_new ());
ee->priv->meeting_shown = TRUE;
ee->priv->updating = FALSE;
@@ -607,7 +610,7 @@ event_editor_edit_comp (CompEditor *editor,
ECalClient *client;
GSList *attendees = NULL;
- priv = EVENT_EDITOR (editor)->priv;
+ priv = EVENT_EDITOR_GET_PRIVATE (editor);
priv->updating = TRUE;
delegate = (comp_editor_get_flags (COMP_EDITOR (editor)) & COMP_EDITOR_DELEGATE);
@@ -717,7 +720,7 @@ event_editor_send_comp (CompEditor *editor,
EventEditorPrivate *priv;
ECalComponent *comp = NULL;
- priv = EVENT_EDITOR (editor)->priv;
+ priv = EVENT_EDITOR_GET_PRIVATE (editor);
/* Don't cancel more than once or when just publishing */
if (method == E_CAL_COMPONENT_METHOD_PUBLISH ||
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index a5c0ac6355..086f3ef494 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -68,6 +68,10 @@
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), TYPE_EVENT_PAGE, EventPagePrivate))
+#define EVENT_PAGE_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), TYPE_EVENT_PAGE, EventPagePrivate))
+
enum {
ALARM_NONE,
ALARM_15_MINUTES,
@@ -3195,8 +3199,9 @@ init_widgets (EventPage *epage)
gtk_widget_hide (priv->info_hbox);
/* Summary */
- g_signal_connect ((priv->summary), "changed",
- G_CALLBACK (summary_changed_cb), epage);
+ g_signal_connect (
+ priv->summary, "changed",
+ G_CALLBACK (summary_changed_cb), epage);
/* Description */
text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description));
@@ -3206,18 +3211,23 @@ init_widgets (EventPage *epage)
e_buffer_tagger_connect (GTK_TEXT_VIEW (priv->description));
/* Start and end times */
- g_signal_connect (priv->start_time, "changed",
- G_CALLBACK (start_date_changed_cb), epage);
- g_signal_connect (priv->end_time, "changed",
- G_CALLBACK (end_date_changed_cb), epage);
+ g_signal_connect (
+ priv->start_time, "changed",
+ G_CALLBACK (start_date_changed_cb), epage);
+ g_signal_connect (
+ priv->end_time, "changed",
+ G_CALLBACK (end_date_changed_cb), epage);
/* Categories */
- g_signal_connect ((priv->categories_btn), "clicked",
- G_CALLBACK (categories_clicked_cb), epage);
+ g_signal_connect (
+ priv->categories_btn, "clicked",
+ G_CALLBACK (categories_clicked_cb), epage);
/* Source selector */
- g_signal_connect ((priv->source_selector), "changed",
- G_CALLBACK (source_changed_cb), epage);
+ g_signal_connect (
+ priv->source_selector, "changed",
+ G_CALLBACK (source_changed_cb), epage);
+
/* Alarms */
priv->alarm_list_store = e_alarm_list_new ();
g_signal_connect_swapped (
@@ -3231,8 +3241,9 @@ init_widgets (EventPage *epage)
G_CALLBACK (comp_editor_page_changed), epage);
/* Timezone changed */
- g_signal_connect ((priv->start_timezone), "changed",
- G_CALLBACK (start_timezone_changed_cb), epage);
+ g_signal_connect (
+ priv->start_timezone, "changed",
+ G_CALLBACK (start_timezone_changed_cb), epage);
e_meeting_list_view_column_set_visible (
priv->list_view, E_MEETING_STORE_ATTENDEE_COL, TRUE);
@@ -3301,7 +3312,9 @@ init_widgets (EventPage *epage)
gtk_window_set_modal (GTK_WINDOW (priv->alarm_dialog), TRUE);
/* Meeting List View */
- g_signal_connect (priv->list_view, "attendee_added", G_CALLBACK (attendee_added_cb), epage);
+ g_signal_connect (
+ priv->list_view, "attendee_added",
+ G_CALLBACK (attendee_added_cb), epage);
gtk_widget_show (GTK_WIDGET (priv->list_view));
@@ -3319,13 +3332,19 @@ init_widgets (EventPage *epage)
gtk_combo_box_set_active (GTK_COMBO_BOX (priv->end_time_combo), 1);
gtk_widget_hide (priv->time_hour);
gtk_widget_show (priv->end_time);
- g_signal_connect (priv->end_time_combo, "changed", G_CALLBACK (time_sel_changed), epage);
+ g_signal_connect (
+ priv->end_time_combo, "changed",
+ G_CALLBACK (time_sel_changed), epage);
update_end_time_combo ( epage);
/* Hour and Minute selector */
gtk_spin_button_set_range ( (GtkSpinButton *) priv->hour_selector, 0, G_MAXINT);
- g_signal_connect (priv->hour_selector, "value-changed", G_CALLBACK (hour_sel_changed), epage);
- g_signal_connect (priv->minute_selector, "value-changed", G_CALLBACK (minute_sel_changed), epage);
+ g_signal_connect (
+ priv->hour_selector, "value-changed",
+ G_CALLBACK (hour_sel_changed), epage);
+ g_signal_connect (
+ priv->minute_selector, "value-changed",
+ G_CALLBACK (minute_sel_changed), epage);
/* Add the user defined time if necessary */
priv->alarm_units =
diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c
index e7dd1e7f93..ae0d351618 100644
--- a/calendar/gui/dialogs/memo-editor.c
+++ b/calendar/gui/dialogs/memo-editor.c
@@ -38,6 +38,10 @@
#include "cancel-comp.h"
#include "memo-editor.h"
+#define MEMO_EDITOR_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), TYPE_MEMO_EDITOR, MemoEditorPrivate))
+
struct _MemoEditorPrivate {
MemoPage *memo_page;
@@ -69,7 +73,7 @@ memo_editor_show_categories (CompEditor *editor,
{
MemoEditorPrivate *priv;
- priv = MEMO_EDITOR (editor)->priv;
+ priv = MEMO_EDITOR_GET_PRIVATE (editor);
memo_page_set_show_categories (priv->memo_page, visible);
}
@@ -79,7 +83,7 @@ memo_editor_dispose (GObject *object)
{
MemoEditorPrivate *priv;
- priv = MEMO_EDITOR (object)->priv;
+ priv = MEMO_EDITOR_GET_PRIVATE (object);
if (priv->memo_page) {
g_object_unref (priv->memo_page);
@@ -96,7 +100,7 @@ memo_editor_constructed (GObject *object)
MemoEditorPrivate *priv;
CompEditor *editor;
- priv = MEMO_EDITOR (object)->priv;
+ priv = MEMO_EDITOR_GET_PRIVATE (object);
editor = COMP_EDITOR (object);
priv->memo_page = memo_page_new (editor);
@@ -136,8 +140,7 @@ memo_editor_init (MemoEditor *me)
const gchar *id;
GError *error = NULL;
- me->priv = G_TYPE_INSTANCE_GET_PRIVATE (
- me, TYPE_MEMO_EDITOR, MemoEditorPrivate);
+ me->priv = MEMO_EDITOR_GET_PRIVATE (me);
me->priv->updating = FALSE;
ui_manager = comp_editor_get_ui_manager (editor);
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index bf60445001..5348a19328 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -57,6 +57,10 @@
#include "e-send-options-utils.h"
#include "memo-page.h"
+#define MEMO_PAGE_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), TYPE_MEMO_PAGE, MemoPagePrivate))
+
/* Private part of the MemoPage structure */
struct _MemoPagePrivate {
GtkBuilder *builder;
@@ -190,7 +194,7 @@ memo_page_dispose (GObject *object)
{
MemoPagePrivate *priv;
- priv = MEMO_PAGE (object)->priv;
+ priv = MEMO_PAGE_GET_PRIVATE (object);
if (priv->open_cancellable) {
g_cancellable_cancel (priv->open_cancellable);
@@ -213,7 +217,7 @@ memo_page_finalize (GObject *object)
{
MemoPagePrivate *priv;
- priv = MEMO_PAGE (object)->priv;
+ priv = MEMO_PAGE_GET_PRIVATE (object);
if (priv->name_selector) {
e_name_selector_cancel_loading (priv->name_selector);
@@ -240,7 +244,7 @@ memo_page_finalize (GObject *object)
static GtkWidget *
memo_page_get_widget (CompEditorPage *page)
{
- MemoPagePrivate *priv = MEMO_PAGE (page)->priv;
+ MemoPagePrivate *priv = MEMO_PAGE_GET_PRIVATE (page);
return priv->main;
}
@@ -248,7 +252,7 @@ memo_page_get_widget (CompEditorPage *page)
static void
memo_page_focus_main_widget (CompEditorPage *page)
{
- MemoPagePrivate *priv = MEMO_PAGE (page)->priv;
+ MemoPagePrivate *priv = MEMO_PAGE_GET_PRIVATE (page);
gtk_widget_grab_focus (priv->summary_entry);
}
@@ -398,9 +402,7 @@ memo_page_class_init (MemoPageClass *class)
static void
memo_page_init (MemoPage *mpage)
{
- mpage->priv = G_TYPE_INSTANCE_GET_PRIVATE (
- mpage, TYPE_MEMO_PAGE, MemoPagePrivate);
- mpage->priv->open_cancellable = NULL;
+ mpage->priv = MEMO_PAGE_GET_PRIVATE (mpage);
}
/* returns whether changed info text */
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 54dee77f44..5658cd0fb3 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -46,6 +46,10 @@
#include "e-util/e-dialog-widgets.h"
#include "e-util/e-util-private.h"
+#define RECURRENCE_PAGE_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), TYPE_RECURRENCE_PAGE, RecurrencePagePrivate))
+
enum month_num_options {
MONTH_NUM_FIRST,
MONTH_NUM_SECOND,
@@ -297,7 +301,7 @@ recurrence_page_dispose (GObject *object)
{
RecurrencePagePrivate *priv;
- priv = RECURRENCE_PAGE (object)->priv;
+ priv = RECURRENCE_PAGE_GET_PRIVATE (object);
if (priv->main != NULL) {
g_object_unref (priv->main);
@@ -339,7 +343,7 @@ recurrence_page_finalize (GObject *object)
{
RecurrencePagePrivate *priv;
- priv = RECURRENCE_PAGE (object)->priv;
+ priv = RECURRENCE_PAGE_GET_PRIVATE (object);
g_signal_handlers_disconnect_matched (
E_CALENDAR (priv->preview_calendar)->calitem,
@@ -383,8 +387,7 @@ recurrence_page_class_init (RecurrencePageClass *class)
static void
recurrence_page_init (RecurrencePage *rpage)
{
- rpage->priv = G_TYPE_INSTANCE_GET_PRIVATE (
- rpage, TYPE_RECURRENCE_PAGE, RecurrencePagePrivate);
+ rpage->priv = RECURRENCE_PAGE_GET_PRIVATE (rpage);
rpage->priv->cancellable = g_cancellable_new ();
}
@@ -395,7 +398,7 @@ recurrence_page_get_widget (CompEditorPage *page)
{
RecurrencePagePrivate *priv;
- priv = RECURRENCE_PAGE (page)->priv;
+ priv = RECURRENCE_PAGE_GET_PRIVATE (page);
return priv->main;
}
@@ -406,7 +409,7 @@ recurrence_page_focus_main_widget (CompEditorPage *page)
{
RecurrencePagePrivate *priv;
- priv = RECURRENCE_PAGE (page)->priv;
+ priv = RECURRENCE_PAGE_GET_PRIVATE (page);
gtk_widget_grab_focus (priv->recurs);
}
@@ -1343,8 +1346,12 @@ make_monthly_special (RecurrencePage *rpage)
adj, "value-changed",
G_CALLBACK (comp_editor_page_changed), rpage);
- g_signal_connect (priv->month_num_combo, "changed", G_CALLBACK (month_num_combo_changed_cb), rpage);
- g_signal_connect (priv->month_day_combo, "changed", G_CALLBACK (month_day_combo_changed_cb), rpage);
+ g_signal_connect (
+ priv->month_num_combo, "changed",
+ G_CALLBACK (month_num_combo_changed_cb), rpage);
+ g_signal_connect (
+ priv->month_day_combo, "changed",
+ G_CALLBACK (month_day_combo_changed_cb), rpage);
}
/* Changes the recurrence-special widget to match the interval units.
@@ -2363,9 +2370,9 @@ init_widgets (RecurrencePage *rpage)
priv->preview_calendar = e_calendar_new ();
ecal = E_CALENDAR (priv->preview_calendar);
- g_signal_connect ((ecal->calitem), "date_range_changed",
- G_CALLBACK (preview_date_range_changed_cb),
- rpage);
+ g_signal_connect (
+ ecal->calitem, "date_range_changed",
+ G_CALLBACK (preview_date_range_changed_cb), rpage);
e_calendar_item_set_max_days_sel (ecal->calitem, 0);
gtk_container_add (GTK_CONTAINER (priv->preview_bin),
priv->preview_calendar);
@@ -2379,7 +2386,9 @@ init_widgets (RecurrencePage *rpage)
/* Recurrence types */
- g_signal_connect (priv->recurs, "toggled", G_CALLBACK (type_toggled_cb), rpage);
+ g_signal_connect (
+ priv->recurs, "toggled",
+ G_CALLBACK (type_toggled_cb), rpage);
/* Recurrence interval */
@@ -2408,12 +2417,15 @@ init_widgets (RecurrencePage *rpage)
/* Exception buttons */
- g_signal_connect ((priv->exception_add), "clicked",
- G_CALLBACK (exception_add_cb), rpage);
- g_signal_connect ((priv->exception_modify), "clicked",
- G_CALLBACK (exception_modify_cb), rpage);
- g_signal_connect ((priv->exception_delete), "clicked",
- G_CALLBACK (exception_delete_cb), rpage);
+ g_signal_connect (
+ priv->exception_add, "clicked",
+ G_CALLBACK (exception_add_cb), rpage);
+ g_signal_connect (
+ priv->exception_modify, "clicked",
+ G_CALLBACK (exception_modify_cb), rpage);
+ g_signal_connect (
+ priv->exception_delete, "clicked",
+ G_CALLBACK (exception_delete_cb), rpage);
gtk_widget_set_sensitive (priv->exception_modify, FALSE);
gtk_widget_set_sensitive (priv->exception_delete, FALSE);
@@ -2438,8 +2450,10 @@ init_widgets (RecurrencePage *rpage)
gtk_tree_view_column_add_attribute (column, cell_renderer, "text", E_DATE_TIME_LIST_COLUMN_DESCRIPTION);
gtk_tree_view_append_column (GTK_TREE_VIEW (priv->exception_list), column);
- g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->exception_list)), "changed",
- G_CALLBACK (exception_selection_changed_cb), rpage);
+ g_signal_connect (
+ gtk_tree_view_get_selection (
+ GTK_TREE_VIEW (priv->exception_list)), "changed",
+ G_CALLBACK (exception_selection_changed_cb), rpage);
}
/**
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index b164f87648..3fcf1749cc 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -39,6 +39,10 @@
#include "e-delegate-dialog.h"
#include "schedule-page.h"
+#define SCHEDULE_PAGE_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), TYPE_SCHEDULE_PAGE, SchedulePagePrivate))
+
/* Private part of the SchedulePage structure */
struct _SchedulePagePrivate {
GtkBuilder *builder;
@@ -168,7 +172,7 @@ schedule_page_dispose (GObject *object)
{
SchedulePagePrivate *priv;
- priv = SCHEDULE_PAGE (object)->priv;
+ priv = SCHEDULE_PAGE_GET_PRIVATE (object);
if (priv->main != NULL) {
g_object_unref (priv->main);
@@ -283,8 +287,7 @@ schedule_page_class_init (SchedulePageClass *class)
static void
schedule_page_init (SchedulePage *spage)
{
- spage->priv = G_TYPE_INSTANCE_GET_PRIVATE (
- spage, TYPE_SCHEDULE_PAGE, SchedulePagePrivate);
+ spage->priv = SCHEDULE_PAGE_GET_PRIVATE (spage);
}
/* Gets the widgets from the XML file and returns if they are all available. */
@@ -328,7 +331,9 @@ init_widgets (SchedulePage *spage)
priv = spage->priv;
- g_signal_connect (priv->sel, "changed", G_CALLBACK (times_changed_cb), spage);
+ g_signal_connect (
+ priv->sel, "changed",
+ G_CALLBACK (times_changed_cb), spage);
return TRUE;
}
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 919a9c0550..c31fef6e23 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -41,6 +41,10 @@
#include "e-util/e-dialog-widgets.h"
#include "e-util/e-util-private.h"
+#define TASK_DETAILS_PAGE_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), TYPE_TASK_DETAILS_PAGE, TaskDetailsPagePrivate))
+
struct _TaskDetailsPagePrivate {
GtkBuilder *builder;
@@ -172,7 +176,7 @@ task_details_page_dispose (GObject *object)
{
TaskDetailsPagePrivate *priv;
- priv = TASK_DETAILS_PAGE (object)->priv;
+ priv = TASK_DETAILS_PAGE_GET_PRIVATE (object);
if (priv->main != NULL) {
g_object_unref (priv->main);
@@ -436,8 +440,7 @@ task_details_page_class_init (TaskDetailsPageClass *class)
static void
task_details_page_init (TaskDetailsPage *tdpage)
{
- tdpage->priv = G_TYPE_INSTANCE_GET_PRIVATE (
- tdpage, TYPE_TASK_DETAILS_PAGE, TaskDetailsPagePrivate);
+ tdpage->priv = TASK_DETAILS_PAGE_GET_PRIVATE (tdpage);
}
/* Gets the widgets from the XML file and returns if they are all available. */
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index e1d90f4d5a..927913c898 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -335,8 +335,10 @@ task_editor_init (TaskEditor *te)
GTK_DIALOG (te->priv->task_details_window));
gtk_container_add (
GTK_CONTAINER (content_area),
- comp_editor_page_get_widget ((CompEditorPage *) te->priv->task_details_page));
- gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (te->priv->task_details_window)));
+ comp_editor_page_get_widget (
+ (CompEditorPage *) te->priv->task_details_page));
+ gtk_widget_show_all (
+ gtk_bin_get_child (GTK_BIN (te->priv->task_details_window)));
comp_editor_append_page (
editor, COMP_EDITOR_PAGE (te->priv->task_details_page), NULL, FALSE);
@@ -430,13 +432,15 @@ task_editor_edit_comp (CompEditor *editor,
ia = e_meeting_store_find_self (priv->model, &row);
if (ia != NULL)
- e_meeting_attendee_set_edit_level (ia, E_MEETING_ATTENDEE_EDIT_STATUS);
+ e_meeting_attendee_set_edit_level (
+ ia, E_MEETING_ATTENDEE_EDIT_STATUS);
} else if (e_cal_client_check_organizer_must_attend (client)) {
EMeetingAttendee *ia;
ia = e_meeting_store_find_attendee (priv->model, organizer.value, &row);
if (ia != NULL)
- e_meeting_attendee_set_edit_level (ia, E_MEETING_ATTENDEE_EDIT_NONE);
+ e_meeting_attendee_set_edit_level (
+ ia, E_MEETING_ATTENDEE_EDIT_NONE);
}
comp_editor_set_group_item (editor, TRUE);
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 2033a46ff2..71a494541a 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -1925,8 +1925,9 @@ init_widgets (TaskPage *tpage)
gtk_widget_hide (priv->info_hbox);
/* Summary */
- g_signal_connect ((priv->summary), "changed",
- G_CALLBACK (summary_changed_cb), tpage);
+ g_signal_connect (
+ priv->summary, "changed",
+ G_CALLBACK (summary_changed_cb), tpage);
/* Description */
text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description));
@@ -1936,20 +1937,27 @@ init_widgets (TaskPage *tpage)
e_buffer_tagger_connect (GTK_TEXT_VIEW (priv->description));
/* Dates */
- g_signal_connect ((priv->start_date), "changed",
- G_CALLBACK (date_changed_cb), tpage);
- g_signal_connect ((priv->due_date), "changed",
- G_CALLBACK (date_changed_cb), tpage);
+ g_signal_connect (
+ priv->start_date, "changed",
+ G_CALLBACK (date_changed_cb), tpage);
+ g_signal_connect (
+ priv->due_date, "changed",
+ G_CALLBACK (date_changed_cb), tpage);
/* time zone changed */
- g_signal_connect (priv->timezone, "changed", G_CALLBACK(timezone_changed_cb), tpage);
+ g_signal_connect (
+ priv->timezone, "changed",
+ G_CALLBACK (timezone_changed_cb), tpage);
/* Categories button */
- g_signal_connect ((priv->categories_btn), "clicked",
- G_CALLBACK (categories_clicked_cb), tpage);
+ g_signal_connect (
+ priv->categories_btn, "clicked",
+ G_CALLBACK (categories_clicked_cb), tpage);
/* Source selector */
- g_signal_connect (priv->source_selector, "changed", G_CALLBACK (source_changed_cb), tpage);
+ g_signal_connect (
+ priv->source_selector, "changed",
+ G_CALLBACK (source_changed_cb), tpage);
/* Connect the default signal handler to use to make sure the "changed"
* field gets set whenever a field is changed. */
@@ -1988,19 +1996,29 @@ init_widgets (TaskPage *tpage)
G_CALLBACK (list_key_press), tpage);
/* Add attendee button */
- g_signal_connect (priv->add, "clicked", G_CALLBACK (add_clicked_cb), tpage);
+ g_signal_connect (
+ priv->add, "clicked",
+ G_CALLBACK (add_clicked_cb), tpage);
/* Edit attendee button */
- g_signal_connect (priv->edit, "clicked", G_CALLBACK (edit_clicked_cb), tpage);
+ g_signal_connect (
+ priv->edit, "clicked",
+ G_CALLBACK (edit_clicked_cb), tpage);
/* Remove attendee button */
- g_signal_connect (priv->remove, "clicked", G_CALLBACK (remove_clicked_cb), tpage);
+ g_signal_connect (
+ priv->remove, "clicked",
+ G_CALLBACK (remove_clicked_cb), tpage);
/* Contacts button */
- g_signal_connect (priv->invite, "clicked", G_CALLBACK (invite_cb), tpage);
+ g_signal_connect (
+ priv->invite, "clicked",
+ G_CALLBACK (invite_cb), tpage);
/* Meeting List View */
- g_signal_connect (priv->list_view, "attendee_added", G_CALLBACK (attendee_added_cb), tpage);
+ g_signal_connect (
+ priv->list_view, "attendee_added",
+ G_CALLBACK (attendee_added_cb), tpage);
/* Set the default timezone, so the timezone entry may be hidden. */
zone = comp_editor_get_timezone (editor);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-18 00:03:23 +0800