From aaf95d222df880565db862c953638dcb04e8dbb7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 24 Nov 2010 13:37:15 +0100 Subject: Bug #632962 - Duplicate "On this computer" sources after update --- capplet/settings/mail-capplet-shell.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index beb5206093..33c921d892 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -293,21 +293,18 @@ mail_capplet_shell_new (gint socket_id, gboolean just_druid, gboolean main_loop) return GTK_WIDGET (shell); } +#define LOCAL_BASE_URI "local:" #define PERSONAL_RELATIVE_URI "system" static void -setup_abooks () +setup_abooks (void) { - gchar *base_dir, *uri; GSList *groups; ESourceGroup *group; ESourceList *list = NULL; ESourceGroup *on_this_computer = NULL; ESource *personal_source = NULL; - base_dir = g_build_filename (e_get_user_data_dir (), "addressbook", "local", NULL); - uri = g_filename_to_uri (base_dir, NULL, NULL); - if (!e_book_get_addressbooks (&list, NULL)) { g_warning ("Unable to get books\n"); return; @@ -317,16 +314,25 @@ setup_abooks () if (groups) { /* groups are already there, we need to search for things... */ GSList *g; + gchar *base_dir, *base_uri; - for (g = groups; g; g = g->next) { + base_dir = g_build_filename (e_get_user_data_dir (), "addressbook", "local", NULL); + base_uri = g_filename_to_uri (base_dir, NULL, NULL); + for (g = groups; g; g = g->next) { group = E_SOURCE_GROUP (g->data); - if (!on_this_computer && !strcmp (uri, e_source_group_peek_base_uri (group))) { + if (strcmp (base_uri, e_source_group_peek_base_uri (group)) == 0) + e_source_group_set_base_uri (group, LOCAL_BASE_URI); + + if (!on_this_computer && !strcmp (LOCAL_BASE_URI, e_source_group_peek_base_uri (group))) { on_this_computer = g_object_ref (group); break; } } + + g_free (base_dir); + g_free (base_uri); } if (on_this_computer) { @@ -349,7 +355,7 @@ setup_abooks () } else { /* create the local source group */ - group = e_source_group_new (_("On This Computer"), uri); + group = e_source_group_new (_("On This Computer"), LOCAL_BASE_URI); e_source_list_add_group (list, group, -1); on_this_computer = group; @@ -372,7 +378,5 @@ setup_abooks () e_source_list_sync (list, NULL); g_object_unref (list); - g_free (uri); - g_free (base_dir); } -- cgit v1.2.3 From 65eafc6769b91fb6d51b47381631fbd8b9759d0a Mon Sep 17 00:00:00 2001 From: Punit Jain Date: Wed, 1 Dec 2010 14:39:33 +0530 Subject: Bug #636058 - Account setup issues express mode. Widget name required to update. --- capplet/settings/mail-account-view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index 1f53007b33..be078c210d 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -1055,9 +1055,9 @@ mail_account_view_construct (MailAccountView *view, shell = e_shell_get_default (); if (!shell || e_shell_get_express_mode (shell)) { - GtkWidget *table = em_account_editor_get_widget (view->edit, "identity_required_table"); + GtkWidget *table = em_account_editor_get_widget (view->edit, "identity-required-table"); GtkWidget *label, *pwd; - gtk_widget_hide (em_account_editor_get_widget (view->edit, "identity_optional_frame")); + gtk_widget_hide (em_account_editor_get_widget (view->edit, "identity-optional-section")); if (!view->original) { label = gtk_label_new (_("Password:")); -- cgit v1.2.3 From 59324d9f4c891a162511692dfe6e2db91b5895bd Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 22 Dec 2010 20:25:24 -0500 Subject: Call setlocale() instead of gtk_set_locale(). gtk_set_locale() has been deprecated in GTK+ 2.23.3. --- capplet/anjal-settings-main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'capplet') diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c index eb9ccce6a9..f211beaca7 100644 --- a/capplet/anjal-settings-main.c +++ b/capplet/anjal-settings-main.c @@ -24,6 +24,7 @@ #include #include +#include #include #include #include @@ -240,7 +241,7 @@ main (gint argc, gchar *argv[]) textdomain (GETTEXT_PACKAGE); #endif - gtk_set_locale (); + setlocale (LC_ALL, NULL); if (!gtk_init_with_args (&argc, &argv, _("Anjal email client"), entries, NULL, &error)) { g_error ("Unable to start Anjal: %s\n", error->message); -- cgit v1.2.3 From a3ba231fcc2746e664a67c85d88eb49a64813989 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 9 Nov 2010 08:48:33 -0500 Subject: Drop backward-compatibility cruft. --- capplet/settings/mail-capplet-shell.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index 33c921d892..7a9a4fa412 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -42,9 +42,6 @@ #include #include -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - enum { CTRL_W_PRESSED, CTRL_Q_PRESSED, -- cgit v1.2.3 From d23885aeb6b674c6810ab039791e3a88a8ed2707 Mon Sep 17 00:00:00 2001 From: Vibha Yadav Date: Mon, 13 Dec 2010 16:48:00 +0530 Subject: Adapt gdk_window_get_geometry for gtk+-3.0 Depth parameter has been removed now. Some other random fixes for gtk+-3.0 too. --- capplet/settings/mail-decoration.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-decoration.c b/capplet/settings/mail-decoration.c index 02ccf2f7d9..999567e962 100644 --- a/capplet/settings/mail-decoration.c +++ b/capplet/settings/mail-decoration.c @@ -87,8 +87,8 @@ md_translate_position (GdkWindow *w, double ex, double ey, gint *x, gint *y, Gtk *y = (gint)ey; while (w && w != gtk_widget_get_window (window)) { - gint cx, cy, cw, ch, cd; - gdk_window_get_geometry (w, &cx, &cy, &cw, &ch, &cd); + gint cx, cy, cw, ch; + gdk_window_get_geometry (w, &cx, &cy, &cw, &ch); *x += cx; *y += cy; w = gdk_window_get_parent (w); -- cgit v1.2.3 From 4724b42853a465585b7c0849c30d684e53138615 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 17 Dec 2010 18:22:44 +0100 Subject: No more "expose-event" on GtkWidget --- capplet/settings/mail-account-view.c | 20 +------------------- capplet/settings/mail-settings-view.c | 20 +------------------- 2 files changed, 2 insertions(+), 38 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index be078c210d..eec00ccabd 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -1091,22 +1091,6 @@ mail_account_view_new (EAccount *account, return view; } -static gboolean -mav_btn_expose (GtkWidget *w, GdkEventExpose *event, MailAccountView *mfv) -{ - GdkPixbuf *img = g_object_get_data ((GObject *)w, "pbuf"); - cairo_t *cr; - - cr = gdk_cairo_create (gtk_widget_get_window (w)); - cairo_save (cr); - gdk_cairo_set_source_pixbuf (cr, img, event->area.x-5, event->area.y-4); - cairo_paint (cr); - cairo_restore (cr); - cairo_destroy (cr); - - return TRUE; -} - static void mav_close (GtkButton *w, MailAccountView *mfv) { @@ -1123,8 +1107,6 @@ mail_account_view_get_tab_widget (MailAccountView *mcv) GtkWidget *tab_label; img = (GtkWidget *)gtk_image_new_from_pixbuf (pbuf); - g_object_set_data ((GObject *)img, "pbuf", pbuf); - g_signal_connect (img, "expose-event", G_CALLBACK(mav_btn_expose), mcv); tool = gtk_button_new (); gtk_button_set_relief ((GtkButton *)tool, GTK_RELIEF_NONE); @@ -1141,7 +1123,7 @@ mail_account_view_get_tab_widget (MailAccountView *mcv) box = gtk_label_new (_("Account Wizard")); tab_label = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start ((GtkBox *)tab_label, box, FALSE, FALSE, 0); + gtk_box_pack_start ((GtkBox *)tab_label, box, FALSE, FALSE, 2); gtk_box_pack_start ((GtkBox *)tab_label, tool, FALSE, FALSE, 0); gtk_widget_show_all (tab_label); diff --git a/capplet/settings/mail-settings-view.c b/capplet/settings/mail-settings-view.c index 793ee545f5..596e7222a1 100644 --- a/capplet/settings/mail-settings-view.c +++ b/capplet/settings/mail-settings-view.c @@ -225,22 +225,6 @@ mail_settings_view_new () return view; } -static gboolean -msv_btn_expose (GtkWidget *w, GdkEventExpose *event, MailSettingsView *mfv) -{ - GdkPixbuf *img = g_object_get_data ((GObject *)w, "pbuf"); - cairo_t *cr; - - cr = gdk_cairo_create (gtk_widget_get_window (w)); - cairo_save (cr); - gdk_cairo_set_source_pixbuf (cr, img, event->area.x-5, event->area.y-4); - cairo_paint (cr); - cairo_restore (cr); - cairo_destroy (cr); - - return TRUE; -} - static void msv_close (GtkButton *w, MailSettingsView *mfv) { @@ -257,8 +241,6 @@ mail_settings_view_get_tab_widget (MailSettingsView *mcv) GtkWidget *tab_label; img = gtk_image_new_from_pixbuf (pbuf); - g_object_set_data ((GObject *)img, "pbuf", pbuf); - g_signal_connect (img, "expose-event", G_CALLBACK(msv_btn_expose), mcv); tool = gtk_button_new (); gtk_button_set_relief ((GtkButton *)tool, GTK_RELIEF_NONE); @@ -275,7 +257,7 @@ mail_settings_view_get_tab_widget (MailSettingsView *mcv) box = gtk_label_new (_("Settings")); tab_label = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start ((GtkBox *)tab_label, box, FALSE, FALSE, 0); + gtk_box_pack_start ((GtkBox *)tab_label, box, FALSE, FALSE, 2); #ifndef ANJAL_SETTINGS gtk_box_pack_start ((GtkBox *)tab_label, tool, FALSE, FALSE, 0); #endif -- cgit v1.2.3 From 41fea2e29dbda47c645abadf064697510b122c8d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 27 Jan 2011 10:35:39 +0100 Subject: Bug #640536 - Warnings when adding a google account in express mode --- capplet/settings/mail-account-view.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index eec00ccabd..234b6ee770 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -354,12 +354,7 @@ setup_google_accounts (MailAccountView *mav) GSList *ids, *temp; slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources"); - sgrp = e_source_list_peek_group_by_base_uri (slist, "google://"); - if (!sgrp) { - sgrp = e_source_list_ensure_group (slist, _("Google"), "google://", TRUE); - } - - printf("Setting up Google Calendar: list:%p GoogleGrp: %p\n", slist, sgrp); + sgrp = e_source_list_ensure_group (slist, _("Google"), "google://", TRUE); /* FIXME: Not sure if we should localize 'Calendar' */ calendar = e_source_new ("Calendar", ""); @@ -372,6 +367,8 @@ setup_google_accounts (MailAccountView *mav) e_source_set_property (calendar, "default", "true"); e_source_set_readonly (calendar, FALSE); + e_source_group_add_source (sgrp, calendar, -1); + sanitize_uname = sanitize_user_mail (mav->priv->username); abs_uri = g_strdup_printf (CALENDAR_CALDAV_URI, sanitize_uname, mav->priv->username); @@ -382,7 +379,6 @@ setup_google_accounts (MailAccountView *mav) rel_uri = g_strconcat ("https", GMAIL_CALENDAR_LOCATION, sanitize_uname, CALENDAR_DEFAULT_PATH, NULL); e_source_set_relative_uri (calendar, rel_uri); - e_source_group_add_source (sgrp, calendar, -1); e_source_list_sync (slist, NULL); ids = gconf_client_get_list (gconf, SELECTED_CALENDARS, GCONF_VALUE_STRING, NULL); @@ -400,8 +396,7 @@ setup_google_accounts (MailAccountView *mav) g_object_unref (slist); g_object_unref (sgrp); g_object_unref (calendar); - } else - printf("Not setting up Google Calendar\n"); + } if (mav->priv->do_gcontacts) { ESourceList *slist; @@ -411,7 +406,7 @@ setup_google_accounts (MailAccountView *mav) slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/addressbook/sources" ); - sgrp = e_source_list_peek_group_by_base_uri (slist, "google://"); + sgrp = e_source_list_ensure_group (slist, _("Google"), "google://", TRUE); /* FIXME: Not sure if we should localize 'Contacts' */ abook = e_source_new ("Contacts", ""); @@ -423,19 +418,20 @@ setup_google_accounts (MailAccountView *mav) e_source_set_property (abook, "refresh-interval", "86400"); e_source_set_property (abook, "completion", "true"); e_source_set_property (abook, "username", mav->priv->username); + + e_source_group_add_source (sgrp, abook, -1); + e_source_set_relative_uri (abook, mav->priv->username); rel_uri = g_strdup_printf("google://%s/", mav->priv->username); e_passwords_add_password (rel_uri, gtk_entry_get_text ((GtkEntry *)mav->password)); e_passwords_remember_password ("Addressbook", rel_uri); - e_source_group_add_source (sgrp, abook, -1); e_source_list_sync (slist, NULL); g_free (rel_uri); g_object_unref (slist); g_object_unref (sgrp); g_object_unref (abook); - } g_object_unref (gconf); -- 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. --- capplet/settings/mail-account-view.c | 2 +- capplet/settings/mail-decoration.c | 18 +++++++++--------- capplet/settings/mail-view.c | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index 234b6ee770..9c75e6b9ee 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -200,7 +200,7 @@ static gboolean is_email (const gchar *address) { /* This is supposed to check if the address's domain could be - an FQDN but alas, it's not worth the pain and suffering. */ + an FQDN but alas, it's not worth the pain and suffering. */ const gchar *at; at = strchr (address, '@'); diff --git a/capplet/settings/mail-decoration.c b/capplet/settings/mail-decoration.c index 999567e962..51a71d11ef 100644 --- a/capplet/settings/mail-decoration.c +++ b/capplet/settings/mail-decoration.c @@ -91,7 +91,7 @@ md_translate_position (GdkWindow *w, double ex, double ey, gint *x, gint *y, Gtk gdk_window_get_geometry (w, &cx, &cy, &cw, &ch); *x += cx; *y += cy; - w = gdk_window_get_parent (w); + w = gdk_window_get_parent (w); } } @@ -254,18 +254,18 @@ md_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_d gint y_root = (gint) event->y_root; gint x, y; - if (!md->priv->can_resize) { - return FALSE; - } + if (!md->priv->can_resize) { + return FALSE; + } md_translate_position (event->window, event->x, event->y, &x, &y, (GtkWidget *)md->window); - update_cursor (md, x, y, TRUE); - if (md->priv->resizing && event->button == 1 && event->type != GDK_2BUTTON_PRESS) { + update_cursor (md, x, y, TRUE); + if (md->priv->resizing && event->button == 1 && event->type != GDK_2BUTTON_PRESS) { gtk_window_begin_resize_drag ((GtkWindow *)widget, md->priv->last_edge, 1, x_root, y_root, event->time); - } else if ((md->priv->resizing && event->button == 2 && event->type != GDK_2BUTTON_PRESS) || - (event->button == 1 && y <= md->priv->top_height && event->type != GDK_2BUTTON_PRESS)) { - gtk_window_begin_move_drag ((GtkWindow *)widget, event->button, x_root, y_root, event->time); + } else if ((md->priv->resizing && event->button == 2 && event->type != GDK_2BUTTON_PRESS) || + (event->button == 1 && y <= md->priv->top_height && event->type != GDK_2BUTTON_PRESS)) { + gtk_window_begin_move_drag ((GtkWindow *)widget, event->button, x_root, y_root, event->time); } else if (y <= md->priv->top_height && event->type == GDK_2BUTTON_PRESS) { if (md->priv->full_screen) gtk_window_unfullscreen (md->window); diff --git a/capplet/settings/mail-view.c b/capplet/settings/mail-view.c index cb2010f948..afe65fd448 100644 --- a/capplet/settings/mail-view.c +++ b/capplet/settings/mail-view.c @@ -314,7 +314,7 @@ mail_view_add_folder (MailView *mv, gpointer data, gboolean block) mv->priv->children = block ? g_list_append (mv->priv->children, mfv) : g_list_prepend (mv->priv->children, mfv); position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)mfv, mfv->tab_label); gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)mfv, TRUE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mfv, FALSE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mfv, FALSE); g_signal_connect (mfv, "view-close", G_CALLBACK(mv_close_mcv), mv); if (!block) @@ -355,7 +355,7 @@ mail_view_add_composer (MailView *mv, gpointer data, gboolean block) } gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, TRUE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, FALSE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, FALSE); if (!block) gtk_notebook_set_current_page ((GtkNotebook *)mv, position); if (!block) @@ -382,7 +382,7 @@ mail_view_add_message (MailView *mv, gpointer data, gboolean block) position = gtk_notebook_get_current_page ((GtkNotebook *)mv); gtk_notebook_insert_page ((GtkNotebook *)mv, (GtkWidget *)mcv, mail_conv_view_get_tab_widget (mcv), position+1); gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, TRUE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, FALSE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, FALSE); if (!block) gtk_notebook_set_current_page ((GtkNotebook *)mv, position+1); if (!block) @@ -417,7 +417,7 @@ mail_view_add_settings (MailView *mv, gpointer data, gboolean block) g_signal_connect (msv, "view-close", G_CALLBACK(mv_close_mcv), mv); g_signal_connect (msv, "show-account", G_CALLBACK(mv_show_acc_mcv), mv); gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, TRUE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, FALSE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, FALSE); if (!block) gtk_notebook_set_current_page ((GtkNotebook *)mv, position); if (!block) @@ -453,7 +453,7 @@ mail_view_add_account (MailView *mv, position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)msv, mail_account_view_get_tab_widget (msv)); g_signal_connect_after (msv, "view-close", G_CALLBACK(mv_close_mcv), mv); gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, TRUE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, FALSE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, FALSE); if (!block) gtk_notebook_set_current_page ((GtkNotebook *)mv, position); if (!block) -- cgit v1.2.3 From 371a33643e4cecd58aab3dbbf5b7a75cfbe6393e Mon Sep 17 00:00:00 2001 From: Vibha Yadav Date: Mon, 31 Jan 2011 07:58:50 -0500 Subject: Bug 641003 - Build failure in mail-capplet --- capplet/settings/mail-capplet-shell.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'capplet') diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index 7a9a4fa412..c14af1b609 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -26,6 +26,8 @@ #ifdef HAVE_CONFIG_H # include #endif + +#include #include #include #include -- cgit v1.2.3 From 8efc1bc6f91e06ca61b00eb8119c9c36697e43a6 Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Tue, 8 Feb 2011 11:57:50 -0500 Subject: Bug 641756 - Fix warnings from GCC 4.6 GCC learned how to find dead assignments. --- capplet/anjal-settings-main.c | 8 -------- capplet/settings/mail-capplet-shell.c | 4 ---- capplet/settings/mail-guess-servers.c | 6 +----- capplet/settings/mail-view.c | 3 +-- 4 files changed, 2 insertions(+), 19 deletions(-) (limited to 'capplet') diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c index f211beaca7..23e4ac9b7b 100644 --- a/capplet/anjal-settings-main.c +++ b/capplet/anjal-settings-main.c @@ -77,9 +77,7 @@ mail_message_received_cb (UniqueApp *app G_GNUC_UNUSED, guint time_ G_GNUC_UNUSED, gpointer user_data) { - gchar *url; GtkWindow *window = (GtkWindow *) user_data; - gchar *args[2]; switch (command) { case UNIQUE_ACTIVATE : @@ -91,12 +89,6 @@ mail_message_received_cb (UniqueApp *app G_GNUC_UNUSED, return UNIQUE_RESPONSE_OK; case UNIQUE_OPEN : - url = unique_message_data_get_text (message_data); - args[0] = url; - args[1] = NULL; - //mail_shell_set_cmdline_args ((MailShell *)window, args); - //mail_shell_handle_cmdline ((MailShell *)window); - g_free (url); gdk_window_raise (gtk_widget_get_window (GTK_WIDGET (window))); gtk_window_deiconify (window); gtk_window_present (window); diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index c14af1b609..030de15a94 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -202,9 +202,7 @@ static void mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean just_druid, gboolean main_loop) { MailCappletShellPrivate *priv = shell->priv; - GtkWidget *tmp; GtkStyle *style = gtk_widget_get_default_style (); - gint window_width = 1024; gchar *custom_dir; gtk_window_set_icon_name ((GtkWindow *)shell, "evolution"); @@ -214,7 +212,6 @@ mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean gtk_window_set_type_hint ((GtkWindow *)shell, GDK_WINDOW_TYPE_HINT_NORMAL); if (g_getenv("ANJAL_NO_MAX") == NULL && FALSE) { GdkScreen *scr = gtk_widget_get_screen ((GtkWidget *)shell); - window_width = gdk_screen_get_width (scr); gtk_window_set_default_size ((GtkWindow *)shell, gdk_screen_get_width (scr), gdk_screen_get_height (scr)); gtk_window_set_decorated ((GtkWindow *)shell, FALSE); } else { @@ -247,7 +244,6 @@ mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean shell->view = mail_view_new (); shell->view->session = shell->priv->session; gtk_widget_show ((GtkWidget *)shell->view); - tmp = gtk_vbox_new (FALSE, 0); gtk_box_pack_end ((GtkBox *)priv->box, (GtkWidget *)shell->view, TRUE, TRUE, 2); mail_config_init (shell->priv->session); diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c index 66200cc5aa..9df7686356 100644 --- a/capplet/settings/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.c @@ -91,7 +91,6 @@ xml_to_gchar (xmlChar *xml, EmailProvider *provider) static SoupMessage * get_url (SoupSession *session, const gchar *url) { - const gchar *name; SoupMessage *msg; const gchar *header; @@ -100,8 +99,6 @@ get_url (SoupSession *session, const gchar *url) soup_session_send_message (session, msg); - name = soup_message_get_uri (msg)->path; - if (SOUP_STATUS_IS_REDIRECTION (msg->status_code)) { header = soup_message_headers_get_one (msg->response_headers, "Location"); @@ -167,7 +164,7 @@ static gboolean parse_message (const gchar *msg, gint length, EmailProvider *provider) { xmlDocPtr doc; - xmlNodePtr node, top; + xmlNodePtr node; doc = xmlReadMemory (msg, length, "file.xml", NULL, 0); @@ -197,7 +194,6 @@ parse_message (const gchar *msg, gint length, EmailProvider *provider) return FALSE; } - top = node; node = node->children; while (node) { if (strcmp ((gchar *)node->name, "incomingServer") == 0) { diff --git a/capplet/settings/mail-view.c b/capplet/settings/mail-view.c index afe65fd448..356916d9e9 100644 --- a/capplet/settings/mail-view.c +++ b/capplet/settings/mail-view.c @@ -118,7 +118,6 @@ static void mail_view_class_init (MailViewClass *klass) { GObjectClass * object_class = G_OBJECT_CLASS (klass); - AnjalMailViewClass *pclass; signals[VIEW_NEW] = g_signal_new ("view-new", G_OBJECT_CLASS_TYPE (object_class), @@ -128,7 +127,7 @@ mail_view_class_init (MailViewClass *klass) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - pclass = mail_view_parent_class = g_type_class_peek_parent (klass); + mail_view_parent_class = g_type_class_peek_parent (klass); ((AnjalMailViewClass *)klass)->set_folder_uri = mv_set_folder_uri; ((AnjalMailViewClass *)klass)->set_folder_tree = set_folder_tree; ((AnjalMailViewClass *)klass)->set_search = set_search; -- cgit v1.2.3 From 5b9f2129db9be3ffcb612268c504229e2892a7f4 Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Fri, 11 Feb 2011 13:34:17 +0100 Subject: Bug #637923 - Wrap long text in Yahoo email setup --- capplet/settings/mail-account-view.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index 9c75e6b9ee..c099186bb6 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -764,6 +764,8 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->calendar, TRUE); mav->priv->gmail_info_label = gtk_label_new (_("Yahoo calendars are named as firstname_lastname. We have tried to form the calendar name. So please confirm and re-enter the calendar name if it is not correct.")); + gtk_label_set_line_wrap ((GtkLabel *)mav->priv->gmail_info_label, TRUE); + gtk_label_set_line_wrap_mode ((GtkLabel *)mav->priv->gmail_info_label, PANGO_WRAP_WORD); gtk_label_set_selectable ((GtkLabel *)mav->priv->gmail_info_label, TRUE); gtk_widget_show (mav->priv->calendar); -- cgit v1.2.3 From d73b993feb9b5aaaf6bf424cdf9d7e44b5a5896e Mon Sep 17 00:00:00 2001 From: Gary Lin Date: Fri, 11 Feb 2011 13:55:15 +0100 Subject: Bug #637924 - Shows duplicate sentence while click "Back-Sending" button --- capplet/settings/mail-account-view.c | 48 +++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 15 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index c099186bb6..08f4458cff 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -42,6 +42,10 @@ struct _MailAccountViewPrivate { GtkWidget *gcontacts; GtkWidget *gmail_info_label; + GtkWidget *account_label; + GtkWidget *gmail_link; + GtkWidget *yahoo_cal_box; + gboolean is_gmail; gboolean is_yahoo; gboolean do_gcontacts; @@ -705,16 +709,31 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) gtk_widget_destroy (mav->priv->gcontacts); gtk_widget_destroy (mav->priv->calendar); gtk_widget_destroy (mav->priv->gmail_info_label); + if (mav->priv->account_label) { + gtk_widget_destroy (mav->priv->account_label); + mav->priv->account_label = NULL; + } + if (mav->priv->gmail_link) { + gtk_widget_destroy (mav->priv->gmail_link); + mav->priv->gmail_link = NULL; + } } else if (mav->priv->is_yahoo) { gtk_widget_destroy (mav->priv->calendar); gtk_widget_destroy (mav->priv->gmail_info_label); gtk_widget_destroy (mav->priv->yahoo_cal_entry); + if (mav->priv->account_label) { + gtk_widget_destroy (mav->priv->account_label); + mav->priv->account_label = NULL; + } + if (mav->priv->yahoo_cal_box) { + gtk_widget_destroy (mav->priv->yahoo_cal_box); + mav->priv->yahoo_cal_box = NULL; + } } if (mav->original == NULL && (g_strrstr(account->source->url, "gmail") || g_strrstr(account->source->url, "googlemail"))) { /* Google accounts*/ - GtkWidget *tmp; gchar *buff; mav->priv->is_gmail = TRUE; @@ -731,30 +750,29 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) gtk_widget_show (mav->priv->calendar); gtk_widget_show (mav->priv->gmail_info_label); - tmp = gtk_label_new (NULL); + mav->priv->account_label = gtk_label_new (NULL); buff = g_markup_printf_escaped ("%s", _("Google account settings:")); - gtk_label_set_markup ((GtkLabel *)tmp, buff); + gtk_label_set_markup ((GtkLabel *)mav->priv->account_label, buff); g_free (buff); - gtk_widget_show (tmp); + gtk_widget_show (mav->priv->account_label); #define PACK_IN_BOX(wid,child,num) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child, FALSE, FALSE, num); gtk_widget_show (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); } - PACK_IN_BOX (page->box,tmp,12); + PACK_IN_BOX (page->box,mav->priv->account_label,12); PACK_IN_BOX (page->box,mav->priv->gcontacts,24); PACK_IN_BOX (page->box,mav->priv->calendar,24); #undef PACK_IN_BOX #define PACK_IN_BOX(wid,child1,child2,num1,num2) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child1, FALSE, FALSE, num1); gtk_box_pack_start ((GtkBox *)tbox, child2, FALSE, FALSE, num2); gtk_widget_show_all (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); } - PACK_IN_BOX(page->box,mav->priv->gmail_info_label,gtk_link_button_new("https://mail.google.com/mail/?ui=2&shva=1#settings/fwdandpop"), 24, 0); + mav->priv->gmail_link = gtk_link_button_new ("https://mail.google.com/mail/?ui=2&shva=1#settings/fwdandpop"); + PACK_IN_BOX(page->box,mav->priv->gmail_info_label,mav->priv->gmail_link, 24, 0); #undef PACK_IN_BOX } else if (mav->original == NULL && (g_strrstr(account->source->url, "yahoo.") || g_strrstr(account->source->url, "ymail.") || g_strrstr(account->source->url, "rocketmail."))) { /* Yahoo accounts*/ - GtkWidget *tmp; gchar *cal_name; - GtkWidget *tmpbox; gchar *buff; mav->priv->is_yahoo = TRUE; @@ -771,23 +789,23 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) gtk_widget_show (mav->priv->calendar); gtk_widget_show (mav->priv->gmail_info_label); - tmp = gtk_label_new (NULL); + mav->priv->account_label = gtk_label_new (NULL); buff = g_markup_printf_escaped ("%s", _("Yahoo account settings:")); - gtk_label_set_markup ((GtkLabel *)tmp, buff); + gtk_label_set_markup ((GtkLabel *)mav->priv->account_label, buff); g_free (buff); - gtk_widget_show (tmp); + gtk_widget_show (mav->priv->account_label); #define PACK_IN_BOX(wid,child,num) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child, FALSE, FALSE, num); gtk_widget_show (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); } -#define PACK_IN_BOX_AND_TEXT(txt, child,num) { GtkWidget *txtlbl = gtk_label_new (txt); tmpbox = gtk_hbox_new (FALSE, 12); gtk_box_pack_start ((GtkBox *)tmpbox, txtlbl, FALSE, FALSE, num); gtk_box_pack_start ((GtkBox *)tmpbox, child, FALSE, FALSE, num); gtk_widget_show_all (tmpbox);} +#define PACK_IN_BOX_AND_TEXT(txt,box,child,num) { GtkWidget *txtlbl = gtk_label_new (txt); box = gtk_hbox_new (FALSE, 12); gtk_box_pack_start ((GtkBox *)box, txtlbl, FALSE, FALSE, num); gtk_box_pack_start ((GtkBox *)box, child, FALSE, FALSE, num); gtk_widget_show_all (box);} - PACK_IN_BOX (page->box,tmp,12); + PACK_IN_BOX (page->box,mav->priv->account_label,12); PACK_IN_BOX (page->box,mav->priv->calendar,24); mav->priv->yahoo_cal_entry = gtk_entry_new (); gtk_widget_show (mav->priv->yahoo_cal_entry); PACK_IN_BOX (page->box,mav->priv->gmail_info_label, 24); - PACK_IN_BOX_AND_TEXT(_("Yahoo Calendar name:"), mav->priv->yahoo_cal_entry, 0); - PACK_IN_BOX (page->box, tmpbox, 24); + PACK_IN_BOX_AND_TEXT(_("Yahoo Calendar name:"), mav->priv->yahoo_cal_box, mav->priv->yahoo_cal_entry, 0); + PACK_IN_BOX (page->box, mav->priv->yahoo_cal_box, 24); cal_name = g_strdup (e_account_get_string (em_account_editor_get_modified_account (mav->edit), E_ACCOUNT_ID_NAME)); cal_name = g_strdelimit(cal_name, " ", '_'); gtk_entry_set_text ((GtkEntry *)mav->priv->yahoo_cal_entry, cal_name); -- cgit v1.2.3 From 3b6c8972a51d635309b789b1aef9034ca23dc737 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 18 Feb 2011 19:35:59 -0500 Subject: Coding style and whitespace cleanup. --- capplet/settings/mail-account-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index 08f4458cff..cb5ded6b17 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -765,7 +765,7 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) #define PACK_IN_BOX(wid,child1,child2,num1,num2) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child1, FALSE, FALSE, num1); gtk_box_pack_start ((GtkBox *)tbox, child2, FALSE, FALSE, num2); gtk_widget_show_all (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); } mav->priv->gmail_link = gtk_link_button_new ("https://mail.google.com/mail/?ui=2&shva=1#settings/fwdandpop"); - PACK_IN_BOX(page->box,mav->priv->gmail_info_label,mav->priv->gmail_link, 24, 0); + PACK_IN_BOX (page->box,mav->priv->gmail_info_label,mav->priv->gmail_link, 24, 0); #undef PACK_IN_BOX } else if (mav->original == NULL && (g_strrstr(account->source->url, "yahoo.") || -- cgit v1.2.3 From c003c99a75587ba39a45d164272760c33f9666b5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 25 Feb 2011 16:20:41 +0100 Subject: Bug #614480 - Avoid using G_TYPE_INSTANCE_GET_PRIVATE repeatedly --- capplet/settings/mail-decoration.c | 41 +++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 23 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-decoration.c b/capplet/settings/mail-decoration.c index 51a71d11ef..ab63ce293b 100644 --- a/capplet/settings/mail-decoration.c +++ b/capplet/settings/mail-decoration.c @@ -29,8 +29,6 @@ #include #include -#define MAIL_DECORATION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), MAIL_DECORATION_TYPE, MailDecorationPrivate)) - struct _MailDecorationPrivate { GdkCursor *cursors[8]; @@ -339,25 +337,22 @@ mail_decoration_class_init (MailDecorationClass *klass) static void mail_decoration_init (MailDecoration *md) { - MailDecorationPrivate *priv; - - priv = MAIL_DECORATION_GET_PRIVATE (md); - md->priv = priv; - - priv->cursors[0]= gdk_cursor_new (GDK_TOP_LEFT_CORNER); - priv->cursors[1]= gdk_cursor_new (GDK_TOP_SIDE); - priv->cursors[2]= gdk_cursor_new (GDK_TOP_RIGHT_CORNER); - priv->cursors[3]= gdk_cursor_new (GDK_LEFT_SIDE); - priv->cursors[4]= gdk_cursor_new (GDK_RIGHT_SIDE); - priv->cursors[5]= gdk_cursor_new (GDK_BOTTOM_LEFT_CORNER); - priv->cursors[6]= gdk_cursor_new (GDK_BOTTOM_SIDE); - priv->cursors[7]= gdk_cursor_new (GDK_BOTTOM_RIGHT_CORNER); - - priv->default_cursor = TRUE; - priv->resizing = FALSE; - priv->resize_width = 4; - priv->top_height = 54; - priv->check_window = TRUE; - priv->can_resize = TRUE; - priv->full_screen = TRUE; + md->priv = G_TYPE_INSTANCE_GET_PRIVATE (md, MAIL_DECORATION_TYPE, MailDecorationPrivate); + + md->priv->cursors[0]= gdk_cursor_new (GDK_TOP_LEFT_CORNER); + md->priv->cursors[1]= gdk_cursor_new (GDK_TOP_SIDE); + md->priv->cursors[2]= gdk_cursor_new (GDK_TOP_RIGHT_CORNER); + md->priv->cursors[3]= gdk_cursor_new (GDK_LEFT_SIDE); + md->priv->cursors[4]= gdk_cursor_new (GDK_RIGHT_SIDE); + md->priv->cursors[5]= gdk_cursor_new (GDK_BOTTOM_LEFT_CORNER); + md->priv->cursors[6]= gdk_cursor_new (GDK_BOTTOM_SIDE); + md->priv->cursors[7]= gdk_cursor_new (GDK_BOTTOM_RIGHT_CORNER); + + md->priv->default_cursor = TRUE; + md->priv->resizing = FALSE; + md->priv->resize_width = 4; + md->priv->top_height = 54; + md->priv->check_window = TRUE; + md->priv->can_resize = TRUE; + md->priv->full_screen = TRUE; } -- cgit v1.2.3 From 7aacf983b32ecac26bc9707697da622b3ef164a3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 5 Mar 2011 12:33:49 -0500 Subject: Coding style and whitespace cleanup. --- capplet/settings/mail-decoration.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'capplet') diff --git a/capplet/settings/mail-decoration.c b/capplet/settings/mail-decoration.c index ab63ce293b..f8e56f316a 100644 --- a/capplet/settings/mail-decoration.c +++ b/capplet/settings/mail-decoration.c @@ -337,7 +337,8 @@ mail_decoration_class_init (MailDecorationClass *klass) static void mail_decoration_init (MailDecoration *md) { - md->priv = G_TYPE_INSTANCE_GET_PRIVATE (md, MAIL_DECORATION_TYPE, MailDecorationPrivate); + md->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + md, MAIL_DECORATION_TYPE, MailDecorationPrivate); md->priv->cursors[0]= gdk_cursor_new (GDK_TOP_LEFT_CORNER); md->priv->cursors[1]= gdk_cursor_new (GDK_TOP_SIDE); -- cgit v1.2.3 From 302a59743f11b879e252a457fc02d821470e1077 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 31 Jan 2011 16:52:12 -0500 Subject: evolution-settings doesn't really need to be unique. This thing is kind of a weird hybrid of Anjal and Evolution code anyway. We should figure out if and where it really belongs in Evolution and get the Anjal references cleaned up. --- capplet/anjal-settings-main.c | 52 ------------------------------------------- 1 file changed, 52 deletions(-) (limited to 'capplet') diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c index 23e4ac9b7b..4a281b6781 100644 --- a/capplet/anjal-settings-main.c +++ b/capplet/anjal-settings-main.c @@ -56,8 +56,6 @@ #endif #endif -#include - gboolean windowed = FALSE; gboolean anjal_icon_decoration = FALSE; gboolean default_app = FALSE; @@ -70,35 +68,6 @@ extern gchar *shell_moduledir; #define GCONF_KEY_MAILTO_COMMAND "/desktop/gnome/url-handlers/mailto/command" #define ANJAL_MAILTO_COMMAND "anjal %s" -static UniqueResponse -mail_message_received_cb (UniqueApp *app G_GNUC_UNUSED, - gint command, - UniqueMessageData *message_data, - guint time_ G_GNUC_UNUSED, - gpointer user_data) -{ - GtkWindow *window = (GtkWindow *) user_data; - - switch (command) { - case UNIQUE_ACTIVATE : - gtk_window_deiconify (window); - gtk_window_present (window); - return UNIQUE_RESPONSE_OK; - - case UNIQUE_NEW : - return UNIQUE_RESPONSE_OK; - - case UNIQUE_OPEN : - gdk_window_raise (gtk_widget_get_window (GTK_WIDGET (window))); - gtk_window_deiconify (window); - gtk_window_present (window); - - return UNIQUE_RESPONSE_OK; - } - - return UNIQUE_RESPONSE_PASSTHROUGH; -} - static void categories_icon_theme_hack (void) { @@ -172,7 +141,6 @@ main (gint argc, gchar *argv[]) GError *error = NULL; GConfClient *client; - UniqueApp *app; #ifdef G_OS_WIN32 /* Reduce risks */ @@ -252,28 +220,8 @@ main (gint argc, gchar *argv[]) gconf_client_set_bool (client, "/apps/evolution/mail/display/enable_vfolders", FALSE, NULL); g_object_unref (client); - app = unique_app_new ("org.gnome.AnjalSettings", NULL); - if (unique_app_is_running (app) && !socket_id) { - gboolean cmd_line = (remaining_args && remaining_args[0] != NULL); - - if (!cmd_line) - unique_app_send_message (app, UNIQUE_ACTIVATE, NULL); - else { - UniqueMessageData *data = unique_message_data_new (); - unique_message_data_set_text (data, remaining_args[0], -1); - unique_app_send_message (app, UNIQUE_OPEN, data); - unique_message_data_free (data); - } - - return 0; - } - create_default_shell (); - g_signal_connect ( - UNIQUE_APP(app), "message-received", - G_CALLBACK (mail_message_received_cb), main_window); - if (windowed) anjal_icon_decoration = TRUE; -- cgit v1.2.3 From bcc0488529087a6f333636653272544594bc0c3c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 27 Mar 2011 18:22:23 -0400 Subject: Rip out Anjal-specific cruft we don't need. Need to trim off the fat if we're ever going to merge the souped up mail account wizard. Still a long way to go... --- capplet/anjal-settings-main.c | 56 +----- capplet/settings/Makefile.am | 2 - capplet/settings/anjal-mail-view.c | 41 ---- capplet/settings/anjal-mail-view.h | 6 - capplet/settings/mail-capplet-shell.c | 16 -- capplet/settings/mail-capplet-shell.h | 2 - capplet/settings/mail-decoration.c | 359 ---------------------------------- capplet/settings/mail-decoration.h | 68 ------- capplet/settings/mail-view.c | 116 ----------- capplet/settings/mail-view.h | 15 +- 10 files changed, 3 insertions(+), 678 deletions(-) delete mode 100644 capplet/settings/mail-decoration.c delete mode 100644 capplet/settings/mail-decoration.h (limited to 'capplet') diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c index 4a281b6781..07dbda2b20 100644 --- a/capplet/anjal-settings-main.c +++ b/capplet/anjal-settings-main.c @@ -56,17 +56,9 @@ #endif #endif -gboolean windowed = FALSE; -gboolean anjal_icon_decoration = FALSE; -gboolean default_app = FALSE; guint32 socket_id = 0; GtkWidget *main_window; static gchar **remaining_args; -extern gchar *shell_moduledir; - -#define GCONF_KEY_MAILTO_ENABLED "/desktop/gnome/url-handlers/mailto/enabled" -#define GCONF_KEY_MAILTO_COMMAND "/desktop/gnome/url-handlers/mailto/command" -#define ANJAL_MAILTO_COMMAND "anjal %s" static void categories_icon_theme_hack (void) @@ -98,49 +90,18 @@ categories_icon_theme_hack (void) g_free (dirname); } -static void -check_and_set_default_mail (void) -{ - GConfClient *client = gconf_client_get_default (); - gchar *mailer; - - mailer = gconf_client_get_string (client, GCONF_KEY_MAILTO_COMMAND, NULL); - if (mailer && *mailer && (strcmp (mailer, ANJAL_MAILTO_COMMAND) == 0)) { - g_object_unref (client); - return; /* Anjal is the default mailer */ - } - - gconf_client_set_bool (client, GCONF_KEY_MAILTO_ENABLED, TRUE, NULL); - gconf_client_set_string (client, GCONF_KEY_MAILTO_COMMAND, ANJAL_MAILTO_COMMAND, NULL); - g_object_unref (client); -} - -static gboolean -idle_cb (MailCappletShell *mshell G_GNUC_UNUSED) -{ - - if (default_app) { - check_and_set_default_mail (); - } - - return FALSE; -} - static void create_default_shell (void) { main_window = mail_capplet_shell_new (socket_id, FALSE, TRUE); if (!socket_id) gtk_widget_show (main_window); - g_idle_add ((GSourceFunc) idle_cb, remaining_args); } gint main (gint argc, gchar *argv[]) { GError *error = NULL; - GConfClient *client; - #ifdef G_OS_WIN32 /* Reduce risks */ @@ -181,8 +142,6 @@ main (gint argc, gchar *argv[]) #endif static GOptionEntry entries[] = { - { "windowed", 'w', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_NONE, &windowed,N_("Run Anjal in a window"), NULL }, - { "default-mailer", 'd', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_NONE, &default_app,N_("Make Anjal the default email client"), NULL }, { "socket", 's', G_OPTION_FLAG_IN_MAIN, @@ -203,28 +162,17 @@ main (gint argc, gchar *argv[]) setlocale (LC_ALL, NULL); - if (!gtk_init_with_args (&argc, &argv, _("Anjal email client"), entries, NULL, &error)) { - g_error ("Unable to start Anjal: %s\n", error->message); - g_error_free (error); - } + if (!gtk_init_with_args (&argc, &argv, NULL, entries, NULL, &error)) + g_error ("%s", error->message); if (!g_thread_get_initialized ()) g_thread_init (NULL); - client = gconf_client_get_default (); - e_passwords_init (); - gtk_icon_theme_append_search_path (gtk_icon_theme_get_default(), PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "anjal" G_DIR_SEPARATOR_S "icons"); categories_icon_theme_hack (); - gconf_client_set_bool (client, "/apps/evolution/mail/display/enable_vfolders", FALSE, NULL); - g_object_unref (client); - create_default_shell (); - if (windowed) - anjal_icon_decoration = TRUE; - gtk_main (); return 0; diff --git a/capplet/settings/Makefile.am b/capplet/settings/Makefile.am index 61b74c888b..e6ea573c11 100644 --- a/capplet/settings/Makefile.am +++ b/capplet/settings/Makefile.am @@ -45,8 +45,6 @@ libevolution_mail_settings_la_SOURCES = \ mail-view.h \ mail-capplet-shell.c \ mail-capplet-shell.h \ - mail-decoration.c \ - mail-decoration.h \ anjal-mail-view.h \ anjal-mail-view.c \ mail-guess-servers.c \ diff --git a/capplet/settings/anjal-mail-view.c b/capplet/settings/anjal-mail-view.c index 92c811b69a..6779e2e444 100644 --- a/capplet/settings/anjal-mail-view.c +++ b/capplet/settings/anjal-mail-view.c @@ -93,44 +93,3 @@ anjal_mail_view_class_init (AnjalMailViewClass *klass) klass->init_search = view_init_search; }; -AnjalMailView * -anjal_mail_view_new () -{ - AnjalMailView *shell = g_object_new (ANJAL_MAIL_VIEW_TYPE, NULL); - - return shell; -} - -void -anjal_mail_view_set_folder_uri (AnjalMailView *mv, const gchar *uri) -{ - if (!mv || !uri) - return; - - ANJAL_MAIL_VIEW_GET_CLASS (mv)->set_folder_uri (mv, uri); -} - -void -anjal_mail_view_set_folder_tree_widget (AnjalMailView *mv, GtkWidget *tree) -{ - ANJAL_MAIL_VIEW_GET_CLASS (mv)->set_folder_tree_widget (mv, tree); -} - -void -anjal_mail_view_set_folder_tree (AnjalMailView *mv, GtkWidget *tree) -{ - ANJAL_MAIL_VIEW_GET_CLASS (mv)->set_folder_tree (mv, (EMFolderTree *)tree); -} - -void -anjal_mail_view_set_search (AnjalMailView *view, const gchar *search) -{ - ANJAL_MAIL_VIEW_GET_CLASS (view)->set_search (view, search); -} - -void -anjal_mail_view_init_search (AnjalMailView *mv, GtkWidget *search) -{ - ANJAL_MAIL_VIEW_GET_CLASS (mv)->init_search (mv, search); -} - diff --git a/capplet/settings/anjal-mail-view.h b/capplet/settings/anjal-mail-view.h index 953aa4b935..115a877d9f 100644 --- a/capplet/settings/anjal-mail-view.h +++ b/capplet/settings/anjal-mail-view.h @@ -55,10 +55,4 @@ typedef struct _AnjalMailViewClass { } AnjalMailViewClass; GType anjal_mail_view_get_type (void); -AnjalMailView * anjal_mail_view_new (void); -void anjal_mail_view_set_folder_uri (AnjalMailView *mv, const gchar *uri); -void anjal_mail_view_set_folder_tree_widget (AnjalMailView *mv, GtkWidget *tree); -void anjal_mail_view_set_folder_tree (AnjalMailView *mv, GtkWidget *tree); -void anjal_mail_view_set_search (AnjalMailView *view, const gchar *search); -void anjal_mail_view_init_search (AnjalMailView *mv, GtkWidget *search); #endif diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index 030de15a94..cb5c7ec0e4 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -37,7 +37,6 @@ #include -#include "mail-decoration.h" #include #include #include @@ -254,31 +253,16 @@ mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean if (just_druid) { MailViewChild *mc; - gchar *pdir = g_build_filename (g_get_home_dir(), ".gnome2_private", NULL); gtk_notebook_set_show_tabs ((GtkNotebook *)shell->view, FALSE); mc = mail_view_add_page ((MailView *)shell->view, MAIL_VIEW_ACCOUNT, NULL); g_signal_connect (mc, "view-close", G_CALLBACK(ms_show_post_druid), shell); setup_abooks (); - if (!g_file_test (pdir, G_FILE_TEST_EXISTS)) { - g_mkdir (pdir, 0700); - } - g_free (pdir); } else shell->priv->settings_view = mail_view_add_page ((MailView *)shell->view, MAIL_VIEW_SETTINGS, NULL); } -gint -mail_capplet_shell_toolbar_height (MailCappletShell *shell) -{ - GtkAllocation allocation; - - gtk_widget_get_allocation (shell->priv->top_bar, &allocation); - - return allocation.height; -} - GtkWidget * mail_capplet_shell_new (gint socket_id, gboolean just_druid, gboolean main_loop) { diff --git a/capplet/settings/mail-capplet-shell.h b/capplet/settings/mail-capplet-shell.h index 05159a5595..5ddbe4cba8 100644 --- a/capplet/settings/mail-capplet-shell.h +++ b/capplet/settings/mail-capplet-shell.h @@ -54,8 +54,6 @@ GType mail_capplet_shell_get_type (void); GtkWidget * mail_capplet_shell_new (gint socket_id, gboolean just_druid, gboolean main_loop); -gint mail_capplet_shell_toolbar_height - (MailCappletShell *shell); #endif diff --git a/capplet/settings/mail-decoration.c b/capplet/settings/mail-decoration.c deleted file mode 100644 index f8e56f316a..0000000000 --- a/capplet/settings/mail-decoration.c +++ /dev/null @@ -1,359 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - * - * - * Authors: - * Srinivasa Ragavan - * - * Copyright (C) 2009 Novell, Inc. (www.novell.com) - * - */ - -/* Many thanks to Aaron Bockover & Cubano. This is just a C version Cubano's self decoration */ - -#include "mail-decoration.h" - -#include -#include -#include -#include - -struct _MailDecorationPrivate -{ - GdkCursor *cursors[8]; - gboolean default_cursor; - gboolean resizing; - GdkWindowEdge last_edge; - gint resize_width; - gint top_height; - gboolean check_window; - gboolean can_resize; - gboolean full_screen; - - gint window_width; - gint window_height; -}; - -static GObjectClass *parent_class = NULL; - -static void mail_decoration_class_init (MailDecorationClass *klass); -static void mail_decoration_init (MailDecoration *facet); - -GType -mail_decoration_get_type (void) -{ - static GType type = 0; - - if (G_UNLIKELY (type == 0)) - { - static const GTypeInfo mail_decoration_info = - { - sizeof (MailDecorationClass), - NULL, - NULL, - (GClassInitFunc) mail_decoration_class_init, - NULL, - NULL, - sizeof (MailDecoration), - 0, - (GInstanceInitFunc) mail_decoration_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "MailDecoration", - &mail_decoration_info, 0); - } - - return type; -} - -static void -md_translate_position (GdkWindow *w, double ex, double ey, gint *x, gint *y, GtkWidget *window) -{ - *x = (gint)ex; - *y = (gint)ey; - - while (w && w != gtk_widget_get_window (window)) { - gint cx, cy, cw, ch; - gdk_window_get_geometry (w, &cx, &cy, &cw, &ch); - *x += cx; - *y += cy; - w = gdk_window_get_parent (w); - } -} - -static gboolean -in_top (MailDecoration *md, double y) -{ - return y <= md->priv->resize_width; -} - -static gboolean -in_left (MailDecoration *md, double x) -{ - return x <= md->priv->resize_width; -} - -static gboolean -in_bottom (MailDecoration *md, double y) -{ - GtkAllocation allocation; - - gtk_widget_get_allocation (GTK_WIDGET (md->window), &allocation); - - return y >= allocation.height - md->priv->resize_width; -} - -static gboolean -in_right (MailDecoration *md, double x) -{ - GtkAllocation allocation; - - gtk_widget_get_allocation (GTK_WIDGET (md->window), &allocation); - - return x >= allocation.width - md->priv->resize_width; -} - -static void -set_cursor (MailDecoration *md, GdkWindowEdge edge) -{ - gdk_window_set_cursor ( - gtk_widget_get_window (GTK_WIDGET (md->window)), - md->priv->cursors[edge]); - md->priv->default_cursor = FALSE; -} - -static void -reset_cursor (MailDecoration *md) -{ - if (!md->priv->default_cursor) { - md->priv->default_cursor = TRUE; - gdk_window_set_cursor ( - gtk_widget_get_window (GTK_WIDGET (md->window)), - NULL); - } - -} - -static void -update_cursor (MailDecoration *md, double x, double y, gboolean update) -{ - if (update) - md->priv->resizing = TRUE; - - if (in_top (md, y) && in_left (md, x)) { - md->priv->last_edge = GDK_WINDOW_EDGE_NORTH_WEST; - set_cursor (md, GDK_WINDOW_EDGE_NORTH_WEST); - } else if (in_top (md, y) && in_right (md, x)) { - md->priv->last_edge = GDK_WINDOW_EDGE_NORTH_EAST; - set_cursor (md, GDK_WINDOW_EDGE_NORTH_EAST); - } else if (in_bottom (md, y) && in_left (md, x)) { - md->priv->last_edge = GDK_WINDOW_EDGE_SOUTH_WEST; - set_cursor (md, GDK_WINDOW_EDGE_SOUTH_WEST); - } else if (in_bottom (md, y) && in_right (md, x)) { - md->priv->last_edge = GDK_WINDOW_EDGE_SOUTH_EAST; - set_cursor (md, GDK_WINDOW_EDGE_SOUTH_EAST); - } else if (in_top (md, y)) { - md->priv->last_edge = GDK_WINDOW_EDGE_NORTH; - set_cursor (md, GDK_WINDOW_EDGE_NORTH); - } else if (in_bottom (md, y)) { - md->priv->last_edge = GDK_WINDOW_EDGE_SOUTH; - set_cursor (md, GDK_WINDOW_EDGE_SOUTH); - } else if (in_left (md, x)) { - md->priv->last_edge = GDK_WINDOW_EDGE_WEST; - set_cursor (md, GDK_WINDOW_EDGE_WEST); - } else if (in_right (md, x)) { - md->priv->last_edge = GDK_WINDOW_EDGE_EAST; - set_cursor (md, GDK_WINDOW_EDGE_EAST); - } else { - if (update) - md->priv->resizing = FALSE; - reset_cursor (md); - } -} - -static gboolean -md_motion_event (GtkWidget *widget, GdkEventMotion *event, gpointer user_data) -{ - gint x, y; - MailDecoration *md = (MailDecoration *)user_data; - - md_translate_position (event->window, event->x, event->y, &x, &y, (GtkWidget *)md->window); - - if (md->priv->can_resize) { - update_cursor (md, x, y, FALSE); - } - - return FALSE; -} - -static gboolean -md_enter_event (GtkWidget *widget , GdkEventCrossing *event, gpointer user_data) -{ - MailDecoration *md = (MailDecoration *)user_data; - gint x, y; - - md_translate_position (event->window, event->x, event->y, &x, &y, (GtkWidget *)md->window); - - if (md->priv->can_resize) { - update_cursor (md, x, y, FALSE); - } - - return FALSE; -} - -static gboolean -md_leave_event (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) -{ - MailDecoration *md = (MailDecoration *)user_data; - - if (md->priv->can_resize) - reset_cursor (md); - - return FALSE; -} - -static void -md_size_allocate_event (GtkWidget *widget, GtkAllocation *allocation, gpointer user_data) -{ - gint width=1024, height=500; - MailDecoration *md = (MailDecoration *)user_data; - - gtk_widget_queue_draw (widget); - gtk_window_get_size ((GtkWindow *)widget, &width, &height); - if (width != md->priv->window_width || height != md->priv->window_height) { - GConfClient *client = gconf_client_get_default (); - - md->priv->window_height = height; - md->priv->window_width = width; - gconf_client_set_int (client, "/apps/anjal/window_width", width, NULL); - gconf_client_set_int (client, "/apps/anjal/window_height", height, NULL); - g_object_unref (client); - } - -} - -static gboolean -md_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data) -{ - MailDecoration *md = (MailDecoration *)user_data; - gint x_root = (gint) event->x_root; - gint y_root = (gint) event->y_root; - gint x, y; - - if (!md->priv->can_resize) { - return FALSE; - } - - md_translate_position (event->window, event->x, event->y, &x, &y, (GtkWidget *)md->window); - update_cursor (md, x, y, TRUE); - if (md->priv->resizing && event->button == 1 && event->type != GDK_2BUTTON_PRESS) { - gtk_window_begin_resize_drag ((GtkWindow *)widget, md->priv->last_edge, 1, x_root, y_root, event->time); - - } else if ((md->priv->resizing && event->button == 2 && event->type != GDK_2BUTTON_PRESS) || - (event->button == 1 && y <= md->priv->top_height && event->type != GDK_2BUTTON_PRESS)) { - gtk_window_begin_move_drag ((GtkWindow *)widget, event->button, x_root, y_root, event->time); - } else if (y <= md->priv->top_height && event->type == GDK_2BUTTON_PRESS) { - if (md->priv->full_screen) - gtk_window_unfullscreen (md->window); - else - gtk_window_fullscreen (md->window); - - md->priv->full_screen = md->priv->full_screen != TRUE; - } else - return FALSE; - - return TRUE; -} - -static gboolean -md_button_release_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data) -{ - gint x, y; - MailDecoration *md = (MailDecoration *)user_data; - - md_translate_position (event->window, event->x, event->y, &x, &y, (GtkWidget *)md->window); - if (md->priv->resizing) { - update_cursor (md, x, y, TRUE); - } - - return FALSE; -} - -MailDecoration* mail_decoration_new (GtkWindow *window) -{ - MailDecoration *md = g_object_new (mail_decoration_get_type (), NULL); - GConfClient *client = gconf_client_get_default (); - gint width, height; - - md->priv->window_width = width = gconf_client_get_int (client, "/apps/anjal/window_width", NULL); - if (!width) - md->priv->window_width = width = 1024; - md->priv->window_height = height = gconf_client_get_int (client, "/apps/anjal/window_height", NULL); - if (!height) - md->priv->window_height = height = 500; - g_object_unref (client); - - md->window = window; - gtk_window_set_decorated (window, FALSE); - gtk_widget_add_events ((GtkWidget *)window, GDK_BUTTON_PRESS_MASK | - GDK_POINTER_MOTION_MASK | - GDK_ENTER_NOTIFY_MASK | - GDK_LEAVE_NOTIFY_MASK | - GDK_BUTTON_RELEASE_MASK); - - g_signal_connect (window, "motion-notify-event", G_CALLBACK(md_motion_event), md); - g_signal_connect (window, "enter-notify-event", G_CALLBACK(md_enter_event), md); - g_signal_connect (window, "leave-notify-event", G_CALLBACK(md_leave_event), md); - g_signal_connect (window, "button-press-event", G_CALLBACK(md_button_press_event), md); - g_signal_connect (window, "button-release-event", G_CALLBACK(md_button_release_event), md); - g_signal_connect (window, "size-allocate", G_CALLBACK(md_size_allocate_event), md); - gtk_window_set_default_size ((GtkWindow *)window , width, height);/* We officiall should support 800x600 */ - - return md; -} - -static void -mail_decoration_class_init (MailDecorationClass *klass) -{ - - GObjectClass *object_class = G_OBJECT_CLASS (klass); - parent_class = g_type_class_peek_parent (klass); - - g_type_class_add_private (object_class, sizeof (MailDecorationPrivate)); -} - -static void -mail_decoration_init (MailDecoration *md) -{ - md->priv = G_TYPE_INSTANCE_GET_PRIVATE ( - md, MAIL_DECORATION_TYPE, MailDecorationPrivate); - - md->priv->cursors[0]= gdk_cursor_new (GDK_TOP_LEFT_CORNER); - md->priv->cursors[1]= gdk_cursor_new (GDK_TOP_SIDE); - md->priv->cursors[2]= gdk_cursor_new (GDK_TOP_RIGHT_CORNER); - md->priv->cursors[3]= gdk_cursor_new (GDK_LEFT_SIDE); - md->priv->cursors[4]= gdk_cursor_new (GDK_RIGHT_SIDE); - md->priv->cursors[5]= gdk_cursor_new (GDK_BOTTOM_LEFT_CORNER); - md->priv->cursors[6]= gdk_cursor_new (GDK_BOTTOM_SIDE); - md->priv->cursors[7]= gdk_cursor_new (GDK_BOTTOM_RIGHT_CORNER); - - md->priv->default_cursor = TRUE; - md->priv->resizing = FALSE; - md->priv->resize_width = 4; - md->priv->top_height = 54; - md->priv->check_window = TRUE; - md->priv->can_resize = TRUE; - md->priv->full_screen = TRUE; -} diff --git a/capplet/settings/mail-decoration.h b/capplet/settings/mail-decoration.h deleted file mode 100644 index 1339cae305..0000000000 --- a/capplet/settings/mail-decoration.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - * - * - * Authors: - * Srinivasa Ragavan - * - * Copyright (C) 2009 Novell, Inc. (www.novell.com) - * - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#ifndef _MAIL_DECORATION_ -#define _MAIL_DECORATION_ - -#include - -#define MAIL_DECORATION_TYPE \ - (mail_decoration_get_type ()) -#define MAIL_DECORATION(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST \ - ((obj), MAIL_DECORATION_TYPE, MailDecoration)) -#define MAIL_DECORATION_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_CAST \ - ((cls), MAIL_DECORATION_TYPE, MailDecorationClass)) -#define IS_MAIL_DECORATION(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE \ - ((obj), MAIL_DECORATION_TYPE)) -#define IS_MAIL_DECORATION_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_TYPE \ - ((obj), MAIL_DECORATION_TYPE)) -#define MAIL_DECORATION_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS \ - ((obj), MAIL_DECORATION_TYPE, MailDecorationClass)) - -typedef struct _MailDecoration MailDecoration; -typedef struct _MailDecorationClass MailDecorationClass; -typedef struct _MailDecorationPrivate MailDecorationPrivate; - -struct _MailDecoration { - GObject parent; - - GtkWindow *window; - MailDecorationPrivate *priv; -}; - -struct _MailDecorationClass { - GObjectClass parent_class; -}; - -GType mail_decoration_get_type (void); -MailDecoration *mail_decoration_new (GtkWindow *); - -#endif diff --git a/capplet/settings/mail-view.c b/capplet/settings/mail-view.c index 356916d9e9..4c7c9ddd05 100644 --- a/capplet/settings/mail-view.c +++ b/capplet/settings/mail-view.c @@ -425,17 +425,6 @@ mail_view_add_settings (MailView *mv, gpointer data, gboolean block) return (MailViewChild *)msv; } -void -mail_view_switch_to_settings (MailView* mv, MailViewChild *mpv) -{ - gint position = 0; - - position = mv_get_page_number ((GtkNotebook *)mv, (GtkWidget *)mpv); - REALIGN_NODES (mv->priv->children,mpv); - gtk_notebook_set_current_page ((GtkNotebook *)mv, position); - mail_settings_view_activate ((MailSettingsView *)mpv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE); -} - static MailViewChild * mail_view_add_account (MailView *mv, gpointer data, @@ -551,23 +540,6 @@ mail_view_set_folder_uri (MailView *mv, const gchar *uri) mv_switch_folder_view (mv, uri); } -void -mail_view_show_sort_popup (MailView *mv, GtkWidget *button) -{ - mail_folder_view_show_sort_popup ((MailFolderView *)mv->priv->current_view, button); -} - -void -mail_view_show_list (MailView *mv) -{ - MailViewChild *child = (MailViewChild *)mv->priv->current_view; - - if (child->type == MAIL_VIEW_MESSAGE) - mv_close_mcv (child, mv); - else if (child->type == MAIL_VIEW_FOLDER) - mail_folder_view_show_list ((MailFolderView *)mv->priv->current_view); - -} #endif void mail_view_close_view (MailView *mv) @@ -577,52 +549,12 @@ mail_view_close_view (MailView *mv) mv_close_mcv (child, mv); } -#ifndef ANJAL_SETTINGS -static void -mv_slider_clicked (GtkButton *slider, MailView *mv) -{ - gtk_widget_hide (mv->slider); - gtk_widget_show (mv->folder_tree); - if (mv->priv->current_view->type == MAIL_VIEW_FOLDER) - mail_folder_view_show_list ((MailFolderView *)mv->priv->current_view); - else { - gtk_widget_show (mv->folder_tree); - gtk_widget_hide ((GtkWidget *)slider); - } -} - -void -mail_view_set_slider (MailView *mv, GtkWidget *slider) -{ - mv->slider = slider; - g_signal_connect (slider, "clicked", G_CALLBACK(mv_slider_clicked), mv); -} -#endif - -void -mail_view_set_folder_tree_widget (MailView *mv, GtkWidget *tree) -{ - mv->folder_tree = tree; -} - void mail_view_set_folder_tree (MailView *mv, GtkWidget *tree) { mv->tree = tree; } -void -mail_view_set_check_email (MailView *mv, GtkWidget *button) -{ - mv->check_mail = button;; -} - -void -mail_view_set_sort_by (MailView *mv, GtkWidget *button) -{ - mv->sort_by = button;; -} - #ifndef ANJAL_SETTINGS static void mv_spinner_done (CamelFolder *f, gpointer data) @@ -631,42 +563,6 @@ mv_spinner_done (CamelFolder *f, gpointer data) mv_spinner_show (mv, FALSE); } -void -mail_view_check_mail (MailView *mv, gboolean deep) -{ - MailViewChild *child = (MailViewChild *)mv->priv->current_view; - - if (child && child->type == MAIL_VIEW_FOLDER) { - mail_folder_view_check_mail ((MailFolderView *)child); - CamelFolder *folder; - - if ((folder = em_folder_tree_get_selected_folder ((EMFolderTree *)mv->tree)) != NULL) { - mv_spinner_show (mv, TRUE); - mail_refresh_folder (folder, mv_spinner_done, mv); - } - } - - if (deep) { - em_utils_clear_get_password_canceled_accounts_flag (); - mail_send_receive (NULL); - } -} - -void -mail_view_save (MailView *mv) -{ - GList *child = mv->priv->children; - MailViewChild *cview; - - while (child) { - cview = (MailViewChild *)child->data; - if (cview->type == MAIL_VIEW_FOLDER) { - mail_folder_view_save ((MailFolderView *)cview); - } - child = child->next; - } -} - void mail_view_set_search (MailView *mv, const gchar *search) { @@ -680,18 +576,6 @@ mail_view_set_search (MailView *mv, const gchar *search) } #endif -void -mail_view_set_search_entry (MailView *mv, GtkWidget *entry) -{ - mv->priv->search_entry = entry; -} - -void -mail_view_init_search (MailView *mv, GtkWidget *search) -{ - mv->priv->search = search; -} - void mail_view_set_shell_view (MailView *mv, EShellView *shell) { diff --git a/capplet/settings/mail-view.h b/capplet/settings/mail-view.h index 904338e87d..558bb945a7 100644 --- a/capplet/settings/mail-view.h +++ b/capplet/settings/mail-view.h @@ -40,8 +40,7 @@ enum { MAIL_VIEW_COMPOSER, MAIL_VIEW_MESSAGE, MAIL_VIEW_ACCOUNT, - MAIL_VIEW_SETTINGS, - MAIL_VIEW_PEOPLE + MAIL_VIEW_SETTINGS }; typedef struct _MailViewPrivate MailViewPrivate; @@ -79,22 +78,10 @@ typedef struct _MailViewChild { GType mail_view_get_type (void); MailView * mail_view_new (void); void mail_view_set_folder_uri (MailView *mv, const gchar *uri); -void mail_view_show_sort_popup (MailView *mv, GtkWidget *); -void mail_view_show_list (MailView *mv); void mail_view_close_view (MailView *mv); -void mail_view_set_check_email (MailView *mv, GtkWidget *button); -void mail_view_set_sort_by (MailView *mv, GtkWidget *button); -void mail_view_check_mail (MailView *mv, gboolean deep); -void mail_view_set_folder_tree_widget (MailView *mv, GtkWidget *tree); void mail_view_set_folder_tree (MailView *mv, GtkWidget *tree); -void mail_view_save (MailView *mv); MailViewChild * mail_view_add_page (MailView *mv, guint16 type, gpointer data); void mail_view_set_search (MailView *view, const gchar *search); -void mail_view_set_slider (MailView *mv, GtkWidget *slider); -void mail_view_init_search (MailView *mv, GtkWidget *search); -void mail_view_switch_to_people (MailView* mv, MailViewChild *mpv); -void mail_view_switch_to_settings (MailView* mv, MailViewChild *mpv); -void mail_view_set_search_entry (MailView *mv, GtkWidget *entry); void mail_view_set_shell_view (MailView *mv, EShellView *shell); #endif -- cgit v1.2.3 From 578214584caa7805edca09b27e2306dc31d80fb6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 7 May 2011 12:22:36 -0400 Subject: Whitespace and coding style cleanups. --- capplet/settings/mail-guess-servers.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'capplet') diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c index 9df7686356..2d9197dc0c 100644 --- a/capplet/settings/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.c @@ -215,7 +215,9 @@ parse_message (const gchar *msg, gint length, EmailProvider *provider) static gboolean parse_soup_message (SoupMessage *msg, EmailProvider *provider) { - return parse_message (msg->response_body->data, msg->response_body->length, provider); + return parse_message ( + msg->response_body->data, + msg->response_body->length, provider); } static gboolean -- 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. --- capplet/settings/anjal-mail-view.c | 2 +- capplet/settings/mail-account-view.c | 190 +++++++++++++++++----------------- capplet/settings/mail-capplet-shell.c | 32 +++--- capplet/settings/mail-settings-view.c | 34 +++--- capplet/settings/mail-view.c | 172 +++++++++++++++--------------- 5 files changed, 215 insertions(+), 215 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/anjal-mail-view.c b/capplet/settings/anjal-mail-view.c index 6779e2e444..21a8f0a437 100644 --- a/capplet/settings/anjal-mail-view.c +++ b/capplet/settings/anjal-mail-view.c @@ -48,7 +48,7 @@ anjal_mail_view_init (AnjalMailView *shell) static void anjal_mail_view_finalize (GObject *object) { - AnjalMailView *shell = (AnjalMailView *)object; + AnjalMailView *shell = (AnjalMailView *) object; AnjalMailViewPrivate *priv = shell->priv; g_free (priv); diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index cb5ded6b17..128e541f91 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -94,7 +94,7 @@ mail_account_view_init (MailAccountView *shell) static void mail_account_view_finalize (GObject *object) { - MailAccountView *shell = (MailAccountView *)object; + MailAccountView *shell = (MailAccountView *) object; g_free (shell->priv->username); @@ -160,10 +160,10 @@ save_identity (MailAccountView *view) static gint validate_identity (MailAccountView *view) { - gchar *user = (gchar *)e_account_get_string (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_ID_NAME); - gchar *email = (gchar *)e_account_get_string (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_ID_ADDRESS); + gchar *user = (gchar *) e_account_get_string (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_ID_NAME); + gchar *email = (gchar *) e_account_get_string (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_ID_ADDRESS); gchar *tmp; - const gchar *pwd = gtk_entry_get_text ((GtkEntry *)view->password); + const gchar *pwd = gtk_entry_get_text ((GtkEntry *) view->password); if (!user || !*user) return ERROR_NO_FULLNAME; @@ -242,8 +242,8 @@ setup_yahoo_account (MailAccountView *mav) { GConfClient *gconf = gconf_client_get_default (); - mav->priv->do_gcontacts = gtk_toggle_button_get_active ((GtkToggleButton *)mav->priv->gcontacts); - mav->priv->do_calendar = gtk_toggle_button_get_active ((GtkToggleButton *)mav->priv->calendar); + mav->priv->do_gcontacts = gtk_toggle_button_get_active ((GtkToggleButton *) mav->priv->gcontacts); + mav->priv->do_calendar = gtk_toggle_button_get_active ((GtkToggleButton *) mav->priv->calendar); if (mav->priv->do_calendar) { ESourceList *slist; @@ -277,10 +277,10 @@ setup_yahoo_account (MailAccountView *mav) sanitize_uname = sanitize_user_mail (email); abs_uri = g_strdup_printf ("caldav://%s@caldav.calendar.yahoo.com/dav/%s/Calendar/%s/", sanitize_uname, email, gtk_entry_get_text((GtkEntry *)mav->priv->yahoo_cal_entry)); - e_passwords_add_password (abs_uri, gtk_entry_get_text ((GtkEntry *)mav->password)); + e_passwords_add_password (abs_uri, gtk_entry_get_text ((GtkEntry *) mav->password)); e_passwords_remember_password ("Calendar", abs_uri); - rel_uri = g_strdup_printf (YAHOO_CALENDAR_LOCATION, sanitize_uname, email, gtk_entry_get_text ((GtkEntry *)mav->priv->yahoo_cal_entry)); + rel_uri = g_strdup_printf (YAHOO_CALENDAR_LOCATION, sanitize_uname, email, gtk_entry_get_text ((GtkEntry *) mav->priv->yahoo_cal_entry)); e_source_set_relative_uri (calendar, rel_uri); e_source_group_add_source (sgrp, calendar, -1); @@ -327,7 +327,7 @@ setup_yahoo_account (MailAccountView *mav) e_source_set_relative_uri (abook, mav->priv->username); rel_uri = g_strdup_printf("google://%s/", mav->priv->username); - e_passwords_add_password (rel_uri, gtk_entry_get_text ((GtkEntry *)mav->password)); + e_passwords_add_password (rel_uri, gtk_entry_get_text ((GtkEntry *) mav->password)); e_passwords_remember_password ("Addressbook", rel_uri); e_source_group_add_source (sgrp, abook, -1); e_source_list_sync (slist, NULL); @@ -347,8 +347,8 @@ setup_google_accounts (MailAccountView *mav) { GConfClient *gconf = gconf_client_get_default (); - mav->priv->do_gcontacts = gtk_toggle_button_get_active ((GtkToggleButton *)mav->priv->gcontacts); - mav->priv->do_calendar = gtk_toggle_button_get_active ((GtkToggleButton *)mav->priv->calendar); + mav->priv->do_gcontacts = gtk_toggle_button_get_active ((GtkToggleButton *) mav->priv->gcontacts); + mav->priv->do_calendar = gtk_toggle_button_get_active ((GtkToggleButton *) mav->priv->calendar); if (mav->priv->do_calendar) { ESourceList *slist; @@ -378,7 +378,7 @@ setup_google_accounts (MailAccountView *mav) abs_uri = g_strdup_printf (CALENDAR_CALDAV_URI, sanitize_uname, mav->priv->username); e_source_set_absolute_uri (calendar, abs_uri); - e_passwords_add_password (abs_uri, gtk_entry_get_text ((GtkEntry *)mav->password)); + e_passwords_add_password (abs_uri, gtk_entry_get_text ((GtkEntry *) mav->password)); e_passwords_remember_password ("Calendar", abs_uri); rel_uri = g_strconcat ("https", GMAIL_CALENDAR_LOCATION, sanitize_uname, CALENDAR_DEFAULT_PATH, NULL); e_source_set_relative_uri (calendar, rel_uri); @@ -428,7 +428,7 @@ setup_google_accounts (MailAccountView *mav) e_source_set_relative_uri (abook, mav->priv->username); rel_uri = g_strdup_printf("google://%s/", mav->priv->username); - e_passwords_add_password (rel_uri, gtk_entry_get_text ((GtkEntry *)mav->password)); + e_passwords_add_password (rel_uri, gtk_entry_get_text ((GtkEntry *) mav->password)); e_passwords_remember_password ("Addressbook", rel_uri); e_source_list_sync (slist, NULL); @@ -452,91 +452,91 @@ create_review (MailAccountView *view) CamelURL *url; gchar *buff; - uri = (gchar *)e_account_get_string (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_SOURCE_URL); + uri = (gchar *) e_account_get_string (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_SOURCE_URL); if (!uri || (url = camel_url_new (uri, NULL)) == NULL) return NULL; table = gtk_table_new (4,2, FALSE); - gtk_table_set_row_spacings ((GtkTable *)table, 4); + gtk_table_set_row_spacings ((GtkTable *) table, 4); label = gtk_label_new (NULL); buff = g_markup_printf_escaped ("%s", _("Personal details:")); - gtk_label_set_markup ((GtkLabel *)label, buff); + gtk_label_set_markup ((GtkLabel *) label, buff); g_free (buff); gtk_widget_show (label); PACK_BOXF (label) - gtk_table_attach ((GtkTable *)table, box, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (_("Name:")); gtk_widget_show (label); PACK_BOX (label); - gtk_table_attach ((GtkTable *)table, box, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (e_account_get_string (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_ID_NAME)); gtk_widget_show (entry); PACK_BOX (entry) - gtk_table_attach ((GtkTable *)table, box, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (_("Email address:")); gtk_widget_show (label); PACK_BOX (label) - gtk_table_attach ((GtkTable *)table, box, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (e_account_get_string (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_ID_ADDRESS)); gtk_widget_show (entry); PACK_BOX (entry) - gtk_table_attach ((GtkTable *)table, box, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (NULL); buff = g_markup_printf_escaped ("%s", _("Details:")); - gtk_label_set_markup ((GtkLabel *)label, buff); + gtk_label_set_markup ((GtkLabel *) label, buff); g_free (buff); gtk_widget_show (label); PACK_BOXF (label); - gtk_table_attach ((GtkTable *)table, box, 0, 1, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 0, 1, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (NULL); buff = g_markup_printf_escaped ("%s", _("Receiving")); - gtk_label_set_markup ((GtkLabel *)label, buff); + gtk_label_set_markup ((GtkLabel *) label, buff); g_free (buff); gtk_widget_show (label); PACK_BOXF (label); - gtk_table_attach ((GtkTable *)table, box, 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (_("Server type:")); gtk_widget_show (label); PACK_BOX (label); - gtk_table_attach ((GtkTable *)table, box, 0, 1, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 0, 1, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (url->protocol); gtk_widget_show (entry); PACK_BOX (entry) - gtk_table_attach ((GtkTable *)table, box, 1, 2, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 1, 2, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (_("Server address:")); gtk_widget_show (label); PACK_BOX (label); - gtk_table_attach ((GtkTable *)table, box, 0, 1, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 0, 1, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (url->host); gtk_widget_show (entry); PACK_BOX (entry); - gtk_table_attach ((GtkTable *)table, box, 1, 2, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 1, 2, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (_("Username:")); gtk_widget_show (label); PACK_BOX (label); - gtk_table_attach ((GtkTable *)table, box, 0, 1, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 0, 1, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (url->user); gtk_widget_show (entry); PACK_BOX (entry); - gtk_table_attach ((GtkTable *)table, box, 1, 2, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 1, 2, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (_("Use encryption:")); gtk_widget_show (label); PACK_BOX (label); - gtk_table_attach ((GtkTable *)table, box, 0, 1, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 0, 1, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); enc = (gchar *)camel_url_get_param(url, "use_ssl"); entry = gtk_label_new (enc ? enc : _("never")); gtk_widget_show (entry); PACK_BOX (entry); - gtk_table_attach ((GtkTable *)table, box, 1, 2, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 1, 2, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); view->priv->username = g_strdup (url->user); camel_url_free (url); @@ -546,32 +546,32 @@ create_review (MailAccountView *view) label = gtk_label_new (NULL); buff = g_markup_printf_escaped ("%s", _("Sending")); - gtk_label_set_markup ((GtkLabel *)label, buff); + gtk_label_set_markup ((GtkLabel *) label, buff); g_free (buff); gtk_widget_show (label); PACK_BOXF (label); - gtk_table_attach ((GtkTable *)table, box, 2, 3, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 2, 3, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (url->protocol); gtk_widget_show (entry); PACK_BOX (entry) - gtk_table_attach ((GtkTable *)table, box, 2, 3, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 2, 3, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (url->host); gtk_widget_show (entry); PACK_BOX (entry); - gtk_table_attach ((GtkTable *)table, box, 2, 3, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 2, 3, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (url->user); gtk_widget_show (entry); PACK_BOX (entry); - gtk_table_attach ((GtkTable *)table, box, 2, 3, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 2, 3, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); enc = (gchar *)camel_url_get_param(url, "use_ssl"); entry = gtk_label_new (enc ? enc : _("never")); gtk_widget_show (entry); PACK_BOX (entry); - gtk_table_attach ((GtkTable *)table, box, 2, 3, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 2, 3, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); /* label = gtk_label_new (_("Organization:")); @@ -627,7 +627,7 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) gint ret = (*mail_account_pages[mav->current_page].validate_page) (mav); MAVPage *page = mav->pages[mav->current_page]; if (ret) { - gtk_label_set_text ((GtkLabel *)page->error_label, _(dialog_errors[ret-1].detail)); + gtk_label_set_text ((GtkLabel *) page->error_label, _(dialog_errors[ret-1].detail)); gtk_widget_show (page->error); return; } @@ -639,7 +639,7 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) } if (mav->current_page == MAV_LAST - 1) { - gchar *uri = (gchar *)e_account_get_string (em_account_editor_get_modified_account (mav->edit), E_ACCOUNT_SOURCE_URL); + gchar *uri = (gchar *) e_account_get_string (em_account_editor_get_modified_account (mav->edit), E_ACCOUNT_SOURCE_URL); CamelURL *url; e_account_set_string (em_account_editor_get_modified_account (mav->edit), E_ACCOUNT_NAME, e_account_get_string (em_account_editor_get_modified_account (mav->edit), E_ACCOUNT_ID_ADDRESS)); @@ -667,7 +667,7 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) /* Save the password ahead of time */ aurl = camel_url_new (account->source->url, NULL); surl = camel_url_to_string (aurl, CAMEL_URL_HIDE_ALL); - e_passwords_add_password (surl, gtk_entry_get_text ((GtkEntry *)mav->password)); + e_passwords_add_password (surl, gtk_entry_get_text ((GtkEntry *) mav->password)); e_passwords_remember_password ("Mail", surl); camel_url_free (aurl); g_free (surl); @@ -701,9 +701,9 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) tmp = mail_account_pages[mav->current_page].create_page (mav); page->main = gtk_hbox_new (FALSE, 0); gtk_widget_show (page->main); - gtk_box_pack_start ((GtkBox *)page->main, tmp, FALSE, FALSE, 0); + gtk_box_pack_start ((GtkBox *) page->main, tmp, FALSE, FALSE, 0); gtk_widget_show (tmp); - gtk_box_pack_start ((GtkBox *)page->box, page->main, FALSE, FALSE, 3); + gtk_box_pack_start ((GtkBox *) page->box, page->main, FALSE, FALSE, 3); if (mav->priv->is_gmail) { gtk_widget_destroy (mav->priv->gcontacts); @@ -740,11 +740,11 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) mav->priv->gcontacts = gtk_check_button_new_with_label (_("Setup Google contacts with Evolution")); mav->priv->calendar = gtk_check_button_new_with_label (_("Setup Google calendar with Evolution")); - gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->gcontacts, TRUE); - gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->calendar, TRUE); + gtk_toggle_button_set_active ((GtkToggleButton *) mav->priv->gcontacts, TRUE); + gtk_toggle_button_set_active ((GtkToggleButton *) mav->priv->calendar, TRUE); mav->priv->gmail_info_label = gtk_label_new (_("You may need to enable IMAP access.")); - gtk_label_set_selectable ((GtkLabel *)mav->priv->gmail_info_label, TRUE); + gtk_label_set_selectable ((GtkLabel *) mav->priv->gmail_info_label, TRUE); gtk_widget_show (mav->priv->gcontacts); gtk_widget_show (mav->priv->calendar); @@ -752,7 +752,7 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) mav->priv->account_label = gtk_label_new (NULL); buff = g_markup_printf_escaped ("%s", _("Google account settings:")); - gtk_label_set_markup ((GtkLabel *)mav->priv->account_label, buff); + gtk_label_set_markup ((GtkLabel *) mav->priv->account_label, buff); g_free (buff); gtk_widget_show (mav->priv->account_label); @@ -779,19 +779,19 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) printf("Google account: %s\n", account->source->url); mav->priv->calendar = gtk_check_button_new_with_label (_("Setup Yahoo calendar with Evolution")); - gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->calendar, TRUE); + gtk_toggle_button_set_active ((GtkToggleButton *) mav->priv->calendar, TRUE); mav->priv->gmail_info_label = gtk_label_new (_("Yahoo calendars are named as firstname_lastname. We have tried to form the calendar name. So please confirm and re-enter the calendar name if it is not correct.")); - gtk_label_set_line_wrap ((GtkLabel *)mav->priv->gmail_info_label, TRUE); - gtk_label_set_line_wrap_mode ((GtkLabel *)mav->priv->gmail_info_label, PANGO_WRAP_WORD); - gtk_label_set_selectable ((GtkLabel *)mav->priv->gmail_info_label, TRUE); + gtk_label_set_line_wrap ((GtkLabel *) mav->priv->gmail_info_label, TRUE); + gtk_label_set_line_wrap_mode ((GtkLabel *) mav->priv->gmail_info_label, PANGO_WRAP_WORD); + gtk_label_set_selectable ((GtkLabel *) mav->priv->gmail_info_label, TRUE); gtk_widget_show (mav->priv->calendar); gtk_widget_show (mav->priv->gmail_info_label); mav->priv->account_label = gtk_label_new (NULL); buff = g_markup_printf_escaped ("%s", _("Yahoo account settings:")); - gtk_label_set_markup ((GtkLabel *)mav->priv->account_label, buff); + gtk_label_set_markup ((GtkLabel *) mav->priv->account_label, buff); g_free (buff); gtk_widget_show (mav->priv->account_label); @@ -808,7 +808,7 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) PACK_IN_BOX (page->box, mav->priv->yahoo_cal_box, 24); cal_name = g_strdup (e_account_get_string (em_account_editor_get_modified_account (mav->edit), E_ACCOUNT_ID_NAME)); cal_name = g_strdelimit(cal_name, " ", '_'); - gtk_entry_set_text ((GtkEntry *)mav->priv->yahoo_cal_entry, cal_name); + gtk_entry_set_text ((GtkEntry *) mav->priv->yahoo_cal_entry, cal_name); g_free (cal_name); #undef PACK_IN_BOX } else { @@ -859,8 +859,8 @@ mav_construct_page (MailAccountView *view, MAVPageType type) error_box = gtk_hbox_new (FALSE, 2); page->error_label = gtk_label_new (""); tmp = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_MENU); - gtk_box_pack_start ((GtkBox *)error_box, tmp, FALSE, FALSE, 2); - gtk_box_pack_start ((GtkBox *)error_box, page->error_label, FALSE, FALSE, 2); + gtk_box_pack_start ((GtkBox *) error_box, tmp, FALSE, FALSE, 2); + gtk_box_pack_start ((GtkBox *) error_box, page->error_label, FALSE, FALSE, 2); gtk_widget_hide (tmp); gtk_widget_show (page->error_label); page->error = tmp; @@ -868,31 +868,31 @@ mav_construct_page (MailAccountView *view, MAVPageType type) box = gtk_hbox_new (FALSE, 12); gtk_widget_show (box); - gtk_box_pack_start ((GtkBox *)page->box, box, FALSE, FALSE, 12); + gtk_box_pack_start ((GtkBox *) page->box, box, FALSE, FALSE, 12); tmp = gtk_label_new (NULL); str = g_strdup_printf("%s", _(mail_account_pages[type].head)); - gtk_label_set_markup ((GtkLabel *)tmp, str); + gtk_label_set_markup ((GtkLabel *) tmp, str); g_free (str); gtk_widget_show (tmp); - gtk_box_pack_start ((GtkBox *)box, tmp, FALSE, FALSE, 12); + gtk_box_pack_start ((GtkBox *) box, tmp, FALSE, FALSE, 12); box = gtk_hbox_new (FALSE, 12); gtk_widget_show (box); - gtk_box_pack_start ((GtkBox *)page->box, box, FALSE, FALSE, 12); + gtk_box_pack_start ((GtkBox *) page->box, box, FALSE, FALSE, 12); tmp = gtk_label_new (_(mail_account_pages[type].detail)); gtk_widget_set_size_request (tmp, 600, -1); - gtk_label_set_line_wrap ((GtkLabel *)tmp, TRUE); - gtk_label_set_line_wrap_mode ((GtkLabel *)tmp, PANGO_WRAP_WORD); + gtk_label_set_line_wrap ((GtkLabel *) tmp, TRUE); + gtk_label_set_line_wrap_mode ((GtkLabel *) tmp, PANGO_WRAP_WORD); gtk_widget_show (tmp); - gtk_box_pack_start ((GtkBox *)box, tmp, FALSE, FALSE, 12); + gtk_box_pack_start ((GtkBox *) box, tmp, FALSE, FALSE, 12); page->main = NULL; if (mail_account_pages[type].create_page && mail_account_pages[type].path) { tmp = (*mail_account_pages[type].create_page) (view); - gtk_box_pack_start ((GtkBox *)page->box, tmp, FALSE, FALSE, 3); + gtk_box_pack_start ((GtkBox *) page->box, tmp, FALSE, FALSE, 3); page->main = gtk_hbox_new (FALSE, 0); gtk_widget_show (page->main); - gtk_box_pack_start ((GtkBox *)page->main, tmp, FALSE, FALSE, 0); + gtk_box_pack_start ((GtkBox *) page->main, tmp, FALSE, FALSE, 0); } if (mail_account_pages[type].fill_page) { @@ -903,12 +903,12 @@ mav_construct_page (MailAccountView *view, MAVPageType type) box = gtk_hbox_new (FALSE, 0); if (FALSE) { tmp = gtk_image_new_from_icon_name ("go-previous", GTK_ICON_SIZE_BUTTON); - gtk_box_pack_start ((GtkBox *)box, tmp, FALSE, FALSE, 0); + gtk_box_pack_start ((GtkBox *) box, tmp, FALSE, FALSE, 0); } tmp = gtk_label_new (_(view->original ? mail_account_pages[type].prev_edit : mail_account_pages[type].prev)); - gtk_box_pack_start ((GtkBox *)box, tmp, FALSE, FALSE, 3); + gtk_box_pack_start ((GtkBox *) box, tmp, FALSE, FALSE, 3); page->prev = gtk_button_new (); - gtk_container_add ((GtkContainer *)page->prev, box); + gtk_container_add ((GtkContainer *) page->prev, box); gtk_widget_show_all (page->prev); g_signal_connect(page->prev, "clicked", G_CALLBACK(mav_prev_pressed), view); } @@ -916,30 +916,30 @@ mav_construct_page (MailAccountView *view, MAVPageType type) if ((view->original && mail_account_pages[type].next_edit) || mail_account_pages[type].next) { box = gtk_hbox_new (FALSE, 0); tmp = gtk_label_new (_(view->original ? mail_account_pages[type].next_edit : mail_account_pages[type].next)); - gtk_box_pack_start ((GtkBox *)box, tmp, FALSE, FALSE, 3); + gtk_box_pack_start ((GtkBox *) box, tmp, FALSE, FALSE, 3); if (FALSE) { tmp = gtk_image_new_from_icon_name ("go-next", GTK_ICON_SIZE_BUTTON); - gtk_box_pack_start ((GtkBox *)box, tmp, FALSE, FALSE, 0); + gtk_box_pack_start ((GtkBox *) box, tmp, FALSE, FALSE, 0); } page->next = gtk_button_new (); gtk_widget_set_can_default (page->next, TRUE); g_signal_connect (page->next, "hierarchy-changed", G_CALLBACK (gtk_widget_grab_default), NULL); - gtk_container_add ((GtkContainer *)page->next, box); + gtk_container_add ((GtkContainer *) page->next, box); gtk_widget_show_all (page->next); g_signal_connect(page->next, "clicked", G_CALLBACK(mav_next_pressed), view); } box = gtk_hbox_new (FALSE, 0); if (page->prev) - gtk_box_pack_start ((GtkBox *)box, page->prev, FALSE, FALSE, 12); + gtk_box_pack_start ((GtkBox *) box, page->prev, FALSE, FALSE, 12); if (page->next) - gtk_box_pack_end ((GtkBox *)box, page->next, FALSE, FALSE, 12); + gtk_box_pack_end ((GtkBox *) box, page->next, FALSE, FALSE, 12); gtk_widget_show (box); - gtk_box_pack_end ((GtkBox *)page->box, box, FALSE, FALSE, 6); + gtk_box_pack_end ((GtkBox *) page->box, box, FALSE, FALSE, 6); gtk_widget_show (page->box); - gtk_box_pack_end ((GtkBox *)page->box, error_box, FALSE, FALSE, 2); - return (GtkWidget *)page; + gtk_box_pack_end ((GtkBox *) page->box, error_box, FALSE, FALSE, 2); + return (GtkWidget *) page; } static ServerData * @@ -951,13 +951,13 @@ emae_check_servers (const gchar *email) gchar *tmp; /* FIXME: Find a way to free the provider once given to account settings. */ - provider->email = (gchar *)email; + provider->email = (gchar *) email; tmp = strchr (email, '@'); tmp++; provider->domain = tmp; tmp = strchr (dupe, '@'); *tmp = 0; - provider->username = (gchar *)g_quark_to_string (g_quark_from_string (dupe)); + provider->username = (gchar *) g_quark_to_string (g_quark_from_string (dupe)); g_free (dupe); if (!mail_guess_servers (provider)) { @@ -1041,22 +1041,22 @@ mail_account_view_construct (MailAccountView *view, EShell *shell; view->scroll = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy ((GtkScrolledWindow *)view->scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *)view->scroll, GTK_SHADOW_NONE); + gtk_scrolled_window_set_policy ((GtkScrolledWindow *) view->scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *) view->scroll, GTK_SHADOW_NONE); view->page_widget = gtk_vbox_new (FALSE, 3); - gtk_scrolled_window_add_with_viewport ((GtkScrolledWindow *)view->scroll, view->page_widget); + gtk_scrolled_window_add_with_viewport ((GtkScrolledWindow *) view->scroll, view->page_widget); gtk_widget_show_all (view->scroll); - gtk_widget_set_size_request ((GtkWidget *)view, -1, 300); + gtk_widget_set_size_request ((GtkWidget *) view, -1, 300); for (i=0; ipages[i] = (MAVPage *)mav_construct_page (view, i); + view->pages[i] = (MAVPage *) mav_construct_page (view, i); view->pages[i]->done = FALSE; view->wpages[i] = view->pages[i]->box; - gtk_box_pack_start ((GtkBox *)view->page_widget, view->pages[i]->box, TRUE, TRUE, 0); + gtk_box_pack_start ((GtkBox *) view->page_widget, view->pages[i]->box, TRUE, TRUE, 0); gtk_widget_hide (view->pages[i]->box); } gtk_widget_show (view->pages[0]->box); view->current_page = 0; - gtk_box_pack_start ((GtkBox *)view, view->scroll, TRUE, TRUE, 0); + gtk_box_pack_start ((GtkBox *) view, view->scroll, TRUE, TRUE, 0); view->edit = em_account_editor_new_for_pages ( view->original, EMAE_PAGES, session, "org.gnome.evolution.mail.config.accountWizard", view->wpages); @@ -1078,13 +1078,13 @@ mail_account_view_construct (MailAccountView *view, if (!view->original) { label = gtk_label_new (_("Password:")); pwd = gtk_entry_new (); - gtk_entry_set_visibility ((GtkEntry *)pwd, FALSE); + gtk_entry_set_visibility ((GtkEntry *) pwd, FALSE); /* gtk_entry_set_activates_default ((GtkEntry *)pwd, TRUE); */ g_signal_connect (pwd, "activate", G_CALLBACK (next_page), view); gtk_widget_show (label); gtk_widget_show (pwd); - gtk_table_attach ((GtkTable *)table, label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); - gtk_table_attach ((GtkTable *)table, pwd, 1, 2, 2, 3, GTK_FILL|GTK_EXPAND, 0, 0, 0); + gtk_table_attach ((GtkTable *) table, label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); + gtk_table_attach ((GtkTable *) table, pwd, 1, 2, 2, 3, GTK_FILL|GTK_EXPAND, 0, 0, 0); view->password = pwd; } @@ -1122,25 +1122,25 @@ mail_account_view_get_tab_widget (MailAccountView *mcv) gint w=-1, h=-1; GtkWidget *tab_label; - img = (GtkWidget *)gtk_image_new_from_pixbuf (pbuf); + img = (GtkWidget *) gtk_image_new_from_pixbuf (pbuf); tool = gtk_button_new (); - gtk_button_set_relief ((GtkButton *)tool, GTK_RELIEF_NONE); - gtk_button_set_focus_on_click ((GtkButton *)tool, FALSE); + gtk_button_set_relief ((GtkButton *) tool, GTK_RELIEF_NONE); + gtk_button_set_focus_on_click ((GtkButton *) tool, FALSE); gtk_widget_set_tooltip_text (tool, _("Close Tab")); g_signal_connect (tool, "clicked", G_CALLBACK(mav_close), mcv); box = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start ((GtkBox *)box, img, FALSE, FALSE, 0); - gtk_container_add ((GtkContainer *)tool, box); + gtk_box_pack_start ((GtkBox *) box, img, FALSE, FALSE, 0); + gtk_container_add ((GtkContainer *) tool, box); gtk_widget_show_all (tool); gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (tool) , GTK_ICON_SIZE_MENU, &w, &h); gtk_widget_set_size_request (tool, w+2, h+2); box = gtk_label_new (_("Account Wizard")); tab_label = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start ((GtkBox *)tab_label, box, FALSE, FALSE, 2); - gtk_box_pack_start ((GtkBox *)tab_label, tool, FALSE, FALSE, 0); + gtk_box_pack_start ((GtkBox *) tab_label, box, FALSE, FALSE, 2); + gtk_box_pack_start ((GtkBox *) tab_label, tool, FALSE, FALSE, 0); gtk_widget_show_all (tab_label); return tab_label; diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index cb5c7ec0e4..fecc0a67ad 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -104,7 +104,7 @@ mail_capplet_shell_finalize (GObject *object) static void ms_ctrl_w_pressed (MailCappletShell *shell) { - mail_view_close_view ((MailView *)shell->view); + mail_view_close_view ((MailView *) shell->view); } static void @@ -177,7 +177,7 @@ mail_capplet_shell_quit (MailCappletShell *shell) if (priv->main_loop) gtk_main_quit (); else - gtk_widget_hide ((GtkWidget *)shell); + gtk_widget_hide ((GtkWidget *) shell); } static void @@ -208,28 +208,28 @@ mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean gtk_window_set_title ((GtkWindow *)shell, _("Evolution account assistant")); ms_init_style (style); g_signal_connect ((GObject *)shell, "delete-event", G_CALLBACK (ms_delete_event), NULL); - gtk_window_set_type_hint ((GtkWindow *)shell, GDK_WINDOW_TYPE_HINT_NORMAL); + gtk_window_set_type_hint ((GtkWindow *) shell, GDK_WINDOW_TYPE_HINT_NORMAL); if (g_getenv("ANJAL_NO_MAX") == NULL && FALSE) { - GdkScreen *scr = gtk_widget_get_screen ((GtkWidget *)shell); - gtk_window_set_default_size ((GtkWindow *)shell, gdk_screen_get_width (scr), gdk_screen_get_height (scr)); - gtk_window_set_decorated ((GtkWindow *)shell, FALSE); + GdkScreen *scr = gtk_widget_get_screen ((GtkWidget *) shell); + gtk_window_set_default_size ((GtkWindow *) shell, gdk_screen_get_width (scr), gdk_screen_get_height (scr)); + gtk_window_set_decorated ((GtkWindow *) shell, FALSE); } else { - gtk_window_set_default_size ((GtkWindow *)shell, 1024, 500); + gtk_window_set_default_size ((GtkWindow *) shell, 1024, 500); } priv->main_loop = main_loop; priv->box = (GtkWidget *) gtk_vbox_new (FALSE, 0); - gtk_widget_show ((GtkWidget *)priv->box); + gtk_widget_show ((GtkWidget *) priv->box); if (!socket_id) { - gtk_container_add ((GtkContainer *)shell, priv->box); + gtk_container_add ((GtkContainer *) shell, priv->box); } else { GtkWidget *plug = gtk_plug_new (socket_id); - gtk_container_add ((GtkContainer *)plug, priv->box); + gtk_container_add ((GtkContainer *) plug, priv->box); g_signal_connect (plug, "destroy", G_CALLBACK (gtk_main_quit), NULL); gtk_widget_show (plug); - gtk_widget_hide ((GtkWidget *)shell); + gtk_widget_hide ((GtkWidget *) shell); } @@ -242,8 +242,8 @@ mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean shell->view = mail_view_new (); shell->view->session = shell->priv->session; - gtk_widget_show ((GtkWidget *)shell->view); - gtk_box_pack_end ((GtkBox *)priv->box, (GtkWidget *)shell->view, TRUE, TRUE, 2); + gtk_widget_show ((GtkWidget *) shell->view); + gtk_box_pack_end ((GtkBox *) priv->box, (GtkWidget *) shell->view, TRUE, TRUE, 2); mail_config_init (shell->priv->session); mail_msg_init (); @@ -254,12 +254,12 @@ mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean if (just_druid) { MailViewChild *mc; - gtk_notebook_set_show_tabs ((GtkNotebook *)shell->view, FALSE); - mc = mail_view_add_page ((MailView *)shell->view, MAIL_VIEW_ACCOUNT, NULL); + gtk_notebook_set_show_tabs ((GtkNotebook *) shell->view, FALSE); + mc = mail_view_add_page ((MailView *) shell->view, MAIL_VIEW_ACCOUNT, NULL); g_signal_connect (mc, "view-close", G_CALLBACK(ms_show_post_druid), shell); setup_abooks (); } else - shell->priv->settings_view = mail_view_add_page ((MailView *)shell->view, MAIL_VIEW_SETTINGS, NULL); + shell->priv->settings_view = mail_view_add_page ((MailView *) shell->view, MAIL_VIEW_SETTINGS, NULL); } diff --git a/capplet/settings/mail-settings-view.c b/capplet/settings/mail-settings-view.c index 596e7222a1..01a984d4ba 100644 --- a/capplet/settings/mail-settings-view.c +++ b/capplet/settings/mail-settings-view.c @@ -138,7 +138,7 @@ build_account_button (MailSettingsView *acview, EAccount *account) if (FALSE) { tlabel = (GtkWidget *)gtk_image_new_from_stock (account ? "gtk-edit" : "gtk-new", GTK_ICON_SIZE_BUTTON); gtk_widget_show (tlabel); - gtk_box_pack_start ((GtkBox *)tbox, tlabel, FALSE, FALSE, 6); + gtk_box_pack_start ((GtkBox *) tbox, tlabel, FALSE, FALSE, 6); } if (account) @@ -149,17 +149,17 @@ build_account_button (MailSettingsView *acview, EAccount *account) if (account) g_free (tmp); gtk_widget_show (tlabel); - gtk_box_pack_start ((GtkBox *)tbox, tlabel, FALSE, FALSE, 0); + gtk_box_pack_start ((GtkBox *) tbox, tlabel, FALSE, FALSE, 0); gtk_widget_show (tbox); - gtk_container_add ((GtkContainer *)label, tbox); + gtk_container_add ((GtkContainer *) label, tbox); g_object_set_data ((GObject *)label, "account", account); g_signal_connect(label, "clicked", G_CALLBACK(msv_edit_account), acview); - gtk_box_pack_start ((GtkBox *)box1, label, FALSE, FALSE, 0); + gtk_box_pack_start ((GtkBox *) box1, label, FALSE, FALSE, 0); gtk_widget_show (label); if (account) { tlabel = gtk_button_new_from_stock ("gtk-delete"); - gtk_box_pack_start ((GtkBox *)box1, tlabel, FALSE, FALSE, 12); + gtk_box_pack_start ((GtkBox *) box1, tlabel, FALSE, FALSE, 12); gtk_widget_show (tlabel); g_object_set_data ((GObject *)tlabel, "account", account); g_signal_connect (tlabel, "clicked", G_CALLBACK(msv_delete_account), acview); @@ -177,11 +177,11 @@ msv_regen_view (MailSettingsView *acview) GtkWidget *box, *label; gchar *buff; - gtk_container_foreach ((GtkContainer *)acview->priv->box, (GtkCallback)gtk_widget_destroy, NULL); + gtk_container_foreach ((GtkContainer *) acview->priv->box, (GtkCallback) gtk_widget_destroy, NULL); label = gtk_label_new (NULL); buff = g_markup_printf_escaped ("%s", _("Account management")); - gtk_label_set_markup ((GtkLabel *)label, buff); + gtk_label_set_markup ((GtkLabel *) label, buff); g_free (buff); PACK_BOX (label,12); @@ -200,16 +200,16 @@ mail_settings_view_construct (MailSettingsView *acview) { acview->priv->scroll = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (acview->priv->scroll); - gtk_container_add ((GtkContainer *)acview, acview->priv->scroll); - gtk_scrolled_window_set_policy ((GtkScrolledWindow *)acview->priv->scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_container_add ((GtkContainer *) acview, acview->priv->scroll); + gtk_scrolled_window_set_policy ((GtkScrolledWindow *) acview->priv->scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); acview->priv->box = gtk_vbox_new (FALSE, 0); gtk_widget_show (acview->priv->box); - gtk_scrolled_window_add_with_viewport ((GtkScrolledWindow *)acview->priv->scroll, acview->priv->box); + gtk_scrolled_window_add_with_viewport ((GtkScrolledWindow *) acview->priv->scroll, acview->priv->box); acview->priv->accounts = e_get_account_list (); g_signal_connect (acview->priv->accounts, "account-added", G_CALLBACK(msv_account_added), acview); msv_regen_view (acview); - gtk_widget_show ((GtkWidget *)acview); + gtk_widget_show ((GtkWidget *) acview); } @@ -243,23 +243,23 @@ mail_settings_view_get_tab_widget (MailSettingsView *mcv) img = gtk_image_new_from_pixbuf (pbuf); tool = gtk_button_new (); - gtk_button_set_relief ((GtkButton *)tool, GTK_RELIEF_NONE); - gtk_button_set_focus_on_click ((GtkButton *)tool, FALSE); + gtk_button_set_relief ((GtkButton *) tool, GTK_RELIEF_NONE); + gtk_button_set_focus_on_click ((GtkButton *) tool, FALSE); gtk_widget_set_tooltip_text (tool, _("Close Tab")); g_signal_connect (tool, "clicked", G_CALLBACK(msv_close), mcv); box = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start ((GtkBox *)box, img, FALSE, FALSE, 0); - gtk_container_add ((GtkContainer *)tool, box); + gtk_box_pack_start ((GtkBox *) box, img, FALSE, FALSE, 0); + gtk_container_add ((GtkContainer *) tool, box); gtk_widget_show_all (tool); gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (tool) , GTK_ICON_SIZE_MENU, &w, &h); gtk_widget_set_size_request (tool, w+2, h+2); box = gtk_label_new (_("Settings")); tab_label = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start ((GtkBox *)tab_label, box, FALSE, FALSE, 2); + gtk_box_pack_start ((GtkBox *) tab_label, box, FALSE, FALSE, 2); #ifndef ANJAL_SETTINGS - gtk_box_pack_start ((GtkBox *)tab_label, tool, FALSE, FALSE, 0); + gtk_box_pack_start ((GtkBox *) tab_label, tool, FALSE, FALSE, 0); #endif gtk_widget_show_all (tab_label); diff --git a/capplet/settings/mail-view.c b/capplet/settings/mail-view.c index 4c7c9ddd05..71fdf07dc3 100644 --- a/capplet/settings/mail-view.c +++ b/capplet/settings/mail-view.c @@ -84,7 +84,7 @@ mail_view_init (MailView *shell) static void mail_view_finalize (GObject *object) { - MailView *shell = (MailView *)object; + MailView *shell = (MailView *) object; MailViewPrivate *priv = shell->priv; g_list_free (priv->children); @@ -97,20 +97,20 @@ static void mv_set_folder_uri (AnjalMailView *mv, const gchar *uri) { #ifndef ANJAL_SETTINGS - mail_view_set_folder_uri ((MailView *)mv, uri); + mail_view_set_folder_uri ((MailView *) mv, uri); #endif } static void set_folder_tree (AnjalMailView *mv, EMFolderTree *tree) { - mail_view_set_folder_tree ((MailView *)mv, (GtkWidget *)tree); + mail_view_set_folder_tree ((MailView *) mv, (GtkWidget *) tree); } static void set_search (AnjalMailView *mv, const gchar *search) { #ifndef ANJAL_SETTINGS - mail_view_set_search ((MailView *)mv, search); + mail_view_set_search ((MailView *) mv, search); #endif } @@ -128,9 +128,9 @@ mail_view_class_init (MailViewClass *klass) G_TYPE_NONE, 0); mail_view_parent_class = g_type_class_peek_parent (klass); - ((AnjalMailViewClass *)klass)->set_folder_uri = mv_set_folder_uri; - ((AnjalMailViewClass *)klass)->set_folder_tree = set_folder_tree; - ((AnjalMailViewClass *)klass)->set_search = set_search; + ((AnjalMailViewClass *) klass)->set_folder_uri = mv_set_folder_uri; + ((AnjalMailViewClass *) klass)->set_folder_tree = set_folder_tree; + ((AnjalMailViewClass *) klass)->set_search = set_search; object_class->finalize = mail_view_finalize; @@ -139,7 +139,7 @@ mail_view_class_init (MailViewClass *klass) static void mv_switch (GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer user_data) { - MailView *shell = (MailView *)notebook; + MailView *shell = (MailView *) notebook; MailViewPrivate *priv = shell->priv; MailViewChild *curr = priv->current_view; MailViewChild *child; @@ -147,37 +147,37 @@ mv_switch (GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer user curr->flags &= ~MAIL_VIEW_HOLD_FOCUS; - child = (MailViewChild *)gtk_notebook_get_nth_page (notebook, current_child); + child = (MailViewChild *) gtk_notebook_get_nth_page (notebook, current_child); priv->current_view = child; REALIGN_NODES (shell->priv->children,child); #ifndef ANJAL_SETTINGS if (child->type == MAIL_VIEW_COMPOSER) - mail_composer_view_activate ((MailComposerView *)child, shell->folder_tree, shell->check_mail, shell->sort_by, TRUE); + mail_composer_view_activate ((MailComposerView *) child, shell->folder_tree, shell->check_mail, shell->sort_by, TRUE); else if (child->type == MAIL_VIEW_MESSAGE) - mail_conv_view_activate ((MailConvView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE); + mail_conv_view_activate ((MailConvView *) child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE); else if (child->type == MAIL_VIEW_FOLDER) { - mail_folder_view_activate ((MailFolderView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, TRUE); + mail_folder_view_activate ((MailFolderView *) child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, TRUE); anjal_shell_view_restore_state (shell->shell_view, child->uri); } else if (child->type == MAIL_VIEW_ACCOUNT) - mail_account_view_activate ((MailAccountView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE); + mail_account_view_activate ((MailAccountView *) child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE); else if (child->type == MAIL_VIEW_SETTINGS) - mail_settings_view_activate ((MailSettingsView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, FALSE); + mail_settings_view_activate ((MailSettingsView *) child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, FALSE); #else if (child->type == MAIL_VIEW_ACCOUNT) - mail_account_view_activate ((MailAccountView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE); + mail_account_view_activate ((MailAccountView *) child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE); else if (child->type == MAIL_VIEW_SETTINGS) - mail_settings_view_activate ((MailSettingsView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, FALSE); + mail_settings_view_activate ((MailSettingsView *) child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, FALSE); #endif } static void mail_view_construct (MailView *shell) { - gtk_notebook_set_show_tabs ((GtkNotebook *)shell, TRUE); - gtk_notebook_set_scrollable ((GtkNotebook *)shell, TRUE); - gtk_notebook_popup_disable ((GtkNotebook *)shell); + gtk_notebook_set_show_tabs ((GtkNotebook *) shell, TRUE); + gtk_notebook_set_scrollable ((GtkNotebook *) shell, TRUE); + gtk_notebook_popup_disable ((GtkNotebook *) shell); g_signal_connect_after (shell, "switch-page", G_CALLBACK(mv_switch), shell); } @@ -207,8 +207,8 @@ mv_get_page_number (GtkNotebook *note, GtkWidget *widget) static void mv_close_mcv (MailViewChild *mfv, MailView *mv) { - gint n = mv_get_page_number ((GtkNotebook *)mv, (GtkWidget *)mfv); - gint pos = gtk_notebook_get_current_page ((GtkNotebook *)mv); + gint n = mv_get_page_number ((GtkNotebook *) mv, (GtkWidget *) mfv); + gint pos = gtk_notebook_get_current_page ((GtkNotebook *) mv); MailViewChild *child; gboolean removing_viewed = FALSE; @@ -222,7 +222,7 @@ mv_close_mcv (MailViewChild *mfv, MailView *mv) gboolean found = FALSE; while (!found && tmp) { - MailViewChild *tchild = (MailViewChild *)tmp->data; + MailViewChild *tchild = (MailViewChild *) tmp->data; if (tchild && tchild != mfv && tchild->type == MAIL_VIEW_FOLDER) found = true; @@ -234,13 +234,13 @@ mv_close_mcv (MailViewChild *mfv, MailView *mv) } if (mfv->type == MAIL_VIEW_COMPOSER) { - if (!mail_composer_view_can_quit ((MailComposerView *)mfv)) + if (!mail_composer_view_can_quit ((MailComposerView *) mfv)) return; } #endif g_signal_handlers_block_by_func (mv, mv_switch, mv); - gtk_notebook_remove_page ((GtkNotebook *)mv, n); + gtk_notebook_remove_page ((GtkNotebook *) mv, n); g_signal_handlers_unblock_by_func (mv, mv_switch, mv); if (mfv == mv->priv->children->data) @@ -250,28 +250,28 @@ mv_close_mcv (MailViewChild *mfv, MailView *mv) if (!removing_viewed) return; - child = (MailViewChild *)mv->priv->children->data; + child = (MailViewChild *) mv->priv->children->data; mv->priv->current_view = child; - pos = mv_get_page_number ((GtkNotebook *)mv, (GtkWidget *)child); - gtk_notebook_set_current_page ((GtkNotebook *)mv, pos); + pos = mv_get_page_number ((GtkNotebook *) mv, (GtkWidget *) child); + gtk_notebook_set_current_page ((GtkNotebook *) mv, pos); #ifndef ANJAL_SETTINGS if (child->type == MAIL_VIEW_COMPOSER) - mail_composer_view_activate ((MailComposerView *)child, mv->folder_tree, mv->check_mail, mv->sort_by, TRUE); + mail_composer_view_activate ((MailComposerView *) child, mv->folder_tree, mv->check_mail, mv->sort_by, TRUE); else if (child->type == MAIL_VIEW_MESSAGE) - mail_conv_view_activate ((MailConvView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE); + mail_conv_view_activate ((MailConvView *) child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE); else if (child->type == MAIL_VIEW_FOLDER) { - mail_folder_view_activate ((MailFolderView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, TRUE); - anjal_shell_view_restore_state ((EShellView *)mv->shell_view, child->uri); + mail_folder_view_activate ((MailFolderView *) child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, TRUE); + anjal_shell_view_restore_state ((EShellView *) mv->shell_view, child->uri); } else if (child->type == MAIL_VIEW_ACCOUNT) - mail_account_view_activate ((MailAccountView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE); + mail_account_view_activate ((MailAccountView *) child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE); else if (child->type == MAIL_VIEW_SETTINGS) - mail_settings_view_activate ((MailSettingsView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE); + mail_settings_view_activate ((MailSettingsView *) child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE); #else if (child->type == MAIL_VIEW_ACCOUNT) - mail_account_view_activate ((MailAccountView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE); + mail_account_view_activate ((MailAccountView *) child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE); else if (child->type == MAIL_VIEW_SETTINGS) - mail_settings_view_activate ((MailSettingsView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE); + mail_settings_view_activate ((MailSettingsView *) child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE); #endif } @@ -280,7 +280,7 @@ mv_close_mcv (MailViewChild *mfv, MailView *mv) static void mv_message_new (MailFolderView *mfv, gpointer data, gchar *umid, MailView *mv) { - MailConvView *conv = (MailConvView *)mv_switch_message_view (mv, umid); + MailConvView *conv = (MailConvView *) mv_switch_message_view (mv, umid); *(MailConvView **)data = conv; if (conv) @@ -292,7 +292,7 @@ mv_message_new (MailFolderView *mfv, gpointer data, gchar *umid, MailView *mv) static void mv_search_set (MailFolderView *mfv, MailView *mv) { - anjal_shell_view_restore_state (mv->shell_view, ((MailViewChild *)mfv)->uri); + anjal_shell_view_restore_state (mv->shell_view, ((MailViewChild *) mfv)->uri); } static void @@ -309,15 +309,15 @@ mail_view_add_folder (MailView *mv, gpointer data, gboolean block) gint position = 0; mail_folder_view_set_folder_pane (mfv, mv->folder_tree); if (!block) - mv->priv->current_view = (MailViewChild *)mfv; + mv->priv->current_view = (MailViewChild *) mfv; mv->priv->children = block ? g_list_append (mv->priv->children, mfv) : g_list_prepend (mv->priv->children, mfv); - position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)mfv, mfv->tab_label); - gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)mfv, TRUE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mfv, FALSE); + position = gtk_notebook_append_page ((GtkNotebook *) mv, (GtkWidget *) mfv, mfv->tab_label); + gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *) mfv, TRUE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *) mfv, FALSE); g_signal_connect (mfv, "view-close", G_CALLBACK(mv_close_mcv), mv); if (!block) - gtk_notebook_set_current_page ((GtkNotebook *)mv, position); + gtk_notebook_set_current_page ((GtkNotebook *) mv, position); g_signal_connect (mfv, "message-shown", G_CALLBACK(mv_message_shown), mv); g_signal_connect (mfv, "message-new", G_CALLBACK(mv_message_new), mv); g_signal_connect (mfv, "search-set", G_CALLBACK(mv_search_set), mv); @@ -325,7 +325,7 @@ mail_view_add_folder (MailView *mv, gpointer data, gboolean block) if (!block) mail_folder_view_activate (mfv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, TRUE); - return (MailViewChild *)mfv; + return (MailViewChild *) mfv; } static MailViewChild * @@ -341,29 +341,29 @@ mail_view_add_composer (MailView *mv, gpointer data, gboolean block) special = TRUE; data = NULL; } else - mcv = mail_composer_view_new_with_composer ((GtkWidget *)data); + mcv = mail_composer_view_new_with_composer ((GtkWidget *) data); if (!block) - mv->priv->current_view = (MailViewChild *)mcv; + mv->priv->current_view = (MailViewChild *) mcv; mv->priv->children = block ? g_list_append (mv->priv->children, mcv) : g_list_prepend (mv->priv->children, mcv); if (!special) - position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)mcv, mcv->tab_label); + position = gtk_notebook_append_page ((GtkNotebook *) mv, (GtkWidget *) mcv, mcv->tab_label); else { - gint position = gtk_notebook_get_current_page ((GtkNotebook *)mv); - gtk_notebook_insert_page ((GtkNotebook *)mv, (GtkWidget *)mcv, mcv->tab_label, position+1); + gint position = gtk_notebook_get_current_page ((GtkNotebook *) mv); + gtk_notebook_insert_page ((GtkNotebook *) mv, (GtkWidget *) mcv, mcv->tab_label, position+1); } - gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, TRUE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, FALSE); + gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *) mcv, TRUE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *) mcv, FALSE); if (!block) - gtk_notebook_set_current_page ((GtkNotebook *)mv, position); + gtk_notebook_set_current_page ((GtkNotebook *) mv, position); if (!block) mail_composer_view_activate (mcv, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE); g_signal_connect (mcv, "view-close", G_CALLBACK(mv_close_mcv), mv); g_signal_connect (mcv, "message-shown", G_CALLBACK(mv_message_shown), mv); - return (MailViewChild *)mcv; + return (MailViewChild *) mcv; } static MailViewChild * @@ -372,25 +372,25 @@ mail_view_add_message (MailView *mv, gpointer data, gboolean block) MailConvView *mcv = mail_conv_view_new (); gint position = 0; - gtk_widget_show ((GtkWidget *)mcv); + gtk_widget_show ((GtkWidget *) mcv); mcv->type = MAIL_VIEW_MESSAGE; if (!block) - mv->priv->current_view = (MailViewChild *)mcv; + mv->priv->current_view = (MailViewChild *) mcv; mv->priv->children = block ? g_list_append (mv->priv->children, mcv) : g_list_prepend (mv->priv->children, mcv); - position = gtk_notebook_get_current_page ((GtkNotebook *)mv); - gtk_notebook_insert_page ((GtkNotebook *)mv, (GtkWidget *)mcv, mail_conv_view_get_tab_widget (mcv), position+1); - gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, TRUE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, FALSE); + position = gtk_notebook_get_current_page ((GtkNotebook *) mv); + gtk_notebook_insert_page ((GtkNotebook *) mv, (GtkWidget *) mcv, mail_conv_view_get_tab_widget (mcv), position+1); + gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *) mcv, TRUE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *) mcv, FALSE); if (!block) - gtk_notebook_set_current_page ((GtkNotebook *)mv, position+1); + gtk_notebook_set_current_page ((GtkNotebook *) mv, position+1); if (!block) mail_conv_view_activate (mcv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE); g_signal_connect (mcv, "view-close", G_CALLBACK(mv_close_mcv), mv); g_signal_connect (mcv, "message-shown", G_CALLBACK(mv_message_shown), mv); - return (MailViewChild *)mcv; + return (MailViewChild *) mcv; } #endif @@ -407,22 +407,22 @@ mail_view_add_settings (MailView *mv, gpointer data, gboolean block) MailSettingsView *msv = mail_settings_view_new (); gint position = 0; - gtk_widget_show ((GtkWidget *)msv); + gtk_widget_show ((GtkWidget *) msv); if (!block) - mv->priv->current_view = (MailViewChild *)msv; + mv->priv->current_view = (MailViewChild *) msv; mv->priv->children = block ? g_list_append (mv->priv->children, msv) : g_list_prepend (mv->priv->children, msv); - position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)msv, mail_settings_view_get_tab_widget (msv)); + position = gtk_notebook_append_page ((GtkNotebook *) mv, (GtkWidget *) msv, mail_settings_view_get_tab_widget (msv)); g_signal_connect (msv, "view-close", G_CALLBACK(mv_close_mcv), mv); g_signal_connect (msv, "show-account", G_CALLBACK(mv_show_acc_mcv), mv); - gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, TRUE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, FALSE); + gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *) msv, TRUE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *) msv, FALSE); if (!block) - gtk_notebook_set_current_page ((GtkNotebook *)mv, position); + gtk_notebook_set_current_page ((GtkNotebook *) mv, position); if (!block) mail_settings_view_activate (msv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE); - return (MailViewChild *)msv; + return (MailViewChild *) msv; } static MailViewChild * @@ -434,20 +434,20 @@ mail_view_add_account (MailView *mv, gint position = 0; msv = mail_account_view_new (data, mv->session); - gtk_widget_show ((GtkWidget *)msv); + gtk_widget_show ((GtkWidget *) msv); if (!block) - mv->priv->current_view = (MailViewChild *)msv; + mv->priv->current_view = (MailViewChild *) msv; mv->priv->children = block ? g_list_append (mv->priv->children, msv) : g_list_prepend (mv->priv->children, msv); - position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)msv, mail_account_view_get_tab_widget (msv)); + position = gtk_notebook_append_page ((GtkNotebook *) mv, (GtkWidget *) msv, mail_account_view_get_tab_widget (msv)); g_signal_connect_after (msv, "view-close", G_CALLBACK(mv_close_mcv), mv); - gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, TRUE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, FALSE); + gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *) msv, TRUE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *) msv, FALSE); if (!block) - gtk_notebook_set_current_page ((GtkNotebook *)mv, position); + gtk_notebook_set_current_page ((GtkNotebook *) mv, position); if (!block) mail_account_view_activate (msv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE); - return (MailViewChild *)msv; + return (MailViewChild *) msv; } MailViewChild * @@ -481,7 +481,7 @@ mail_view_add_page (MailView *mv, guint16 type, gpointer data) child = mail_view_add_account (mv, data, block); break; } - gtk_widget_grab_focus ((GtkWidget *)child); + gtk_widget_grab_focus ((GtkWidget *) child); child->type = type; g_signal_handlers_unblock_by_func (mv, mv_switch, mv); @@ -497,11 +497,11 @@ mv_switch_folder_view (MailView *mv, const gchar *uri) gint i=0, len = g_list_length (mv->priv->children); GList *tmp = mv->priv->children; while (itype == MAIL_VIEW_FOLDER && !strcmp (uri, child->uri)) { if (child != mv->priv->current_view) { - gtk_notebook_set_current_page ((GtkNotebook *)mv, i); + gtk_notebook_set_current_page ((GtkNotebook *) mv, i); } return; } @@ -510,7 +510,7 @@ mv_switch_folder_view (MailView *mv, const gchar *uri) } mail_view_add_page (mv, MAIL_VIEW_FOLDER, NULL); - mail_folder_view_set_folder_uri ((MailFolderView *)mv->priv->current_view, uri); + mail_folder_view_set_folder_uri ((MailFolderView *) mv->priv->current_view, uri); } static MailConvView * @@ -521,8 +521,8 @@ mv_switch_message_view (MailView *mv, const gchar *uri) while (tmp) { MailViewChild *child = tmp->data; if (child->type == MAIL_VIEW_MESSAGE && !strcmp (uri, child->uri)) { - gtk_notebook_set_current_page ((GtkNotebook *)mv, i); - mail_conv_view_activate ((MailConvView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE); + gtk_notebook_set_current_page ((GtkNotebook *) mv, i); + mail_conv_view_activate ((MailConvView *) child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE); REALIGN_NODES (mv->priv->children,child); return NULL; } @@ -530,7 +530,7 @@ mv_switch_message_view (MailView *mv, const gchar *uri) tmp = tmp->next; } - return (MailConvView *)mail_view_add_page (mv, MAIL_VIEW_MESSAGE, NULL); + return (MailConvView *) mail_view_add_page (mv, MAIL_VIEW_MESSAGE, NULL); } void @@ -544,7 +544,7 @@ mail_view_set_folder_uri (MailView *mv, const gchar *uri) void mail_view_close_view (MailView *mv) { - MailViewChild *child = (MailViewChild *)mv->priv->current_view; + MailViewChild *child = (MailViewChild *) mv->priv->current_view; mv_close_mcv (child, mv); } @@ -559,19 +559,19 @@ mail_view_set_folder_tree (MailView *mv, GtkWidget *tree) static void mv_spinner_done (CamelFolder *f, gpointer data) { - MailView *mv = (MailView *)data; + MailView *mv = (MailView *) data; mv_spinner_show (mv, FALSE); } void mail_view_set_search (MailView *mv, const gchar *search) { - MailViewChild *child = (MailViewChild *)mv->priv->current_view; + MailViewChild *child = (MailViewChild *) mv->priv->current_view; if (child && child->type == MAIL_VIEW_FOLDER) { - MailFolderView *mfv = (MailFolderView *)child; + MailFolderView *mfv = (MailFolderView *) child; - mail_folder_view_set_search (mfv, search, e_shell_searchbar_get_search_text ((EShellSearchbar *)mv->priv->search_entry)); + mail_folder_view_set_search (mfv, search, e_shell_searchbar_get_search_text ((EShellSearchbar *) mv->priv->search_entry)); } } #endif -- cgit v1.2.3 From 5146ff4c535f443fe25290eb96631e91ad44c8ef Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 21 May 2011 10:02:58 -0400 Subject: Coding style and whitespace cleanup. --- capplet/settings/mail-guess-servers.c | 46 +++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 16 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c index 2d9197dc0c..307aeeec1c 100644 --- a/capplet/settings/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.c @@ -113,23 +113,30 @@ get_url (SoupSession *session, const gchar *url) } static void -handle_incoming (xmlNodePtr head, EmailProvider *provider) +handle_incoming (xmlNodePtr head, + EmailProvider *provider) { xmlNodePtr node = head->children; - provider->recv_type = xml_to_gchar(xmlGetProp(head, (xmlChar *) "type"), provider); + provider->recv_type = xml_to_gchar ( + xmlGetProp (head, (xmlChar *) "type"), provider); - while (node) { + while (node != NULL) { if (strcmp ((gchar *)node->name, "hostname") == 0) { - provider->recv_hostname = xml_to_gchar (xmlNodeGetContent (node), provider); + provider->recv_hostname = xml_to_gchar ( + xmlNodeGetContent (node), provider); } else if (strcmp ((gchar *)node->name, "port") == 0) { - provider->recv_port = xml_to_gchar (xmlNodeGetContent (node), provider); + provider->recv_port = xml_to_gchar ( + xmlNodeGetContent (node), provider); } else if (strcmp ((gchar *)node->name, "socketType") == 0) { - provider->recv_socket_type = xml_to_gchar (xmlNodeGetContent (node), provider); + provider->recv_socket_type = xml_to_gchar ( + xmlNodeGetContent (node), provider); } else if (strcmp ((gchar *)node->name, "username") == 0) { - provider->recv_username = xml_to_gchar (xmlNodeGetContent (node), provider); + provider->recv_username = xml_to_gchar ( + xmlNodeGetContent (node), provider); } else if (strcmp ((gchar *)node->name, "authentication") == 0) { - provider->recv_auth = xml_to_gchar (xmlNodeGetContent (node), provider); + provider->recv_auth = xml_to_gchar ( + xmlNodeGetContent (node), provider); } node = node->next; @@ -137,23 +144,30 @@ handle_incoming (xmlNodePtr head, EmailProvider *provider) } static void -handle_outgoing (xmlNodePtr head, EmailProvider *provider) +handle_outgoing (xmlNodePtr head, + EmailProvider *provider) { xmlNodePtr node = head->children; - provider->send_type = xml_to_gchar(xmlGetProp(head, (xmlChar *) "type"), provider); + provider->send_type = xml_to_gchar ( + xmlGetProp (head, (xmlChar *) "type"), provider); - while (node) { + while (node != NULL) { if (strcmp ((gchar *)node->name, "hostname") == 0) { - provider->send_hostname = xml_to_gchar (xmlNodeGetContent (node), provider); + provider->send_hostname = xml_to_gchar ( + xmlNodeGetContent (node), provider); } else if (strcmp ((gchar *)node->name, "port") == 0) { - provider->send_port = xml_to_gchar (xmlNodeGetContent (node), provider); + provider->send_port = xml_to_gchar ( + xmlNodeGetContent (node), provider); } else if (strcmp ((gchar *)node->name, "socketType") == 0) { - provider->send_socket_type = xml_to_gchar (xmlNodeGetContent (node), provider); + provider->send_socket_type = xml_to_gchar ( + xmlNodeGetContent (node), provider); } else if (strcmp ((gchar *)node->name, "username") == 0) { - provider->send_username = xml_to_gchar (xmlNodeGetContent (node), provider); + provider->send_username = xml_to_gchar ( + xmlNodeGetContent (node), provider); } else if (strcmp ((gchar *)node->name, "authentication") == 0) { - provider->send_auth = xml_to_gchar (xmlNodeGetContent (node), provider); + provider->send_auth = xml_to_gchar ( + xmlNodeGetContent (node), provider); } node = node->next; -- cgit v1.2.3 From 7050475f84247fb15e24aa1bb31502106c18815d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 23 May 2011 17:09:24 -0400 Subject: EMFolderTree: Store an EMailBackend instead of an EMailSession. All this so EMFolderTree can submit EActivity instances for async ops. You can obtain an EMailSession from an EMailBackend, but not vice versa. Creates lots of pretty ripples in the mail code, but ultimately reduces complexity. So it's a code cleanup of sorts. --- capplet/settings/mail-account-view.c | 10 +++++----- capplet/settings/mail-account-view.h | 2 +- capplet/settings/mail-capplet-shell.c | 12 +++++++----- capplet/settings/mail-view.c | 2 +- capplet/settings/mail-view.h | 4 ++-- 5 files changed, 16 insertions(+), 14 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index 128e541f91..128e0f1558 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -32,7 +32,7 @@ #include #include "mail-view.h" #include "e-util/e-config.h" -#include "mail/e-mail-session.h" +#include "mail/e-mail-backend.h" #include "mail-guess-servers.h" struct _MailAccountViewPrivate { @@ -1035,7 +1035,7 @@ next_page (GtkWidget *entry, MailAccountView *mav) static void mail_account_view_construct (MailAccountView *view, - EMailSession *session) + EMailBackend *backend) { gint i; EShell *shell; @@ -1058,7 +1058,7 @@ mail_account_view_construct (MailAccountView *view, view->current_page = 0; gtk_box_pack_start ((GtkBox *) view, view->scroll, TRUE, TRUE, 0); view->edit = em_account_editor_new_for_pages ( - view->original, EMAE_PAGES, session, + view->original, EMAE_PAGES, backend, "org.gnome.evolution.mail.config.accountWizard", view->wpages); gtk_widget_hide (e_config_create_widget (E_CONFIG (view->edit->config))); view->edit->emae_check_servers = emae_check_servers; @@ -1096,13 +1096,13 @@ mail_account_view_construct (MailAccountView *view, MailAccountView * mail_account_view_new (EAccount *account, - EMailSession *session) + EMailBackend *backend) { MailAccountView *view = g_object_new (MAIL_ACCOUNT_VIEW_TYPE, NULL); view->type = MAIL_VIEW_ACCOUNT; view->uri = "account://"; view->original = account; - mail_account_view_construct (view, session); + mail_account_view_construct (view, backend); return view; } diff --git a/capplet/settings/mail-account-view.h b/capplet/settings/mail-account-view.h index ac03b1a536..1b04533403 100644 --- a/capplet/settings/mail-account-view.h +++ b/capplet/settings/mail-account-view.h @@ -87,7 +87,7 @@ typedef struct _MailAccountViewClass { } MailAccountViewClass; GType mail_account_view_get_type (void); -MailAccountView *mail_account_view_new (EAccount *account, EMailSession *session); +MailAccountView *mail_account_view_new (EAccount *account, EMailBackend *backend); GtkWidget * mail_account_view_get_tab_widget (MailAccountView *mcv); void mail_account_view_activate (MailAccountView *mcv, GtkWidget *tree, GtkWidget *folder_tree, GtkWidget *check_mail, GtkWidget *sort_by, gboolean act); #endif diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index fecc0a67ad..2908531e57 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -66,7 +66,7 @@ static guint mail_capplet_shell_signals[LAST_SIGNAL]; struct _MailCappletShellPrivate { - EMailSession *session; + EMailBackend *backend; GtkWidget *box; GtkWidget * top_bar; @@ -202,6 +202,7 @@ mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean { MailCappletShellPrivate *priv = shell->priv; GtkStyle *style = gtk_widget_get_default_style (); + EMailSession *session; gchar *custom_dir; gtk_window_set_icon_name ((GtkWindow *)shell, "evolution"); @@ -238,17 +239,18 @@ mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean camel_provider_init (); - shell->priv->session = e_mail_session_new (); + shell->priv->backend = g_object_new (E_TYPE_MAIL_BACKEND, NULL); + session = e_mail_backend_get_session (shell->priv->backend); shell->view = mail_view_new (); - shell->view->session = shell->priv->session; + shell->view->backend = shell->priv->backend; gtk_widget_show ((GtkWidget *) shell->view); gtk_box_pack_end ((GtkBox *) priv->box, (GtkWidget *) shell->view, TRUE, TRUE, 2); - mail_config_init (shell->priv->session); + mail_config_init (session); mail_msg_init (); custom_dir = g_build_filename (e_get_user_data_dir (), "mail", NULL); - e_mail_store_init (shell->priv->session, custom_dir); + e_mail_store_init (session, custom_dir); g_free (custom_dir); if (just_druid) { diff --git a/capplet/settings/mail-view.c b/capplet/settings/mail-view.c index 71fdf07dc3..67a86d7872 100644 --- a/capplet/settings/mail-view.c +++ b/capplet/settings/mail-view.c @@ -433,7 +433,7 @@ mail_view_add_account (MailView *mv, MailAccountView *msv; gint position = 0; - msv = mail_account_view_new (data, mv->session); + msv = mail_account_view_new (data, mv->backend); gtk_widget_show ((GtkWidget *) msv); if (!block) mv->priv->current_view = (MailViewChild *) msv; diff --git a/capplet/settings/mail-view.h b/capplet/settings/mail-view.h index 558bb945a7..6f814fd81e 100644 --- a/capplet/settings/mail-view.h +++ b/capplet/settings/mail-view.h @@ -24,7 +24,7 @@ #define _MAIL_VIEW_H_ #include -#include +#include #include "anjal-mail-view.h" @@ -48,7 +48,7 @@ typedef struct _MailViewPrivate MailViewPrivate; typedef struct _MailView { AnjalMailView parent; - EMailSession *session; + EMailBackend *backend; GtkWidget *tree; /* Actual tree */ GtkWidget *folder_tree; GtkWidget *slider; -- cgit v1.2.3 From c24038c4f62f37b89d1bda9542ca5ccc843d4ea0 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 27 May 2011 15:23:07 +0200 Subject: Bug #646109 - Fix use of include to make sure translations work --- capplet/anjal-settings-main.c | 6 ++++-- capplet/settings/anjal-mail-view.c | 2 +- capplet/settings/mail-account-view.c | 2 +- capplet/settings/mail-capplet-shell.c | 2 +- capplet/settings/mail-settings-view.c | 2 +- capplet/settings/mail-view.c | 3 ++- 6 files changed, 10 insertions(+), 7 deletions(-) (limited to 'capplet') diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c index 07dbda2b20..5a03ec685c 100644 --- a/capplet/anjal-settings-main.c +++ b/capplet/anjal-settings-main.c @@ -22,6 +22,10 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -29,8 +33,6 @@ #include #include -#include - #include #include #include diff --git a/capplet/settings/anjal-mail-view.c b/capplet/settings/anjal-mail-view.c index 21a8f0a437..eb8a06e56d 100644 --- a/capplet/settings/anjal-mail-view.c +++ b/capplet/settings/anjal-mail-view.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include "anjal-mail-view.h" diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index 128e0f1558..eac32cc4b8 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index 2908531e57..a22bb88dcf 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include diff --git a/capplet/settings/mail-settings-view.c b/capplet/settings/mail-settings-view.c index 01a984d4ba..3ae2c6d30c 100644 --- a/capplet/settings/mail-settings-view.c +++ b/capplet/settings/mail-settings-view.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif #include diff --git a/capplet/settings/mail-view.c b/capplet/settings/mail-view.c index 67a86d7872..279b83c2d5 100644 --- a/capplet/settings/mail-view.c +++ b/capplet/settings/mail-view.c @@ -21,8 +21,9 @@ */ #ifdef HAVE_CONFIG_H -# include +#include #endif + #include #include "mail/em-utils.h" #include "mail/mail-send-recv.h" -- cgit v1.2.3 From 84339b3be5a771406fcd5898bbd21dc1c5b98c82 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 14 Jun 2011 08:54:20 +0200 Subject: Do not use deprecated EBook/ECal API --- capplet/settings/mail-capplet-shell.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index a22bb88dcf..5a70fad6d4 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -285,9 +285,12 @@ setup_abooks (void) ESourceList *list = NULL; ESourceGroup *on_this_computer = NULL; ESource *personal_source = NULL; + GError *error = NULL; - if (!e_book_get_addressbooks (&list, NULL)) { - g_warning ("Unable to get books\n"); + if (!e_book_client_get_sources (&list, &error)) { + g_debug ("%s: Unable to get books: %s", G_STRFUNC, error ? error->message : "Unknown error"); + if (error) + g_error_free (error); return; } -- cgit v1.2.3 From 489ff03bfaec34e13b80ec4b23ef9fc07d5588f6 Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Silva Date: Fri, 24 Jun 2011 15:16:33 -0300 Subject: Bug #653358 Do not duplicate google address book When a GMail account check that the address book does not already exist before creating an ESource for it, and adding it to the list. https://bugzilla.gnome.org/show_bug.cgi?id=653358 --- capplet/settings/mail-account-view.c | 62 ++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 21 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index eac32cc4b8..6328dbcd02 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -405,37 +405,57 @@ setup_google_accounts (MailAccountView *mav) if (mav->priv->do_gcontacts) { ESourceList *slist; ESourceGroup *sgrp; - ESource *abook; - gchar *rel_uri;; + GSList *sources; + gboolean source_already_exists = FALSE; slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/addressbook/sources" ); sgrp = e_source_list_ensure_group (slist, _("Google"), "google://", TRUE); - /* FIXME: Not sure if we should localize 'Contacts' */ - abook = e_source_new ("Contacts", ""); - e_source_set_property (abook, "default", "true"); - e_source_set_property (abook, "offline_sync", "1"); - e_source_set_property (abook, "auth", "plain/password"); - e_source_set_property (abook, "use-ssl", "true"); - e_source_set_property (abook, "remember_password", "true"); - e_source_set_property (abook, "refresh-interval", "86400"); - e_source_set_property (abook, "completion", "true"); - e_source_set_property (abook, "username", mav->priv->username); - - e_source_group_add_source (sgrp, abook, -1); + sources = e_source_group_peek_sources (sgrp); + for (; sources; sources = sources->next) + { + ESource *existing = (ESource*) sources->data; - e_source_set_relative_uri (abook, mav->priv->username); + if (!g_strcmp0 (e_source_peek_relative_uri (existing), + mav->priv->username)) + { + source_already_exists = TRUE; + break; + } + } - rel_uri = g_strdup_printf("google://%s/", mav->priv->username); - e_passwords_add_password (rel_uri, gtk_entry_get_text ((GtkEntry *) mav->password)); - e_passwords_remember_password ("Addressbook", rel_uri); - e_source_list_sync (slist, NULL); + if (!source_already_exists) + { + ESource *abook; + gchar *rel_uri; + + /* FIXME: Not sure if we should localize 'Contacts' */ + abook = e_source_new ("Contacts", ""); + e_source_set_property (abook, "default", "true"); + e_source_set_property (abook, "offline_sync", "1"); + e_source_set_property (abook, "auth", "plain/password"); + e_source_set_property (abook, "use-ssl", "true"); + e_source_set_property (abook, "remember_password", "true"); + e_source_set_property (abook, "refresh-interval", "86400"); + e_source_set_property (abook, "completion", "true"); + e_source_set_property (abook, "username", mav->priv->username); + + e_source_group_add_source (sgrp, abook, -1); + + e_source_set_relative_uri (abook, mav->priv->username); + + rel_uri = g_strdup_printf ("google://%s/", mav->priv->username); + e_passwords_add_password (rel_uri, gtk_entry_get_text ((GtkEntry *) mav->password)); + e_passwords_remember_password ("Addressbook", rel_uri); + e_source_list_sync (slist, NULL); + + g_free (rel_uri); + g_object_unref (abook); + } - g_free (rel_uri); g_object_unref (slist); g_object_unref (sgrp); - g_object_unref (abook); } g_object_unref (gconf); -- cgit v1.2.3 From aa37f59cfff379a3ee43d846e22ffeea514202e4 Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Silva Date: Tue, 28 Jun 2011 15:44:45 -0300 Subject: Fix crash when adding account in express mode The settings library started using an EMailBackend object, but since it is abstract it can't be instantiated directly. So we use the EShell to get the mail backend for us instead, after loading the modules. --- capplet/settings/Makefile.am | 1 + capplet/settings/mail-capplet-shell.c | 28 +++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) (limited to 'capplet') diff --git a/capplet/settings/Makefile.am b/capplet/settings/Makefile.am index e6ea573c11..dd8c3c9a45 100644 --- a/capplet/settings/Makefile.am +++ b/capplet/settings/Makefile.am @@ -25,6 +25,7 @@ libevolution_mail_settings_la_CPPFLAGS = \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ -DEVOLUTION_ICONSDIR=\""$(imagesdir)"\" \ + -DEVOLUTION_MODULEDIR=\""$(moduledir)"\" \ -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \ -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ -DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\" \ diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index 5a70fad6d4..ebcb5cd355 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -43,6 +43,8 @@ #include #include +#include + enum { CTRL_W_PRESSED, CTRL_Q_PRESSED, @@ -202,6 +204,7 @@ mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean { MailCappletShellPrivate *priv = shell->priv; GtkStyle *style = gtk_widget_get_default_style (); + EShell *eshell; EMailSession *session; gchar *custom_dir; @@ -239,7 +242,30 @@ mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean camel_provider_init (); - shell->priv->backend = g_object_new (E_TYPE_MAIL_BACKEND, NULL); + eshell = e_shell_get_default (); + + if (eshell == NULL) { + GError *error = NULL; + + eshell = g_initable_new ( + E_TYPE_SHELL, NULL, &error, + "application-id", "org.gnome.Evolution", + "flags", 0, + "geometry", NULL, + "module-directory", EVOLUTION_MODULEDIR, + "meego-mode", FALSE, + "express-mode", FALSE, + "small-screen-mode", FALSE, + "online", FALSE, + NULL); + + if (error != NULL) + g_error ("%s", error->message); + + e_shell_load_modules (eshell); + } + + shell->priv->backend = E_MAIL_BACKEND (e_shell_get_backend_by_name (eshell, "mail")); session = e_mail_backend_get_session (shell->priv->backend); shell->view = mail_view_new (); -- cgit v1.2.3 From 6c54eecdf8d900f3297176d43485c512c353493f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 4 Jul 2011 09:55:30 -0400 Subject: Adapt to CamelSession and e-passwords changes. --- capplet/settings/mail-account-view.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index 6328dbcd02..0290cd739e 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -278,7 +278,7 @@ setup_yahoo_account (MailAccountView *mav) abs_uri = g_strdup_printf ("caldav://%s@caldav.calendar.yahoo.com/dav/%s/Calendar/%s/", sanitize_uname, email, gtk_entry_get_text((GtkEntry *)mav->priv->yahoo_cal_entry)); e_passwords_add_password (abs_uri, gtk_entry_get_text ((GtkEntry *) mav->password)); - e_passwords_remember_password ("Calendar", abs_uri); + e_passwords_remember_password (NULL, abs_uri); rel_uri = g_strdup_printf (YAHOO_CALENDAR_LOCATION, sanitize_uname, email, gtk_entry_get_text ((GtkEntry *) mav->priv->yahoo_cal_entry)); e_source_set_relative_uri (calendar, rel_uri); @@ -328,7 +328,7 @@ setup_yahoo_account (MailAccountView *mav) rel_uri = g_strdup_printf("google://%s/", mav->priv->username); e_passwords_add_password (rel_uri, gtk_entry_get_text ((GtkEntry *) mav->password)); - e_passwords_remember_password ("Addressbook", rel_uri); + e_passwords_remember_password (NULL, rel_uri); e_source_group_add_source (sgrp, abook, -1); e_source_list_sync (slist, NULL); @@ -379,7 +379,7 @@ setup_google_accounts (MailAccountView *mav) e_source_set_absolute_uri (calendar, abs_uri); e_passwords_add_password (abs_uri, gtk_entry_get_text ((GtkEntry *) mav->password)); - e_passwords_remember_password ("Calendar", abs_uri); + e_passwords_remember_password (NULL, abs_uri); rel_uri = g_strconcat ("https", GMAIL_CALENDAR_LOCATION, sanitize_uname, CALENDAR_DEFAULT_PATH, NULL); e_source_set_relative_uri (calendar, rel_uri); @@ -447,7 +447,7 @@ setup_google_accounts (MailAccountView *mav) rel_uri = g_strdup_printf ("google://%s/", mav->priv->username); e_passwords_add_password (rel_uri, gtk_entry_get_text ((GtkEntry *) mav->password)); - e_passwords_remember_password ("Addressbook", rel_uri); + e_passwords_remember_password (NULL, rel_uri); e_source_list_sync (slist, NULL); g_free (rel_uri); @@ -688,7 +688,7 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) aurl = camel_url_new (account->source->url, NULL); surl = camel_url_to_string (aurl, CAMEL_URL_HIDE_ALL); e_passwords_add_password (surl, gtk_entry_get_text ((GtkEntry *) mav->password)); - e_passwords_remember_password ("Mail", surl); + e_passwords_remember_password (NULL, surl); camel_url_free (aurl); g_free (surl); } -- cgit v1.2.3 From ae9db3ed236b0c734fd12c8dc8c99764626bf0b8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 1 Jul 2011 00:07:26 -0400 Subject: Coding style and whitespace cleanup. --- capplet/settings/mail-account-view.c | 9 +++------ capplet/settings/mail-capplet-shell.c | 14 +++++++++----- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index 0290cd739e..d1c5246702 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -413,20 +413,17 @@ setup_google_accounts (MailAccountView *mav) sgrp = e_source_list_ensure_group (slist, _("Google"), "google://", TRUE); sources = e_source_group_peek_sources (sgrp); - for (; sources; sources = sources->next) - { + for (; sources; sources = sources->next) { ESource *existing = (ESource*) sources->data; if (!g_strcmp0 (e_source_peek_relative_uri (existing), - mav->priv->username)) - { + mav->priv->username)) { source_already_exists = TRUE; break; } } - if (!source_already_exists) - { + if (!source_already_exists) { ESource *abook; gchar *rel_uri; diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index ebcb5cd355..75e2e11fff 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -313,10 +313,13 @@ setup_abooks (void) ESource *personal_source = NULL; GError *error = NULL; - if (!e_book_client_get_sources (&list, &error)) { - g_debug ("%s: Unable to get books: %s", G_STRFUNC, error ? error->message : "Unknown error"); - if (error) - g_error_free (error); + e_book_client_get_sources (&list, &error); + + if (error != NULL) { + g_warning ( + "%s: Unable to get books: %s", + G_STRFUNC, error->message); + g_error_free (error); return; } @@ -326,7 +329,8 @@ setup_abooks (void) GSList *g; gchar *base_dir, *base_uri; - base_dir = g_build_filename (e_get_user_data_dir (), "addressbook", "local", NULL); + base_dir = g_build_filename ( + e_get_user_data_dir (), "addressbook", "local", NULL); base_uri = g_filename_to_uri (base_dir, NULL, NULL); for (g = groups; g; g = g->next) { -- cgit v1.2.3 From f30ea2184c4983ab05e7409bc7f8c9923a654bb2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 15 Aug 2011 10:38:14 -0400 Subject: MailAccountView: Adapt to URL parameter renames. It's "security-method" now instead of "use_ssl". --- capplet/settings/mail-account-view.c | 74 ++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 38 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index d1c5246702..e579e6a070 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -549,7 +549,7 @@ create_review (MailAccountView *view) gtk_widget_show (label); PACK_BOX (label); gtk_table_attach ((GtkTable *) table, box, 0, 1, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); - enc = (gchar *)camel_url_get_param(url, "use_ssl"); + enc = (gchar *)camel_url_get_param(url, "security-method"); entry = gtk_label_new (enc ? enc : _("never")); gtk_widget_show (entry); PACK_BOX (entry); @@ -584,7 +584,7 @@ create_review (MailAccountView *view) PACK_BOX (entry); gtk_table_attach ((GtkTable *) table, box, 2, 3, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); - enc = (gchar *)camel_url_get_param(url, "use_ssl"); + enc = (gchar *)camel_url_get_param(url, "security-method"); entry = gtk_label_new (enc ? enc : _("never")); gtk_widget_show (entry); PACK_BOX (entry); @@ -661,13 +661,13 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) e_account_set_string (em_account_editor_get_modified_account (mav->edit), E_ACCOUNT_NAME, e_account_get_string (em_account_editor_get_modified_account (mav->edit), E_ACCOUNT_ID_ADDRESS)); if (uri != NULL && (url = camel_url_new (uri, NULL)) != NULL) { - camel_url_set_param(url, "check_all", "1"); - camel_url_set_param(url, "sync_offline", "1"); + camel_url_set_param(url, "check-all", "true"); + camel_url_set_param(url, "stay-synchronized", "true"); if (!mav->original) { e_account_set_bool (em_account_editor_get_modified_account (mav->edit), E_ACCOUNT_SOURCE_AUTO_CHECK, TRUE); } - if (!mav->original && strcmp(url->protocol, "pop") == 0) { + if (!mav->original && strcmp (url->protocol, "pop") == 0) { e_account_set_bool (em_account_editor_get_modified_account (mav->edit), E_ACCOUNT_SOURCE_KEEP_ON_SERVER, TRUE); } @@ -991,47 +991,45 @@ emae_check_servers (const gchar *email) sdata->recv_port = provider->recv_port; sdata->send = provider->send_hostname; sdata->send_port = provider->send_port; - if (strcmp(provider->recv_type, "pop3") == 0) - sdata->proto = g_strdup("pop"); - else if (strcmp(provider->recv_type, "imap") == 0) - sdata->proto = g_strdup("imapx"); + if (strcmp (provider->recv_type, "pop3") == 0) + sdata->proto = g_strdup ("pop"); + else if (strcmp (provider->recv_type, "imap") == 0) + sdata->proto = g_strdup ("imapx"); else sdata->proto = provider->recv_type; if (provider->recv_socket_type) { - if (g_ascii_strcasecmp(provider->recv_socket_type, "SSL") == 0) { - sdata->ssl = g_strdup("always"); - sdata->recv_sock = g_strdup("always"); - } - else if (g_ascii_strcasecmp(provider->recv_socket_type, "secure") == 0) { - sdata->ssl = g_strdup("always"); - sdata->recv_sock = g_strdup("always"); - } - else if (g_ascii_strcasecmp(provider->recv_socket_type, "STARTTLS") == 0) { - sdata->ssl = g_strdup("when-possible"); - sdata->recv_sock = g_strdup("when-possible"); - } - else if (g_ascii_strcasecmp(provider->recv_socket_type, "TLS") == 0) { - sdata->ssl = g_strdup("when-possible"); - sdata->recv_sock = g_strdup("when-possible"); - } - else { - sdata->ssl = g_strdup("never"); - sdata->recv_sock = g_strdup("never"); - } + CamelNetworkSecurityMethod method; + + if (g_ascii_strcasecmp (provider->recv_socket_type, "SSL") == 0) + method = CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT; + else if (g_ascii_strcasecmp (provider->recv_socket_type, "secure") == 0) + method = CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT; + else if (g_ascii_strcasecmp (provider->recv_socket_type, "STARTTLS") == 0) + method = CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT; + else if (g_ascii_strcasecmp (provider->recv_socket_type, "TLS") == 0) + method = CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT; + else + method = CAMEL_NETWORK_SECURITY_METHOD_NONE; + sdata->security_method = method; + sdata->recv_security_method = method; } if (provider->send_socket_type) { - if (g_ascii_strcasecmp(provider->send_socket_type, "SSL") == 0) - sdata->send_sock = g_strdup("always"); - else if (g_ascii_strcasecmp(provider->send_socket_type, "secure") == 0) - sdata->send_sock = g_strdup("always"); - else if (g_ascii_strcasecmp(provider->send_socket_type, "STARTTLS") == 0) - sdata->send_sock = g_strdup("when-possible"); - else if (g_ascii_strcasecmp(provider->send_socket_type, "TLS") == 0) - sdata->send_sock = g_strdup("when-possible"); + CamelNetworkSecurityMethod method; + + if (g_ascii_strcasecmp (provider->send_socket_type, "SSL") == 0) + method = CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT; + else if (g_ascii_strcasecmp (provider->send_socket_type, "secure") == 0) + method = CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT; + else if (g_ascii_strcasecmp (provider->send_socket_type, "STARTTLS") == 0) + method = CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT; + else if (g_ascii_strcasecmp (provider->send_socket_type, "TLS") == 0) + method = CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT; else - sdata->send_sock = g_strdup("never"); + method = CAMEL_NETWORK_SECURITY_METHOD_NONE; + + sdata->send_security_method = method; } sdata->send_auth = provider->send_auth; -- 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. --- capplet/anjal-settings-main.c | 5 +- capplet/settings/anjal-mail-view.c | 19 ++++--- capplet/settings/mail-account-view.c | 85 ++++++++++++++++++-------------- capplet/settings/mail-account-view.h | 2 +- capplet/settings/mail-capplet-shell.c | 19 ++++--- capplet/settings/mail-guess-servers.c | 16 ++++-- capplet/settings/mail-settings-view.c | 34 ++++++++----- capplet/settings/mail-view.c | 93 +++++++++++++++++++++++------------ capplet/settings/mail-view.h | 6 +-- 9 files changed, 174 insertions(+), 105 deletions(-) (limited to 'capplet') diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c index 5a03ec685c..2bc3268b58 100644 --- a/capplet/anjal-settings-main.c +++ b/capplet/anjal-settings-main.c @@ -101,7 +101,8 @@ create_default_shell (void) } gint -main (gint argc, gchar *argv[]) +main (gint argc, + gchar *argv[]) { GError *error = NULL; @@ -122,7 +123,7 @@ main (gint argc, gchar *argv[]) p_SetProcessDEPPolicy = GetProcAddress (GetModuleHandle ("kernel32.dll"), "SetProcessDEPPolicy"); if (p_SetProcessDEPPolicy) - (*p_SetProcessDEPPolicy) (PROCESS_DEP_ENABLE|PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION); + (*p_SetProcessDEPPolicy) (PROCESS_DEP_ENABLE | PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION); } #endif diff --git a/capplet/settings/anjal-mail-view.c b/capplet/settings/anjal-mail-view.c index eb8a06e56d..c0926536cb 100644 --- a/capplet/settings/anjal-mail-view.c +++ b/capplet/settings/anjal-mail-view.c @@ -39,7 +39,7 @@ struct _AnjalMailViewPrivate { G_DEFINE_TYPE (AnjalMailView, anjal_mail_view, GTK_TYPE_NOTEBOOK) static void -anjal_mail_view_init (AnjalMailView *shell) +anjal_mail_view_init (AnjalMailView *shell) { shell->priv = g_new0 (AnjalMailViewPrivate, 1); shell->priv->started = TRUE; @@ -57,25 +57,32 @@ anjal_mail_view_finalize (GObject *object) } static void -view_set_folder_uri (AnjalMailView *mail_view, const gchar *uri) +view_set_folder_uri (AnjalMailView *mail_view, + const gchar *uri) { } + static void -view_set_folder_tree_widget (AnjalMailView *mail_view, GtkWidget *tree) +view_set_folder_tree_widget (AnjalMailView *mail_view, + GtkWidget *tree) { } + static void -view_set_folder_tree (AnjalMailView *mail_view, EMFolderTree *tree) +view_set_folder_tree (AnjalMailView *mail_view, + EMFolderTree *tree) { } static void -view_set_search (AnjalMailView *mail_view, const gchar *search) +view_set_search (AnjalMailView *mail_view, + const gchar *search) { } static void -view_init_search (AnjalMailView *mail_view, GtkWidget *search) +view_init_search (AnjalMailView *mail_view, + GtkWidget *search) { } diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index e579e6a070..3e35276361 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -82,7 +82,7 @@ struct _dialog_errors { static guint signals[LAST_SIGNAL] = { 0 }; static void -mail_account_view_init (MailAccountView *shell) +mail_account_view_init (MailAccountView *shell) { shell->priv = g_new0 (MailAccountViewPrivate, 1); @@ -144,7 +144,7 @@ check_servers (gchar *server) { gint len = G_N_ELEMENTS (std_server), i; - for (i=0; inext) { - ESource *existing = (ESource*) sources->data; + ESource *existing = (ESource *) sources->data; if (!g_strcmp0 (e_source_peek_relative_uri (existing), mav->priv->username)) { @@ -482,25 +482,25 @@ create_review (MailAccountView *view) g_free (buff); gtk_widget_show (label); PACK_BOXF (label) - gtk_table_attach ((GtkTable *) table, box, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (_("Name:")); gtk_widget_show (label); PACK_BOX (label); - gtk_table_attach ((GtkTable *) table, box, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (e_account_get_string (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_ID_NAME)); gtk_widget_show (entry); PACK_BOX (entry) - gtk_table_attach ((GtkTable *) table, box, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (_("Email address:")); gtk_widget_show (label); PACK_BOX (label) - gtk_table_attach ((GtkTable *) table, box, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 0, 1, 2, 3, GTK_EXPAND | GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (e_account_get_string (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_ID_ADDRESS)); gtk_widget_show (entry); PACK_BOX (entry) - gtk_table_attach ((GtkTable *) table, box, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (NULL); buff = g_markup_printf_escaped ("%s", _("Details:")); @@ -508,7 +508,7 @@ create_review (MailAccountView *view) g_free (buff); gtk_widget_show (label); PACK_BOXF (label); - gtk_table_attach ((GtkTable *) table, box, 0, 1, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 0, 1, 3, 4, GTK_EXPAND | GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (NULL); buff = g_markup_printf_escaped ("%s", _("Receiving")); @@ -516,44 +516,44 @@ create_review (MailAccountView *view) g_free (buff); gtk_widget_show (label); PACK_BOXF (label); - gtk_table_attach ((GtkTable *) table, box, 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (_("Server type:")); gtk_widget_show (label); PACK_BOX (label); - gtk_table_attach ((GtkTable *) table, box, 0, 1, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 0, 1, 4, 5, GTK_EXPAND | GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (url->protocol); gtk_widget_show (entry); PACK_BOX (entry) - gtk_table_attach ((GtkTable *) table, box, 1, 2, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 1, 2, 4, 5, GTK_EXPAND | GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (_("Server address:")); gtk_widget_show (label); PACK_BOX (label); - gtk_table_attach ((GtkTable *) table, box, 0, 1, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 0, 1, 5, 6, GTK_EXPAND | GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (url->host); gtk_widget_show (entry); PACK_BOX (entry); - gtk_table_attach ((GtkTable *) table, box, 1, 2, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 1, 2, 5, 6, GTK_EXPAND | GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (_("Username:")); gtk_widget_show (label); PACK_BOX (label); - gtk_table_attach ((GtkTable *) table, box, 0, 1, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 0, 1, 6, 7, GTK_EXPAND | GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (url->user); gtk_widget_show (entry); PACK_BOX (entry); - gtk_table_attach ((GtkTable *) table, box, 1, 2, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 1, 2, 6, 7, GTK_EXPAND | GTK_FILL, GTK_SHRINK, INDENTATION, 0); label = gtk_label_new (_("Use encryption:")); gtk_widget_show (label); PACK_BOX (label); - gtk_table_attach ((GtkTable *) table, box, 0, 1, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 0, 1, 7, 8, GTK_EXPAND | GTK_FILL, GTK_SHRINK, INDENTATION, 0); enc = (gchar *)camel_url_get_param(url, "security-method"); entry = gtk_label_new (enc ? enc : _("never")); gtk_widget_show (entry); PACK_BOX (entry); - gtk_table_attach ((GtkTable *) table, box, 1, 2, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 1, 2, 7, 8, GTK_EXPAND | GTK_FILL, GTK_SHRINK, INDENTATION, 0); view->priv->username = g_strdup (url->user); camel_url_free (url); @@ -567,28 +567,28 @@ create_review (MailAccountView *view) g_free (buff); gtk_widget_show (label); PACK_BOXF (label); - gtk_table_attach ((GtkTable *) table, box, 2, 3, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 2, 3, 3, 4, GTK_EXPAND | GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (url->protocol); gtk_widget_show (entry); PACK_BOX (entry) - gtk_table_attach ((GtkTable *) table, box, 2, 3, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 2, 3, 4, 5, GTK_EXPAND | GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (url->host); gtk_widget_show (entry); PACK_BOX (entry); - gtk_table_attach ((GtkTable *) table, box, 2, 3, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 2, 3, 5, 6, GTK_EXPAND | GTK_FILL, GTK_SHRINK, INDENTATION, 0); entry = gtk_label_new (url->user); gtk_widget_show (entry); PACK_BOX (entry); - gtk_table_attach ((GtkTable *) table, box, 2, 3, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 2, 3, 6, 7, GTK_EXPAND | GTK_FILL, GTK_SHRINK, INDENTATION, 0); enc = (gchar *)camel_url_get_param(url, "security-method"); entry = gtk_label_new (enc ? enc : _("never")); gtk_widget_show (entry); PACK_BOX (entry); - gtk_table_attach ((GtkTable *) table, box, 2, 3, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach ((GtkTable *) table, box, 2, 3, 7, 8, GTK_EXPAND | GTK_FILL, GTK_SHRINK, INDENTATION, 0); /* label = gtk_label_new (_("Organization:")); @@ -596,7 +596,7 @@ create_review (MailAccountView *view) entry = gtk_entry_new (); gtk_widget_show (entry); gtk_table_attach (table, label, 0, 1, 3, 4, GTK_SHRINK, GTK_SHRINK, INDENTATION, 0); - gtk_table_attach (table, entry, 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + gtk_table_attach (table, entry, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_SHRINK, INDENTATION, 0); */ gtk_widget_show (table); @@ -638,13 +638,14 @@ struct _page_text { }; static void -mav_next_pressed (GtkButton *button, MailAccountView *mav) +mav_next_pressed (GtkButton *button, + MailAccountView *mav) { if (mail_account_pages[mav->current_page].validate_page) { gint ret = (*mail_account_pages[mav->current_page].validate_page) (mav); MAVPage *page = mav->pages[mav->current_page]; if (ret) { - gtk_label_set_text ((GtkLabel *) page->error_label, _(dialog_errors[ret-1].detail)); + gtk_label_set_text ((GtkLabel *) page->error_label, _(dialog_errors[ret - 1].detail)); gtk_widget_show (page->error); return; } @@ -847,7 +848,8 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav) } static void -mav_prev_pressed (GtkButton *button, MailAccountView *mav) +mav_prev_pressed (GtkButton *button, + MailAccountView *mav) { if (mav->current_page == 0) return; @@ -863,7 +865,8 @@ mav_prev_pressed (GtkButton *button, MailAccountView *mav) } static GtkWidget * -mav_construct_page (MailAccountView *view, MAVPageType type) +mav_construct_page (MailAccountView *view, + MAVPageType type) { MAVPage *page = g_new0 (MAVPage, 1); GtkWidget *box, *tmp, *error_box; @@ -927,7 +930,7 @@ mav_construct_page (MailAccountView *view, MAVPageType type) page->prev = gtk_button_new (); gtk_container_add ((GtkContainer *) page->prev, box); gtk_widget_show_all (page->prev); - g_signal_connect(page->prev, "clicked", G_CALLBACK(mav_prev_pressed), view); + g_signal_connect (page->prev, "clicked", G_CALLBACK(mav_prev_pressed), view); } if ((view->original && mail_account_pages[type].next_edit) || mail_account_pages[type].next) { @@ -944,7 +947,7 @@ mav_construct_page (MailAccountView *view, MAVPageType type) G_CALLBACK (gtk_widget_grab_default), NULL); gtk_container_add ((GtkContainer *) page->next, box); gtk_widget_show_all (page->next); - g_signal_connect(page->next, "clicked", G_CALLBACK(mav_next_pressed), view); + g_signal_connect (page->next, "clicked", G_CALLBACK(mav_next_pressed), view); } box = gtk_hbox_new (FALSE, 0); @@ -1043,7 +1046,8 @@ emae_check_servers (const gchar *email) } static void -next_page (GtkWidget *entry, MailAccountView *mav) +next_page (GtkWidget *entry, + MailAccountView *mav) { mav_next_pressed (NULL, mav); } @@ -1062,7 +1066,7 @@ mail_account_view_construct (MailAccountView *view, gtk_scrolled_window_add_with_viewport ((GtkScrolledWindow *) view->scroll, view->page_widget); gtk_widget_show_all (view->scroll); gtk_widget_set_size_request ((GtkWidget *) view, -1, 300); - for (i=0; ipages[i] = (MAVPage *) mav_construct_page (view, i); view->pages[i]->done = FALSE; view->wpages[i] = view->pages[i]->box; @@ -1099,7 +1103,7 @@ mail_account_view_construct (MailAccountView *view, gtk_widget_show (label); gtk_widget_show (pwd); gtk_table_attach ((GtkTable *) table, label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); - gtk_table_attach ((GtkTable *) table, pwd, 1, 2, 2, 3, GTK_FILL|GTK_EXPAND, 0, 0, 0); + gtk_table_attach ((GtkTable *) table, pwd, 1, 2, 2, 3, GTK_FILL | GTK_EXPAND, 0, 0, 0); view->password = pwd; } @@ -1123,7 +1127,8 @@ mail_account_view_new (EAccount *account, } static void -mav_close (GtkButton *w, MailAccountView *mfv) +mav_close (GtkButton *w, + MailAccountView *mfv) { g_signal_emit (mfv, signals[VIEW_CLOSE], 0); } @@ -1150,7 +1155,7 @@ mail_account_view_get_tab_widget (MailAccountView *mcv) gtk_container_add ((GtkContainer *) tool, box); gtk_widget_show_all (tool); gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (tool) , GTK_ICON_SIZE_MENU, &w, &h); - gtk_widget_set_size_request (tool, w+2, h+2); + gtk_widget_set_size_request (tool, w + 2, h + 2); box = gtk_label_new (_("Account Wizard")); tab_label = gtk_hbox_new (FALSE, 0); @@ -1163,11 +1168,15 @@ mail_account_view_get_tab_widget (MailAccountView *mcv) } void -mail_account_view_activate (MailAccountView *mcv, GtkWidget *tree, GtkWidget *folder_tree, GtkWidget *check_mail, GtkWidget *sort_by, gboolean act) +mail_account_view_activate (MailAccountView *mcv, + GtkWidget *tree, + GtkWidget *folder_tree, + GtkWidget *check_mail, + GtkWidget *sort_by, + gboolean act) { if (!check_mail || !sort_by) return; - //gtk_widget_hide (folder_tree); gtk_widget_set_sensitive (check_mail, TRUE); gtk_widget_set_sensitive (sort_by, FALSE); } diff --git a/capplet/settings/mail-account-view.h b/capplet/settings/mail-account-view.h index 1b04533403..0a582c4a13 100644 --- a/capplet/settings/mail-account-view.h +++ b/capplet/settings/mail-account-view.h @@ -39,7 +39,7 @@ typedef struct _MailAccountViewPrivate MailAccountViewPrivate; typedef struct _MailAccountService MailAccountService; typedef enum { - MAV_IDENTITY_PAGE=0, + MAV_IDENTITY_PAGE = 0, MAV_RECV_PAGE, MAV_RECV_OPT_PAGE, MAV_SEND_PAGE, diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index 75e2e11fff..47956cd782 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -91,7 +91,7 @@ G_DEFINE_TYPE (MailCappletShell, mail_capplet_shell, GTK_TYPE_WINDOW) static void setup_abooks (void); static void -mail_capplet_shell_init (MailCappletShell *shell) +mail_capplet_shell_init (MailCappletShell *shell) { shell->priv = g_new0 (MailCappletShellPrivate, 1); shell->priv->settings_view = NULL; @@ -184,15 +184,15 @@ mail_capplet_shell_quit (MailCappletShell *shell) static void ms_delete_event (MailCappletShell *shell, - GdkEvent *event G_GNUC_UNUSED, - gpointer data G_GNUC_UNUSED) + GdkEvent *event G_GNUC_UNUSED, + gpointer data G_GNUC_UNUSED) { mail_capplet_shell_quit (shell); } static void ms_show_post_druid (MailViewChild *mfv G_GNUC_UNUSED, - MailCappletShell *shell) + MailCappletShell *shell) { gtk_widget_destroy (GTK_WIDGET (shell)); } @@ -200,7 +200,10 @@ ms_show_post_druid (MailViewChild *mfv G_GNUC_UNUSED, #define PACK_IN_TOOL(wid,icon) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, gtk_image_new_from_icon_name(icon, GTK_ICON_SIZE_BUTTON), FALSE, FALSE, 0); wid = (GtkWidget *)gtk_tool_button_new (tbox, NULL); } static void -mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean just_druid, gboolean main_loop) +mail_capplet_shell_construct (MailCappletShell *shell, + gint socket_id, + gboolean just_druid, + gboolean main_loop) { MailCappletShellPrivate *priv = shell->priv; GtkStyle *style = gtk_widget_get_default_style (); @@ -292,7 +295,9 @@ mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean } GtkWidget * -mail_capplet_shell_new (gint socket_id, gboolean just_druid, gboolean main_loop) +mail_capplet_shell_new (gint socket_id, + gboolean just_druid, + gboolean main_loop) { MailCappletShell *shell = g_object_new (MAIL_CAPPLET_SHELL_TYPE, NULL); mail_capplet_shell_construct (shell, socket_id, just_druid, main_loop); @@ -351,7 +356,7 @@ setup_abooks (void) if (on_this_computer) { /* make sure "Personal" shows up as a source under - this group */ + * this group */ GSList *sources = e_source_group_peek_sources (on_this_computer); GSList *s; for (s = sources; s; s = s->next) { diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c index 307aeeec1c..0b144940e9 100644 --- a/capplet/settings/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.c @@ -50,7 +50,8 @@ #include "mail-guess-servers.h" static gchar * -xml_to_gchar (xmlChar *xml, EmailProvider *provider) +xml_to_gchar (xmlChar *xml, + EmailProvider *provider) { gchar *gxml = NULL; gchar *tmp; @@ -89,7 +90,8 @@ xml_to_gchar (xmlChar *xml, EmailProvider *provider) } static SoupMessage * -get_url (SoupSession *session, const gchar *url) +get_url (SoupSession *session, + const gchar *url) { SoupMessage *msg; const gchar *header; @@ -175,7 +177,9 @@ handle_outgoing (xmlNodePtr head, } static gboolean -parse_message (const gchar *msg, gint length, EmailProvider *provider) +parse_message (const gchar *msg, + gint length, + EmailProvider *provider) { xmlDocPtr doc; xmlNodePtr node; @@ -227,7 +231,8 @@ parse_message (const gchar *msg, gint length, EmailProvider *provider) } static gboolean -parse_soup_message (SoupMessage *msg, EmailProvider *provider) +parse_soup_message (SoupMessage *msg, + EmailProvider *provider) { return parse_message ( msg->response_body->data, @@ -334,7 +339,8 @@ mail_guess_servers (EmailProvider *provider) #ifdef TEST gint -main (gint argc, gchar **argv) +main (gint argc, + gchar **argv) { EmailProvider *provider; g_thread_init (NULL); diff --git a/capplet/settings/mail-settings-view.c b/capplet/settings/mail-settings-view.c index 3ae2c6d30c..a699dca9ea 100644 --- a/capplet/settings/mail-settings-view.c +++ b/capplet/settings/mail-settings-view.c @@ -52,7 +52,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; static void msv_regen_view (MailSettingsView *acview); static void -mail_settings_view_init (MailSettingsView *shell) +mail_settings_view_init (MailSettingsView *shell) { shell->priv = g_new0 (MailSettingsViewPrivate, 1); @@ -94,7 +94,8 @@ mail_settings_view_class_init (MailSettingsViewClass *klass) } static void -msv_edit_account (GtkButton *button, MailSettingsView *msv) +msv_edit_account (GtkButton *button, + MailSettingsView *msv) { EAccount *acc = g_object_get_data((GObject *)button, "account"); @@ -102,7 +103,8 @@ msv_edit_account (GtkButton *button, MailSettingsView *msv) } static void -msv_delete_account (GtkButton *button, MailSettingsView *msv) +msv_delete_account (GtkButton *button, + MailSettingsView *msv) { EAccount *account = g_object_get_data((GObject *)button, "account"); EAccountList *account_list = e_get_account_list (); @@ -116,7 +118,9 @@ msv_delete_account (GtkButton *button, MailSettingsView *msv) } static void -msv_account_added (EAccountList *al, EAccount *account, MailSettingsView *msv) +msv_account_added (EAccountList *al, + EAccount *account, + MailSettingsView *msv) { msv_regen_view (msv); } @@ -124,7 +128,8 @@ msv_account_added (EAccountList *al, EAccount *account, MailSettingsView *msv) #define PACK_BOX(w,s) box = gtk_hbox_new(FALSE, 0); gtk_box_pack_start((GtkBox *)box, w, FALSE, FALSE, s); gtk_widget_show(box); gtk_widget_show(w); gtk_box_pack_start((GtkBox *)acview->priv->box, box, FALSE, FALSE, 3); static void -build_account_button (MailSettingsView *acview, EAccount *account) +build_account_button (MailSettingsView *acview, + EAccount *account) { GtkWidget *box, *box1, *label, *tbox, *tlabel; gchar *tmp; @@ -153,7 +158,7 @@ build_account_button (MailSettingsView *acview, EAccount *account) gtk_widget_show (tbox); gtk_container_add ((GtkContainer *) label, tbox); g_object_set_data ((GObject *)label, "account", account); - g_signal_connect(label, "clicked", G_CALLBACK(msv_edit_account), acview); + g_signal_connect (label, "clicked", G_CALLBACK(msv_edit_account), acview); gtk_box_pack_start ((GtkBox *) box1, label, FALSE, FALSE, 0); gtk_widget_show (label); @@ -171,7 +176,7 @@ build_account_button (MailSettingsView *acview, EAccount *account) static void msv_regen_view (MailSettingsView *acview) { - struct _EAccount *account; + EAccount *account; EAccountList *accounts = acview->priv->accounts; EIterator *node; GtkWidget *box, *label; @@ -226,7 +231,8 @@ mail_settings_view_new () } static void -msv_close (GtkButton *w, MailSettingsView *mfv) +msv_close (GtkButton *w, + MailSettingsView *mfv) { g_signal_emit (mfv, signals[VIEW_CLOSE], 0); } @@ -253,7 +259,7 @@ mail_settings_view_get_tab_widget (MailSettingsView *mcv) gtk_container_add ((GtkContainer *) tool, box); gtk_widget_show_all (tool); gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (tool) , GTK_ICON_SIZE_MENU, &w, &h); - gtk_widget_set_size_request (tool, w+2, h+2); + gtk_widget_set_size_request (tool, w + 2, h + 2); box = gtk_label_new (_("Settings")); tab_label = gtk_hbox_new (FALSE, 0); @@ -268,12 +274,16 @@ mail_settings_view_get_tab_widget (MailSettingsView *mcv) } void -mail_settings_view_activate (MailSettingsView *mcv, GtkWidget *tree, GtkWidget *folder_tree, GtkWidget *check_mail, GtkWidget *sort_by, GtkWidget *slider, gboolean act) +mail_settings_view_activate (MailSettingsView *mcv, + GtkWidget *tree, + GtkWidget *folder_tree, + GtkWidget *check_mail, + GtkWidget *sort_by, + GtkWidget *slider, + gboolean act) { if (!check_mail || !sort_by) return; - //if (!GTK_WIDGET_VISIBLE (folder_tree)) - // gtk_widget_show (slider); gtk_widget_set_sensitive (check_mail, TRUE); gtk_widget_set_sensitive (sort_by, FALSE); } diff --git a/capplet/settings/mail-view.c b/capplet/settings/mail-view.c index 279b83c2d5..53daf3fd08 100644 --- a/capplet/settings/mail-view.c +++ b/capplet/settings/mail-view.c @@ -72,7 +72,7 @@ static MailConvView * mv_switch_message_view (MailView *mv, const gchar *uri); void anjal_shell_view_restore_state (EShellView *view, const gchar *uri); static void -mail_view_init (MailView *shell) +mail_view_init (MailView *shell) { shell->priv = g_new0 (MailViewPrivate, 1); shell->priv->children = NULL; @@ -95,7 +95,8 @@ mail_view_finalize (GObject *object) } static void -mv_set_folder_uri (AnjalMailView *mv, const gchar *uri) +mv_set_folder_uri (AnjalMailView *mv, + const gchar *uri) { #ifndef ANJAL_SETTINGS mail_view_set_folder_uri ((MailView *) mv, uri); @@ -108,7 +109,8 @@ static void set_folder_tree (AnjalMailView *mv, EMFolderTree *tree) } static void -set_search (AnjalMailView *mv, const gchar *search) +set_search (AnjalMailView *mv, + const gchar *search) { #ifndef ANJAL_SETTINGS mail_view_set_search ((MailView *) mv, search); @@ -138,7 +140,10 @@ mail_view_class_init (MailViewClass *klass) }; static void -mv_switch (GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer user_data) +mv_switch (GtkNotebook *notebook, + GtkWidget *page, + guint page_num, + gpointer user_data) { MailView *shell = (MailView *) notebook; MailViewPrivate *priv = shell->priv; @@ -192,21 +197,23 @@ mail_view_new () } static gint -mv_get_page_number (GtkNotebook *note, GtkWidget *widget) +mv_get_page_number (GtkNotebook *note, + GtkWidget *widget) { gint i, total; total = gtk_notebook_get_n_pages (note); - for (i=0; ishell_view, ((MailViewChild *) mfv)->uri); } static void -mv_folder_loaded (MailFolderView *mfv, MailView *mv) +mv_folder_loaded (MailFolderView *mfv, + MailView *mv) { g_signal_handlers_block_by_func (mfv, mv_folder_loaded, mv); g_signal_emit (mv, signals[VIEW_NEW], 0); } static MailViewChild * -mail_view_add_folder (MailView *mv, gpointer data, gboolean block) +mail_view_add_folder (MailView *mv, + gpointer data, + gboolean block) { MailFolderView *mfv = mail_folder_view_new (); gint position = 0; @@ -330,7 +344,9 @@ mail_view_add_folder (MailView *mv, gpointer data, gboolean block) } static MailViewChild * -mail_view_add_composer (MailView *mv, gpointer data, gboolean block) +mail_view_add_composer (MailView *mv, + gpointer data, + gboolean block) { MailComposerView *mcv; gint position = 0; @@ -338,7 +354,7 @@ mail_view_add_composer (MailView *mv, gpointer data, gboolean block) if (!data) mcv = mail_composer_view_new (); - else if (data == (gpointer)-1) { + else if (data == (gpointer) - 1) { special = TRUE; data = NULL; } else @@ -351,7 +367,7 @@ mail_view_add_composer (MailView *mv, gpointer data, gboolean block) position = gtk_notebook_append_page ((GtkNotebook *) mv, (GtkWidget *) mcv, mcv->tab_label); else { gint position = gtk_notebook_get_current_page ((GtkNotebook *) mv); - gtk_notebook_insert_page ((GtkNotebook *) mv, (GtkWidget *) mcv, mcv->tab_label, position+1); + gtk_notebook_insert_page ((GtkNotebook *) mv, (GtkWidget *) mcv, mcv->tab_label, position + 1); } gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *) mcv, TRUE); @@ -368,7 +384,9 @@ mail_view_add_composer (MailView *mv, gpointer data, gboolean block) } static MailViewChild * -mail_view_add_message (MailView *mv, gpointer data, gboolean block) +mail_view_add_message (MailView *mv, + gpointer data, + gboolean block) { MailConvView *mcv = mail_conv_view_new (); gint position = 0; @@ -380,11 +398,11 @@ mail_view_add_message (MailView *mv, gpointer data, gboolean block) mv->priv->children = block ? g_list_append (mv->priv->children, mcv) : g_list_prepend (mv->priv->children, mcv); position = gtk_notebook_get_current_page ((GtkNotebook *) mv); - gtk_notebook_insert_page ((GtkNotebook *) mv, (GtkWidget *) mcv, mail_conv_view_get_tab_widget (mcv), position+1); + gtk_notebook_insert_page ((GtkNotebook *) mv, (GtkWidget *) mcv, mail_conv_view_get_tab_widget (mcv), position + 1); gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *) mcv, TRUE); gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *) mcv, FALSE); if (!block) - gtk_notebook_set_current_page ((GtkNotebook *) mv, position+1); + gtk_notebook_set_current_page ((GtkNotebook *) mv, position + 1); if (!block) mail_conv_view_activate (mcv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE); @@ -397,13 +415,17 @@ mail_view_add_message (MailView *mv, gpointer data, gboolean block) #endif static void -mv_show_acc_mcv (MailViewChild *mfv, EAccount *account, MailView *mv) +mv_show_acc_mcv (MailViewChild *mfv, + EAccount *account, + MailView *mv) { mail_view_add_page (mv, MAIL_VIEW_ACCOUNT, account); } static MailViewChild * -mail_view_add_settings (MailView *mv, gpointer data, gboolean block) +mail_view_add_settings (MailView *mv, + gpointer data, + gboolean block) { MailSettingsView *msv = mail_settings_view_new (); gint position = 0; @@ -452,7 +474,9 @@ mail_view_add_account (MailView *mv, } MailViewChild * -mail_view_add_page (MailView *mv, guint16 type, gpointer data) +mail_view_add_page (MailView *mv, + guint16 type, + gpointer data) { MailViewChild *child = NULL, *current_child; gboolean block = FALSE; @@ -493,11 +517,12 @@ mail_view_add_page (MailView *mv, guint16 type, gpointer data) #ifndef ANJAL_SETTINGS static void -mv_switch_folder_view (MailView *mv, const gchar *uri) +mv_switch_folder_view (MailView *mv, + const gchar *uri) { - gint i=0, len = g_list_length (mv->priv->children); + gint i = 0, len = g_list_length (mv->priv->children); GList *tmp = mv->priv->children; - while (itype == MAIL_VIEW_FOLDER && !strcmp (uri, child->uri)) { @@ -515,9 +540,10 @@ mv_switch_folder_view (MailView *mv, const gchar *uri) } static MailConvView * -mv_switch_message_view (MailView *mv, const gchar *uri) +mv_switch_message_view (MailView *mv, + const gchar *uri) { - gint i=0; + gint i = 0; GList *tmp = mv->priv->children; while (tmp) { MailViewChild *child = tmp->data; @@ -535,7 +561,8 @@ mv_switch_message_view (MailView *mv, const gchar *uri) } void -mail_view_set_folder_uri (MailView *mv, const gchar *uri) +mail_view_set_folder_uri (MailView *mv, + const gchar *uri) { mv_switch_folder_view (mv, uri); @@ -551,21 +578,24 @@ mail_view_close_view (MailView *mv) } void -mail_view_set_folder_tree (MailView *mv, GtkWidget *tree) +mail_view_set_folder_tree (MailView *mv, + GtkWidget *tree) { mv->tree = tree; } #ifndef ANJAL_SETTINGS static void -mv_spinner_done (CamelFolder *f, gpointer data) +mv_spinner_done (CamelFolder *f, + gpointer data) { MailView *mv = (MailView *) data; mv_spinner_show (mv, FALSE); } void -mail_view_set_search (MailView *mv, const gchar *search) +mail_view_set_search (MailView *mv, + const gchar *search) { MailViewChild *child = (MailViewChild *) mv->priv->current_view; @@ -578,7 +608,8 @@ mail_view_set_search (MailView *mv, const gchar *search) #endif void -mail_view_set_shell_view (MailView *mv, EShellView *shell) +mail_view_set_shell_view (MailView *mv, + EShellView *shell) { mv->shell_view = shell; } diff --git a/capplet/settings/mail-view.h b/capplet/settings/mail-view.h index 6f814fd81e..3295cdb61c 100644 --- a/capplet/settings/mail-view.h +++ b/capplet/settings/mail-view.h @@ -36,7 +36,7 @@ #define MAIL_VIEW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), MAIL_VIEW_TYPE, MailViewClass)) enum { - MAIL_VIEW_FOLDER=1, + MAIL_VIEW_FOLDER = 1, MAIL_VIEW_COMPOSER, MAIL_VIEW_MESSAGE, MAIL_VIEW_ACCOUNT, @@ -60,12 +60,12 @@ typedef struct _MailView { typedef struct _MailViewClass { AnjalMailViewClass parent_class; - void (* view_new) (MailView*); + void (* view_new) (MailView *); } MailViewClass; typedef enum { - MAIL_VIEW_HOLD_FOCUS=1, + MAIL_VIEW_HOLD_FOCUS = 1, } MailViewFlags; typedef struct _MailViewChild { -- cgit v1.2.3 From 3f40452fed80a676a85f1b2d90bd8c29abee98b7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 6 Sep 2011 12:33:49 +0200 Subject: Bug #655564 - Express remembers settings of not finished account --- capplet/settings/mail-account-view.c | 8 ++++---- capplet/settings/mail-capplet-shell.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index 3e35276361..3617c6a866 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -719,8 +719,10 @@ mav_next_pressed (GtkButton *button, tmp = mail_account_pages[mav->current_page].create_page (mav); page->main = gtk_hbox_new (FALSE, 0); gtk_widget_show (page->main); - gtk_box_pack_start ((GtkBox *) page->main, tmp, FALSE, FALSE, 0); - gtk_widget_show (tmp); + if (tmp) { + gtk_box_pack_start ((GtkBox *) page->main, tmp, FALSE, FALSE, 0); + gtk_widget_show (tmp); + } gtk_box_pack_start ((GtkBox *) page->box, page->main, FALSE, FALSE, 3); if (mav->priv->is_gmail) { @@ -943,8 +945,6 @@ mav_construct_page (MailAccountView *view, } page->next = gtk_button_new (); gtk_widget_set_can_default (page->next, TRUE); - g_signal_connect (page->next, "hierarchy-changed", - G_CALLBACK (gtk_widget_grab_default), NULL); gtk_container_add ((GtkContainer *) page->next, box); gtk_widget_show_all (page->next); g_signal_connect (page->next, "clicked", G_CALLBACK(mav_next_pressed), view); diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index 47956cd782..dba46a804f 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -179,7 +179,7 @@ mail_capplet_shell_quit (MailCappletShell *shell) if (priv->main_loop) gtk_main_quit (); else - gtk_widget_hide ((GtkWidget *) shell); + gtk_widget_destroy ((GtkWidget *) shell); } static void -- cgit v1.2.3 From 7caabe92304734e3bfc60bdf2e9d36915367e5f0 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Thu, 13 Oct 2011 17:13:34 +0200 Subject: Migrate mail-account-view.c to GSettings --- capplet/anjal-settings-main.c | 1 - capplet/settings/mail-account-view.c | 42 +++++++++++++++++++++--------------- 2 files changed, 25 insertions(+), 18 deletions(-) (limited to 'capplet') diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c index 2bc3268b58..99e0b4a282 100644 --- a/capplet/anjal-settings-main.c +++ b/capplet/anjal-settings-main.c @@ -38,7 +38,6 @@ #include #include #include "settings/mail-capplet-shell.h" -#include #include #ifdef G_OS_WIN32 diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index 3617c6a866..35c561ed50 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -237,6 +237,29 @@ sanitize_user_mail (const gchar *user) } } +static void +add_selected_calendar (const gchar *uid) +{ + gchar **ids; + gint i; + GPtrArray *array; + GSettings *settings; + + settings = g_settings_new ("org.gnome.evolution.calendar"); + ids = g_settings_get_strv (settings, "selected-calendars"); + + array = g_ptr_array_new (); + for (i = 0; ids[i] != NULL; i++) + g_ptr_array_add (array, ids[i]); + g_ptr_array_add (array, uid); + g_ptr_array_add (array, NULL); + + g_settings_set_strv (settings, "selected-calendars", (const gchar* const *) array->pdata); + + g_ptr_array_free (array, TRUE); + g_object_unref (settings); +} + static void setup_yahoo_account (MailAccountView *mav) { @@ -250,7 +273,6 @@ setup_yahoo_account (MailAccountView *mav) ESourceGroup *sgrp; ESource *calendar; gchar *sanitize_uname, *abs_uri, *rel_uri; - GSList *ids, *temp; const gchar *email = e_account_get_string (em_account_editor_get_modified_account (mav->edit), E_ACCOUNT_ID_ADDRESS); slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources"); @@ -286,14 +308,7 @@ setup_yahoo_account (MailAccountView *mav) e_source_group_add_source (sgrp, calendar, -1); e_source_list_sync (slist, NULL); - ids = gconf_client_get_list (gconf, SELECTED_CALENDARS, GCONF_VALUE_STRING, NULL); - ids = g_slist_append (ids, g_strdup (e_source_peek_uid (calendar))); - gconf_client_set_list (gconf, SELECTED_CALENDARS, GCONF_VALUE_STRING, ids, NULL); - temp = ids; - - for (; temp != NULL; temp = g_slist_next (temp)) - g_free (temp->data); - g_slist_free (ids); + add_selected_calendar (e_source_peek_uid (calendar)); g_free (abs_uri); g_free (rel_uri); @@ -385,14 +400,7 @@ setup_google_accounts (MailAccountView *mav) e_source_list_sync (slist, NULL); - ids = gconf_client_get_list (gconf, SELECTED_CALENDARS, GCONF_VALUE_STRING, NULL); - ids = g_slist_append (ids, g_strdup (e_source_peek_uid (calendar))); - gconf_client_set_list (gconf, SELECTED_CALENDARS, GCONF_VALUE_STRING, ids, NULL); - temp = ids; - - for (; temp != NULL; temp = g_slist_next (temp)) - g_free (temp->data); - g_slist_free (ids); + add_selected_calendar (e_source_peek_uid (calendar)); g_free (abs_uri); g_free (rel_uri); -- cgit v1.2.3 From 65a7bac6c6d429b97659d4ceaf217a28d2dd2dee Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Thu, 13 Oct 2011 17:28:43 +0200 Subject: Last remainig bits that can migrated to GSettings in the capplet --- capplet/settings/mail-capplet-shell.c | 1 - 1 file changed, 1 deletion(-) (limited to 'capplet') diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index 91a82b6757..6567da02ac 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -30,7 +30,6 @@ #include #include #include -#include #include "mail-capplet-shell.h" #include "mail-view.h" #include -- cgit v1.2.3 From c75f58d01bb7bbe139cd73a85894dc5f50185816 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 18 Nov 2011 09:58:44 -0500 Subject: Fix compiler warnings. --- capplet/settings/mail-account-view.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'capplet') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index e6fd53b576..594744021b 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -250,7 +250,7 @@ add_selected_calendar (const gchar *uid) array = g_ptr_array_new (); for (i = 0; ids[i] != NULL; i++) g_ptr_array_add (array, ids[i]); - g_ptr_array_add (array, uid); + g_ptr_array_add (array, (gpointer) uid); g_ptr_array_add (array, NULL); g_settings_set_strv (settings, "selected-calendars", (const gchar* const *) array->pdata); @@ -369,7 +369,6 @@ setup_google_accounts (MailAccountView *mav) ESourceGroup *sgrp; ESource *calendar; gchar *sanitize_uname, *abs_uri, *rel_uri; - GSList *ids, *temp; slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources"); sgrp = e_source_list_ensure_group (slist, _("Google"), "google://", TRUE); -- cgit v1.2.3