From 077c7326355dd2881e3a4686ccdf4c2a7446df4f Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Wed, 24 Mar 2010 09:56:20 +0000 Subject: Alter UI conditional syntax to be more familiar cpp style, which avoids the need for intltool changes. --- plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins') diff --git a/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml b/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml index 9cb3909f7a..d904d295d6 100644 --- a/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml +++ b/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml @@ -7,7 +7,7 @@ - +#if !EXPRESS @@ -28,11 +28,11 @@ - +#endif - +#if !EXPRESS @@ -46,7 +46,7 @@ - + @@ -61,8 +61,8 @@ - +#endif -- cgit v1.2.3 From a8333818241c60c0c111e7b7ac68ca80ec8fdb5d Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 23 Mar 2010 10:24:31 +0000 Subject: Alter UI conditional syntax to be more familiar cpp style, which avoids the need for intltool changes. --- plugins/bbdb/gaimbuddies.c | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins') diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c index 184c071e39..586f5083b7 100644 --- a/plugins/bbdb/gaimbuddies.c +++ b/plugins/bbdb/gaimbuddies.c @@ -40,6 +40,7 @@ #include #include +#undef EDS_DISABLE_DEPRECATED #include #include -- cgit v1.2.3 From 1d6ecf87aa0e54f07dcf462459dd26c4056b9fe2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 28 Mar 2010 18:54:27 -0400 Subject: Fix mismatched quotes. --- plugins/groupwise-features/share-folder-common.c | 2 +- plugins/profiler/profiler.c | 2 +- plugins/pst-import/pst-importer.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins') diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index 14e3b0e5bd..992664f863 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -138,7 +138,7 @@ struct _EMCreateFolder { static gchar * create_folder_desc (struct _EMCreateFolder *m) { - return g_strdup_printf (_("Creating folder `%s'"), m->full_name); + return g_strdup_printf (_("Creating folder '%s'"), m->full_name); } static void diff --git a/plugins/profiler/profiler.c b/plugins/profiler/profiler.c index b57ba83817..e3ecd07a9e 100644 --- a/plugins/profiler/profiler.c +++ b/plugins/profiler/profiler.c @@ -45,7 +45,7 @@ org_gnome_evolution_profiler_event(EPlugin *ep, EProfileEventTarget *t) name = g_strdup_printf("eprofile.%ld", (glong) getpid()); fp = fopen(name, "w"); if (fp) - fprintf(stderr, "Generating profiling data in `%s'\n", name); + fprintf(stderr, "Generating profiling data in '%s'\n", name); g_free(name); } diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index 7d2868042a..fa0b61e993 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -453,7 +453,7 @@ pst_import_file (PstImporter *m) filename = g_filename_from_uri (((EImportTargetURI *)m->target)->uri_src, NULL, NULL); m->parent_uri = g_strdup (((EImportTargetURI *)m->target)->uri_dest); /* Destination folder, was set in our widget */ - camel_operation_start (NULL, _("Importing `%s'"), filename); + camel_operation_start (NULL, _("Importing '%s'"), filename); if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-mail"))) { mail_tool_uri_to_folder (m->parent_uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex); @@ -559,7 +559,7 @@ pst_process_item (PstImporter *m, pst_desc_tree *d_ptr) if (item->folder != NULL) { pst_process_folder (m, item); - camel_operation_start (NULL, _("Importing `%s'"), item->file_as.str); + camel_operation_start (NULL, _("Importing '%s'"), item->file_as.str); } else { if (m->folder_count && (m->current_item < m->folder_count)) { camel_operation_progress (NULL, (m->current_item * 100) / m->folder_count); -- cgit v1.2.3 From f252d72685e281836fa10c60c01618d627d8c90c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 31 Mar 2010 18:05:32 -0400 Subject: More build fixes. --- plugins/bbdb/gaimbuddies.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'plugins') diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c index 586f5083b7..66f77bcc99 100644 --- a/plugins/bbdb/gaimbuddies.c +++ b/plugins/bbdb/gaimbuddies.c @@ -40,8 +40,6 @@ #include #include -#undef EDS_DISABLE_DEPRECATED -#include #include #include @@ -76,15 +74,29 @@ get_buddy_filename (void) static gchar * get_md5_as_string (const gchar *filename) { - guchar d[16]; + GMappedFile *mapped_file; + const gchar *contents; + gchar *digest; + gsize length; + GError *error = NULL; g_return_val_if_fail (filename != NULL, NULL); - md5_get_digest_from_file (filename, d); + mapped_file = g_mapped_file_new (filename, FALSE, &error); + if (mapped_file == NULL) { + g_warning ("%s", error->message); + return NULL; + } + + contents = g_mapped_file_get_contents (mapped_file); + length = g_mapped_file_get_length (mapped_file); + + digest = g_compute_checksum_for_data ( + G_CHECKSUM_MD5, (guchar *) contents, length); + + g_mapped_file_unref (mapped_file); - return g_strdup_printf ("%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x", - d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], - d[8], d[9], d[10], d[11], d[12], d[13], d[14], d[15]); + return digest; } void -- cgit v1.2.3 From 476bead4e5fce5b87ceb275a9b4861735f9d20da Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Fri, 9 Apr 2010 18:34:45 -0500 Subject: Hide the junk plugin options in Express mode Signed-off-by: Federico Mena Quintero --- plugins/bogo-junk-plugin/bf-junk-filter.c | 12 ++++++++++-- plugins/sa-junk-plugin/em-junk-filter.c | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) (limited to 'plugins') diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c index 6d315da575..4190eebe86 100644 --- a/plugins/bogo-junk-plugin/bf-junk-filter.c +++ b/plugins/bogo-junk-plugin/bf-junk-filter.c @@ -51,6 +51,7 @@ #include #include #include +#include "shell/e-shell.h" #ifndef BOGOFILTER_BINARY #define BOGOFILTER_BINARY "/usr/bin/bogofilter" @@ -388,6 +389,7 @@ convert_unicode_cb (GtkWidget *widget, gpointer data) GtkWidget * org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data) { + EShell *shell; GtkWidget *check; guint i = ((GtkTable *)data->parent)->nrows; @@ -399,7 +401,13 @@ org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFac gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), em_junk_bf_unicode); g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (convert_unicode_cb), (gpointer) "/apps/evolution/mail/junk/bogofilter/unicode"); gtk_table_attach((GtkTable *)data->parent, check, 0, 1, i, i+1, 0, 0, 0, 0); - gtk_widget_show (check); - return (GtkWidget *)check; + + shell = e_shell_get_default (); + if (e_shell_get_express_mode (shell)) + gtk_widget_hide (check); + else + gtk_widget_show (check); + + return check; } diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index c0b59891a1..c8c53c6169 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -47,6 +47,7 @@ #include #include "mail/em-config.h" +#include "shell/e-shell.h" #include @@ -926,6 +927,7 @@ use_remote_tests_cb (GtkWidget *widget, gpointer data) GtkWidget * org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data) { + EShell *shell; GtkWidget *check, *vbox, *label; gchar *text = g_strdup_printf (" %s", _("This will make SpamAssassin more reliable, but slower")); guint i = ((GtkTable *)data->parent)->nrows; @@ -944,7 +946,13 @@ org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFact gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), !em_junk_sa_local_only); g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (use_remote_tests_cb), (gpointer) "/apps/evolution/mail/junk/sa/local_only"); gtk_table_attach((GtkTable *)data->parent, vbox, 0, 1, i, i+1, 0, 0, 0, 0); - gtk_widget_show_all (vbox); - return (GtkWidget *)vbox; + + shell = e_shell_get_default (); + if (e_shell_get_express_mode (shell)) + gtk_widget_hide (vbox); + else + gtk_widget_show_all (vbox); + + return vbox; } -- cgit v1.2.3 From 1d0f31207f20f2a8e6a7cd47e152aae20e7303ed Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 17 Apr 2010 13:44:29 -0400 Subject: Bug 600861 - Backup utility should use --quit instead of --force-shutdown --- plugins/backup-restore/backup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins') diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index 9f7e70c5b2..dcaaa7e4fe 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -188,7 +188,7 @@ backup (const gchar *filename) CANCEL (complete); txt = _("Shutting down Evolution"); /* FIXME Will the versioned setting always work? */ - run_cmd (EVOLUTION " --force-shutdown"); + run_cmd (EVOLUTION " --quit"); run_cmd ("rm $HOME/.evolution/.running"); @@ -249,7 +249,7 @@ restore (const gchar *filename) /* FIXME Will the versioned setting always work? */ CANCEL (complete); txt = _("Shutting down Evolution"); - run_cmd (EVOLUTION " --force-shutdown"); + run_cmd (EVOLUTION " --quit"); CANCEL (complete); txt = _("Backup current Evolution data"); -- cgit v1.2.3 From ece7dcdcea82d0e1fbc104cf48b2928a449b8748 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 21 Apr 2010 14:34:46 +0100 Subject: Fix migration event hook for google-account-setup and calendar-weather plugins --- plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml | 2 +- plugins/google-account-setup/org-gnome-evolution-google.eplug.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins') diff --git a/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml b/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml index 89c0d307d0..17ba087058 100644 --- a/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml +++ b/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml @@ -28,7 +28,7 @@ - + diff --git a/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml b/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml index 8eefe3dfce..2148cb8b50 100644 --- a/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml +++ b/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml @@ -12,7 +12,7 @@ - + -- cgit v1.2.3 From a650f15f0090d68a503b5b11561bfb3cdb4663dc Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Thu, 22 Apr 2010 17:27:20 +0530 Subject: Store the initial view request and use that to decide whether to show startup wizard or not. Show only for mail and not calendar. --- plugins/startup-wizard/startup-wizard.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'plugins') diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index a38b2d9e9a..97d2297480 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -66,7 +66,15 @@ startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target) GSList *accounts; EConfig *config; EMAccountEditor *emae; + char *req_view; + req_view = e_shell_get_startup_view(e_shell_get_default()); + + if (req_view && strcmp (req_view, "mail") && e_shell_get_express_mode(e_shell_get_default())) { + return; + } + + client = gconf_client_get_default (); accounts = gconf_client_get_list (client, "/apps/evolution/mail/accounts", GCONF_VALUE_STRING, NULL); g_object_unref (client); -- cgit v1.2.3 From 67a696722330624af784302f11bbf1c3202690ec Mon Sep 17 00:00:00 2001 From: Cedric Bosdonnat Date: Mon, 26 Apr 2010 16:03:22 +0200 Subject: Bug #613392 - No copyright/licensing information for geo-utils --- plugins/contacts-map/geo-utils.c | 22 ++++++++++++++++++++++ plugins/contacts-map/geo-utils.h | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) (limited to 'plugins') diff --git a/plugins/contacts-map/geo-utils.c b/plugins/contacts-map/geo-utils.c index b44b926ef3..1168e38562 100644 --- a/plugins/contacts-map/geo-utils.c +++ b/plugins/contacts-map/geo-utils.c @@ -1,3 +1,25 @@ +/* + * 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: + * Cedric Bosdonnat + * + * Copyright (C) 2009 Cedric Bosdonnat (http://cedric.bosdonnat.free.fr) + * + */ + #include "geo-utils.h" static gboolean is_clutter_initialized = FALSE; diff --git a/plugins/contacts-map/geo-utils.h b/plugins/contacts-map/geo-utils.h index 4560ed0b1a..c830151761 100644 --- a/plugins/contacts-map/geo-utils.h +++ b/plugins/contacts-map/geo-utils.h @@ -1,3 +1,25 @@ +/* + * 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: + * Cedric Bosdonnat + * + * Copyright (C) 2009 Cedric Bosdonnat (http://cedric.bosdonnat.free.fr) + * + */ + #include #include -- cgit v1.2.3 From 92d3fcc8540110960d95639d4a55f70cf0e079e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Mon, 26 Apr 2010 16:44:58 +0200 Subject: Fix linking of face plugin --- plugins/face/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins') diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am index 240dc3a8d0..c358f8df83 100644 --- a/plugins/face/Makefile.am +++ b/plugins/face/Makefile.am @@ -21,6 +21,7 @@ liborg_gnome_face_la_SOURCES = face.c liborg_gnome_face_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/mail/libevolution-mail.la \ $(EVOLUTION_MAIL_LIBS) \ -- cgit v1.2.3 From 9d2f9cf86181c834c413e6611a0a7b1ad43dd4a5 Mon Sep 17 00:00:00 2001 From: Cedric Bosdonnat Date: Mon, 26 Apr 2010 16:03:22 +0200 Subject: Bug #613392 - No copyright/licensing information for geo-utils --- plugins/contacts-map/geo-utils.c | 22 ++++++++++++++++++++++ plugins/contacts-map/geo-utils.h | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) (limited to 'plugins') diff --git a/plugins/contacts-map/geo-utils.c b/plugins/contacts-map/geo-utils.c index b44b926ef3..1168e38562 100644 --- a/plugins/contacts-map/geo-utils.c +++ b/plugins/contacts-map/geo-utils.c @@ -1,3 +1,25 @@ +/* + * 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: + * Cedric Bosdonnat + * + * Copyright (C) 2009 Cedric Bosdonnat (http://cedric.bosdonnat.free.fr) + * + */ + #include "geo-utils.h" static gboolean is_clutter_initialized = FALSE; diff --git a/plugins/contacts-map/geo-utils.h b/plugins/contacts-map/geo-utils.h index 4560ed0b1a..c830151761 100644 --- a/plugins/contacts-map/geo-utils.h +++ b/plugins/contacts-map/geo-utils.h @@ -1,3 +1,25 @@ +/* + * 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: + * Cedric Bosdonnat + * + * Copyright (C) 2009 Cedric Bosdonnat (http://cedric.bosdonnat.free.fr) + * + */ + #include #include -- cgit v1.2.3 From d9ed3824243be6def9dd3e899649406ab659291e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Mon, 26 Apr 2010 16:44:58 +0200 Subject: Fix linking of face plugin --- plugins/face/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins') diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am index 240dc3a8d0..c358f8df83 100644 --- a/plugins/face/Makefile.am +++ b/plugins/face/Makefile.am @@ -21,6 +21,7 @@ liborg_gnome_face_la_SOURCES = face.c liborg_gnome_face_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/mail/libevolution-mail.la \ $(EVOLUTION_MAIL_LIBS) \ -- cgit v1.2.3 From 20fe637c8becfb356f682c1bcaf40f3790b1a9bf Mon Sep 17 00:00:00 2001 From: Vibha Yadav Date: Fri, 21 May 2010 11:12:16 +0530 Subject: Bug #531013 - Proxy login window is not in focus. Grab focus for the Proxy Login window. --- plugins/groupwise-features/proxy-login.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'plugins') diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index bf23e17d82..f85bc2b946 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -486,6 +486,7 @@ gw_proxy_login_cb (GtkAction *action, EShellView *shell_view) GtkTreeSelection *selection; GtkTreeModel *model = NULL; GtkTreeIter iter; + GtkWidget *tbox_account_name; gboolean is_store = FALSE; gchar *uri = NULL; proxyLoginPrivate *priv; @@ -528,6 +529,8 @@ gw_proxy_login_cb (GtkAction *action, EShellView *shell_view) ); proxy_login_setup_tree_view (); proxy_login_update_tree (); + tbox_account_name = e_builder_get_widget (priv->builder, "account_name"); + gtk_widget_grab_focus (tbox_account_name); g_signal_connect (GTK_DIALOG (priv->main), "response", G_CALLBACK(proxy_login_cb), e_shell_view_get_shell_window (shell_view)); gtk_widget_show (GTK_WIDGET (priv->main)); -- cgit v1.2.3 From 3e1b34841d3a699f77848f5de019f18ccb2d1ca1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 25 May 2010 09:41:48 -0400 Subject: Fix compiler warnings. --- plugins/startup-wizard/startup-wizard.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'plugins') diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index 97d2297480..77be99f80f 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -60,17 +60,19 @@ startup_wizard_close (void) { void startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target) { + EShell *shell; GtkWidget *start_page; GtkLabel *start_page_label; GConfClient *client; GSList *accounts; EConfig *config; EMAccountEditor *emae; - char *req_view; + const gchar *req_view; - req_view = e_shell_get_startup_view(e_shell_get_default()); + shell = e_shell_get_default (); + req_view = e_shell_get_startup_view (shell); - if (req_view && strcmp (req_view, "mail") && e_shell_get_express_mode(e_shell_get_default())) { + if (req_view && strcmp (req_view, "mail") && e_shell_get_express_mode (shell)) { return; } @@ -86,7 +88,7 @@ startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target) return; } - if (e_shell_get_express_mode (e_shell_get_default ())) { + if (e_shell_get_express_mode (shell)) { start_page = (GtkWidget *)mail_capplet_shell_new (0, TRUE, TRUE); gtk_widget_show (start_page); -- cgit v1.2.3 From 96538878911586a9e9ca26b81e1916c04e538980 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 25 May 2010 10:15:32 -0400 Subject: Coding style and whitespace cleanup. --- plugins/startup-wizard/startup-wizard.c | 1 - 1 file changed, 1 deletion(-) (limited to 'plugins') diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index 77be99f80f..f6e5dcc34e 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -76,7 +76,6 @@ startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target) return; } - client = gconf_client_get_default (); accounts = gconf_client_get_list (client, "/apps/evolution/mail/accounts", GCONF_VALUE_STRING, NULL); g_object_unref (client); -- cgit v1.2.3