aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-08-24 23:21:41 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-08-25 02:37:02 +0800
commitecf3434da05b1f39f793c24b38bfd278e10b5786 (patch)
tree485ed2399920ecb10dbee2b4db4c437c22574a20 /plugins
parentf1d2541c487fbf7433a1b9aad8e8982ef08b85f5 (diff)
downloadgsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.tar
gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.tar.gz
gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.tar.bz2
gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.tar.lz
gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.tar.xz
gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.tar.zst
gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.zip
GObject boilerplate cleanup.
Prefer thread-safe G_DEFINE_TYPE and G_DEFINE_INTERFACE macros over manual GType registration. This is just a start... lots more to do.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/groupwise-features/mail-send-options.c4
-rw-r--r--plugins/groupwise-features/send-options.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c
index d6c6f32095..fb0a3bda14 100644
--- a/plugins/groupwise-features/mail-send-options.c
+++ b/plugins/groupwise-features/mail-send-options.c
@@ -179,10 +179,10 @@ action_send_options_cb (GtkAction *action, EMsgComposer *composer)
/* display the send options dialog */
if (!dialog) {
- dialog = e_sendoptions_dialog_new ();
+ dialog = e_send_options_dialog_new ();
}
- e_sendoptions_dialog_run (dialog, GTK_WIDGET (composer), E_ITEM_MAIL);
+ e_send_options_dialog_run (dialog, GTK_WIDGET (composer), E_ITEM_MAIL);
g_signal_connect (dialog, "sod_response",
G_CALLBACK (feed_input_data), composer);
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index e20be7353b..8d9c102b63 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -160,13 +160,13 @@ e_send_options_load_default_data (EGwSendOptions *opts, ESendOptionsDialog *sod)
}
static void
-e_sendoptions_clicked_cb (GtkWidget *button, gpointer data)
+e_send_options_clicked_cb (GtkWidget *button, gpointer data)
{
EGwConnectionStatus status;
account = (EAccount *) data;
if (!sod) {
- sod = e_sendoptions_dialog_new ();
- e_sendoptions_set_global (sod, TRUE);
+ sod = e_send_options_dialog_new ();
+ e_send_options_set_global (sod, TRUE);
if (!n_cnc)
n_cnc = get_cnc (GTK_WINDOW (gtk_widget_get_toplevel (button)));
@@ -186,7 +186,7 @@ e_sendoptions_clicked_cb (GtkWidget *button, gpointer data)
}
if (n_cnc)
- e_sendoptions_dialog_run (sod, parent ? parent : NULL, E_ITEM_NONE);
+ e_send_options_dialog_run (sod, parent ? parent : NULL, E_ITEM_NONE);
else
return;
}
@@ -214,7 +214,7 @@ org_gnome_send_options (EPlugin *epl, EConfigHookItemFactoryData *data)
g_free (markup);
g_signal_connect(button, "clicked",
- G_CALLBACK (e_sendoptions_clicked_cb), account);
+ G_CALLBACK (e_send_options_clicked_cb), account);
parent = gtk_widget_get_toplevel (GTK_WIDGET (data->parent));
if (!gtk_widget_is_toplevel (parent))