diff options
Diffstat (limited to 'plugins')
42 files changed, 454 insertions, 322 deletions
diff --git a/plugins/addressbook-file/Makefile.am b/plugins/addressbook-file/Makefile.am index afe3453bc6..08401d45c8 100644 --- a/plugins/addressbook-file/Makefile.am +++ b/plugins/addressbook-file/Makefile.am @@ -7,15 +7,15 @@ plugin_LTLIBRARIES = liborg-gnome-addressbook-file.la liborg_gnome_addressbook_file_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) liborg_gnome_addressbook_file_la_SOURCES = addressbook-file.c liborg_gnome_addressbook_file_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_addressbook_file_la_LIBADD = \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) EXTRA_DIST = org-gnome-addressbook-file.eplug.xml diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am index 684d1d2b21..d6b1116693 100644 --- a/plugins/attachment-reminder/Makefile.am +++ b/plugins/attachment-reminder/Makefile.am @@ -14,9 +14,10 @@ liborg_gnome_evolution_attachment_reminder_la_CPPFLAGS = \ -I$(top_builddir)/composer \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" + $(GTKHTML_CFLAGS) liborg_gnome_evolution_attachment_reminder_la_SOURCES = attachment-reminder.c @@ -30,8 +31,9 @@ liborg_gnome_evolution_attachment_reminder_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = apps-evolution-attachment-reminder.schemas.in diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am index f813fa0edb..d5dc1a5a60 100644 --- a/plugins/audio-inline/Makefile.am +++ b/plugins/audio-inline/Makefile.am @@ -15,9 +15,10 @@ liborg_gnome_audio_inline_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - $(GSTREAMER_CFLAGS) + $(GSTREAMER_CFLAGS) \ + $(GTKHTML_CFLAGS) liborg_gnome_audio_inline_la_SOURCES = audio-inline.c @@ -26,9 +27,10 @@ liborg_gnome_audio_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_audio_inline_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GSTREAMER_LIBS) + $(GSTREAMER_LIBS) \ + $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-audio-inline.eplug.xml diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am index c4e033f733..05748c24c5 100644 --- a/plugins/backup-restore/Makefile.am +++ b/plugins/backup-restore/Makefile.am @@ -16,18 +16,18 @@ liborg_gnome_backup_restore_la_CPPFLAGS = \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(SHELL_CFLAGS) \ - $(E_UTIL_CFLAGS) + $(GTKHTML_CFLAGS) liborg_gnome_backup_restore_la_SOURCES = backup-restore.c liborg_gnome_backup_restore_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_backup_restore_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(SHELL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) privlibexec_PROGRAMS = evolution-backup evolution_backup_SOURCES = backup.c @@ -41,14 +41,12 @@ evolution_backup_CPPFLAGS = \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(SHELL_CFLAGS) \ - $(E_UTIL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) evolution_backup_LDADD = \ $(top_builddir)/e-util/libeutil.la \ - $(SHELL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) if OS_WIN32 diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c index f558b19c71..acef0ae223 100644 --- a/plugins/backup-restore/backup-restore.c +++ b/plugins/backup-restore/backup-restore.c @@ -47,12 +47,14 @@ #define localtime_r(timep, result) (localtime (timep) ? memcpy ((result), localtime (timep), sizeof (*(result))) : 0) #endif -gboolean e_plugin_ui_init (GtkUIManager *ui_manager, - EShellWindow *shell_window); - -GtkWidget * backup_restore_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data); -void backup_restore_commit (EPlugin *ep, EMConfigTargetAccount *target); -void backup_restore_abort (EPlugin *ep, EMConfigTargetAccount *target); +gboolean e_plugin_ui_init (GtkUIManager *ui_manager, + EShellWindow *shell_window); +GtkWidget * backup_restore_page (EPlugin *ep, + EConfigHookItemFactoryData *hook_data); +void backup_restore_commit (EPlugin *ep, + EMConfigTargetAccount *target); +void backup_restore_abort (EPlugin *ep, + EMConfigTargetAccount *target); typedef enum _br_flags { BR_OK = 1 << 0, @@ -73,9 +75,22 @@ backup (const gchar *filename, gboolean restart) { if (restart) - execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", "--restart", filename, (gchar *)NULL); + execl ( + EVOLUTION_TOOLSDIR "/evolution-backup", + "evolution-backup", + "--gui", + "--backup", + "--restart", + filename, + NULL); else - execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", filename, (gchar *)NULL); + execl ( + EVOLUTION_TOOLSDIR "/evolution-backup", + "evolution-backup", + "--gui", + "--backup", + filename, + NULL); } static void @@ -83,9 +98,22 @@ restore (const gchar *filename, gboolean restart) { if (restart) - execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", "--restart", filename, (gchar *)NULL); + execl ( + EVOLUTION_TOOLSDIR "/evolution-backup", + "evolution-backup", + "--gui", + "--restore", + "--restart", + filename, + NULL); else - execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", filename, (gchar *)NULL); + execl ( + EVOLUTION_TOOLSDIR "/evolution-backup", + "evolution-backup", + "--gui", + "--restore", + filename, + NULL); } static gboolean @@ -105,7 +133,9 @@ sanity_check (const gchar *filename) g_free (toolfname); #ifdef HAVE_SYS_WAIT_H - g_message ("Sanity check result %d:%d %d", WIFEXITED (result), WEXITSTATUS (result), result); + g_message ( + "Sanity check result %d:%d %d", + WIFEXITED (result), WEXITSTATUS (result), result); return WIFEXITED (result) && (WEXITSTATUS (result) == 0); #else @@ -137,7 +167,6 @@ dialog_prompt_user (GtkWindow *parent, container = e_alert_dialog_get_content_area (E_ALERT_DIALOG (dialog)); check = gtk_check_button_new_with_mnemonic (string); - /* We should hardcode this to true */ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE); gtk_box_pack_start (GTK_BOX (container), check, FALSE, FALSE, 0); gtk_widget_show (check); @@ -171,7 +200,9 @@ suggest_file_name (void) t = time (NULL); localtime_r (&t, &tm); - return g_strdup_printf ("evolution-backup-%04d%02d%02d.tar.gz", tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday); + return g_strdup_printf ( + "evolution-backup-%04d%02d%02d.tar.gz", + tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday); } static void @@ -232,7 +263,8 @@ action_settings_backup_cb (GtkAction *action, } else { e_alert_run_dialog_for_args ( GTK_WINDOW (shell_window), - "org.gnome.backup-restore:insufficient-permissions", NULL); + "org.gnome.backup-restore:insufficient-permissions", + NULL); } g_object_unref (file_info); @@ -277,30 +309,42 @@ action_settings_restore_cb (GtkAction *action, static void check_toggled (GtkToggleButton *button, - GtkAssistant *assistant) + GObject *assistant) { - GtkWidget *box = g_object_get_data ((GObject *)button, "box"); - gboolean state = gtk_toggle_button_get_active ((GtkToggleButton *) button); + EConfig *config; + GtkWidget *box; + gboolean active; + + active = gtk_toggle_button_get_active (button); + box = g_object_get_data (G_OBJECT (button), "box"); + gtk_widget_set_sensitive (box, active); - gtk_widget_set_sensitive (box, state); + g_object_set_data ( + assistant, "restore", + GINT_TO_POINTER (active ? 1 : 0)); - g_object_set_data ((GObject *)assistant, "restore", GINT_TO_POINTER (state?1:0)); + config = g_object_get_data (assistant, "restore-config"); - e_config_target_changed ((EConfig *) g_object_get_data ((GObject *)assistant, "restore-config"), E_CONFIG_TARGET_CHANGED_STATE); + e_config_target_changed ( + config, E_CONFIG_TARGET_CHANGED_STATE); } static void file_changed (GtkFileChooser *chooser, - GtkAssistant *assistant) + GObject *assistant) { + EConfig *config; gchar *file = NULL, *prevfile = NULL; file = gtk_file_chooser_get_filename (chooser); - prevfile = g_object_get_data ((GObject *)assistant, "restore-file"); - g_object_set_data ((GObject *)assistant, "restore-file", file); + prevfile = g_object_get_data (assistant, "restore-file"); + g_object_set_data (assistant, "restore-file", file); g_free (prevfile); - e_config_target_changed ((EConfig *) g_object_get_data ((GObject *)assistant, "restore-config"), E_CONFIG_TARGET_CHANGED_STATE); + config = g_object_get_data (assistant, "restore-config"); + + e_config_target_changed ( + config, E_CONFIG_TARGET_CHANGED_STATE); } static gboolean @@ -308,17 +352,18 @@ backup_restore_check (EConfig *ec, const gchar *pageid, gpointer data) { - GtkAssistant *assistant = data; - gint do_restore; + GObject *assistant = data; + gboolean do_restore; gchar *file; g_return_val_if_fail (data != NULL, FALSE); g_return_val_if_fail (GTK_IS_ASSISTANT (data), FALSE); - do_restore = GPOINTER_TO_INT (g_object_get_data ((GObject *)assistant, "restore")); - file = g_object_get_data ((GObject *)assistant, "restore-file"); + do_restore = (g_object_get_data (assistant, "restore") != NULL); + file = g_object_get_data (assistant, "restore-file"); - e_config_set_page_is_finish (ec, "0.startup_page.10.backup_restore", do_restore); + e_config_set_page_is_finish ( + ec, "0.startup_page.10.backup_restore", do_restore); return !do_restore || file; } @@ -328,60 +373,81 @@ backup_restore_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data) { GtkWidget *page, *hbox, *label, *cbox, *button; - GtkAssistant *assistant = GTK_ASSISTANT (hook_data->parent); + GObject *assistant = G_OBJECT (hook_data->parent); page = gtk_vbox_new (FALSE, 6); gtk_container_set_border_width (GTK_CONTAINER (page), 12); hbox = gtk_hbox_new (FALSE, 6); - label = gtk_label_new (_("You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc.")); - gtk_label_set_line_wrap ((GtkLabel *) label, TRUE); - gtk_label_set_single_line_mode ((GtkLabel *) label, FALSE); - gtk_box_pack_start ((GtkBox *) hbox, label, FALSE, FALSE, 6); - gtk_box_pack_start ((GtkBox *) page, hbox, FALSE, FALSE, 0); + label = gtk_label_new ( + _("You can restore Evolution from your backup. It can restore " + "all the Mails, Calendars, Tasks, Memos, Contacts. It also " + "restores all your personal settings, mail filters etc.")); + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); + gtk_label_set_single_line_mode (GTK_LABEL (label), FALSE); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 6); + gtk_box_pack_start (GTK_BOX (page), hbox, FALSE, FALSE, 0); hbox = gtk_hbox_new (FALSE, 6); - cbox = gtk_check_button_new_with_mnemonic (_("_Restore Evolution from the backup file")); - g_signal_connect (cbox, "toggled", G_CALLBACK (check_toggled), assistant); - gtk_box_pack_start ((GtkBox *) hbox, cbox, FALSE, FALSE, 6); - gtk_box_pack_start ((GtkBox *) page, hbox, FALSE, FALSE, 0); + cbox = gtk_check_button_new_with_mnemonic ( + _("_Restore Evolution from the backup file")); + g_signal_connect ( + cbox, "toggled", + G_CALLBACK (check_toggled), assistant); + gtk_box_pack_start (GTK_BOX (hbox), cbox, FALSE, FALSE, 6); + gtk_box_pack_start (GTK_BOX (page), hbox, FALSE, FALSE, 0); hbox = gtk_hbox_new (FALSE, 6); g_object_set_data ((GObject *)cbox, "box", hbox); - label = gtk_label_new (_("Please select an Evolution Archive to restore:")); - gtk_box_pack_start ((GtkBox *) hbox, label, FALSE, FALSE, 12); - - button = gtk_file_chooser_button_new (_("Choose a file to restore"), GTK_FILE_CHOOSER_ACTION_OPEN); - g_signal_connect (button, "selection-changed", G_CALLBACK (file_changed), assistant); - gtk_file_chooser_button_set_width_chars ((GtkFileChooserButton *) button, 20); - gtk_box_pack_start ((GtkBox *) hbox, button, FALSE, FALSE, 0); - gtk_box_pack_start ((GtkBox *) page, hbox, FALSE, FALSE, 0); + label = gtk_label_new ( + _("Please select an Evolution Archive to restore:")); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 12); + + button = gtk_file_chooser_button_new ( + _("Choose a file to restore"), + GTK_FILE_CHOOSER_ACTION_OPEN); + g_signal_connect ( + button, "selection-changed", + G_CALLBACK (file_changed), assistant); + gtk_file_chooser_button_set_width_chars ( + GTK_FILE_CHOOSER_BUTTON (button), 20); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (page), hbox, FALSE, FALSE, 0); gtk_widget_set_sensitive (hbox, FALSE); - gtk_assistant_append_page (assistant, page); - gtk_assistant_set_page_title (assistant, page, _("Restore from backup")); + gtk_assistant_append_page (GTK_ASSISTANT (assistant), page); + gtk_assistant_set_page_title ( + GTK_ASSISTANT (assistant), + page, _("Restore from backup")); gtk_widget_show_all (page); - g_object_set_data ((GObject *)assistant, "restore", GINT_TO_POINTER (FALSE)); - g_object_set_data ((GObject *)assistant, "restore-config", hook_data->config); + g_object_set_data (assistant, "restore", GINT_TO_POINTER (FALSE)); + g_object_set_data (assistant, "restore-config", hook_data->config); - e_config_add_page_check (hook_data->config, "0.startup_page.10.backup_restore", backup_restore_check, assistant); + e_config_add_page_check ( + hook_data->config, + "0.startup_page.10.backup_restore", + backup_restore_check, assistant); return GTK_WIDGET (page); } + void backup_restore_commit (EPlugin *ep, EMConfigTargetAccount *target) { - GtkWidget *assistant = target->target.config->widget; - gboolean state = GPOINTER_TO_INT (g_object_get_data ((GObject *)assistant, "restore")) ? TRUE : FALSE; - gchar *file = g_object_get_data ((GObject *)assistant, "restore-file"); - - if (state) { - if (!file || !sanity_check (file)) { - e_alert_run_dialog_for_args ((GtkWindow *) assistant, - "org.gnome.backup-restore:invalid-backup", - NULL); + GObject *assistant; + gchar *file; + + assistant = G_OBJECT (target->target.config->widget); + file = g_object_get_data (assistant, "restore-file"); + + if (g_object_get_data (assistant, "restore") != NULL) { + if (file == NULL || !sanity_check (file)) { + e_alert_run_dialog_for_args ( + GTK_WINDOW (assistant), + "org.gnome.backup-restore:invalid-backup", + NULL); } else { restore (file, TRUE); } diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index 370608ac2a..a234a9cf7f 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -90,7 +90,8 @@ static GOptionEntry options[] = { #define d(x) -#define print_and_run(x) G_STMT_START { g_message ("%s", x); system (x); } G_STMT_END +#define print_and_run(x) \ + G_STMT_START { g_message ("%s", x); system (x); } G_STMT_END static gboolean check (const gchar *filename, gboolean *is_new_format); @@ -308,7 +309,9 @@ backup (const gchar *filename, txt = _("Backing Evolution accounts and settings"); run_cmd ("gconftool-2 --dump " GCONF_DIR " > " EVOLUTION_DIR GCONF_DUMP_FILE); - replace_in_file (EVOLUTION_DIR GCONF_DUMP_FILE, e_get_user_data_dir (), EVOUSERDATADIR_MAGIC); + replace_in_file ( + EVOLUTION_DIR GCONF_DUMP_FILE, + e_get_user_data_dir (), EVOUSERDATADIR_MAGIC); write_dir_file (); @@ -321,7 +324,10 @@ backup (const gchar *filename, /* FIXME compression type?" */ /* FIXME date/time stamp?" */ /* FIXME backup location?" */ - command = g_strdup_printf ("cd $HOME && tar chf - $STRIPDATADIR $STRIPCONFIGDIR .camel_certs " EVOLUTION_DIR_FILE " | gzip > %s", quotedfname); + command = g_strdup_printf ( + "cd $HOME && tar chf - $STRIPDATADIR " + "$STRIPCONFIGDIR .camel_certs " EVOLUTION_DIR_FILE " | " + "gzip > %s", quotedfname); run_cmd (command); g_free (command); g_free (quotedfname); @@ -435,7 +441,9 @@ restore (const gchar *filename, GString *dir_fn; gchar *data_dir = NULL, *config_dir = NULL; - command = g_strdup_printf ("cd $TMP && tar xzf %s " EVOLUTION_DIR_FILE, quotedfname); + command = g_strdup_printf ( + "cd $TMP && tar xzf %s " + EVOLUTION_DIR_FILE, quotedfname); run_cmd (command); g_free (command); @@ -461,15 +469,20 @@ restore (const gchar *filename, g_mkdir_with_parents (e_get_user_data_dir (), 0700); g_mkdir_with_parents (e_get_user_config_dir (), 0700); - command = g_strdup_printf ("cd $DATADIR && tar xzf %s %s --strip-components=%d", quotedfname, data_dir, get_dir_level (data_dir)); + command = g_strdup_printf ( + "cd $DATADIR && tar xzf %s %s --strip-components=%d", + quotedfname, data_dir, get_dir_level (data_dir)); run_cmd (command); g_free (command); - command = g_strdup_printf ("cd $CONFIGDIR && tar xzf %s %s --strip-components=%d", quotedfname, config_dir, get_dir_level (config_dir)); + command = g_strdup_printf ( + "cd $CONFIGDIR && tar xzf %s %s --strip-components=%d", + quotedfname, config_dir, get_dir_level (config_dir)); run_cmd (command); g_free (command); - command = g_strdup_printf ("cd $HOME && tar xzf %s .camel_certs", quotedfname); + command = g_strdup_printf ( + "cd $HOME && tar xzf %s .camel_certs", quotedfname); run_cmd (command); g_free (command); @@ -478,7 +491,8 @@ restore (const gchar *filename, } else { run_cmd ("mv $HOME/.evolution $HOME/.evolution_old"); - command = g_strdup_printf ("cd $HOME && gzip -cd %s | tar xf -", quotedfname); + command = g_strdup_printf ( + "cd $HOME && gzip -cd %s | tar xf -", quotedfname); run_cmd (command); g_free (command); } @@ -492,14 +506,33 @@ restore (const gchar *filename, if (is_new_format) { /* new format has it in DATADIR... */ - replace_in_file (EVOLUTION_DIR GCONF_DUMP_FILE, EVOUSERDATADIR_MAGIC, e_get_user_data_dir ()); + replace_in_file ( + EVOLUTION_DIR GCONF_DUMP_FILE, + EVOUSERDATADIR_MAGIC, e_get_user_data_dir ()); run_cmd ("gconftool-2 --load " EVOLUTION_DIR GCONF_DUMP_FILE); run_cmd ("rm " EVOLUTION_DIR GCONF_DUMP_FILE); } else { + gchar *gconf_dump_file; + /* ... old format in ~/.evolution */ - replace_in_file ("$HOME/.evolution/" GCONF_DUMP_FILE, EVOUSERDATADIR_MAGIC, e_get_user_data_dir ()); - run_cmd ("gconftool-2 --load " "$HOME/.evolution/" GCONF_DUMP_FILE); - run_cmd ("rm " "$HOME/.evolution/" GCONF_DUMP_FILE); + gconf_dump_file = g_build_filename ( + "$HOME", ".evolution", GCONF_DUMP_FILE, NULL); + + replace_in_file ( + gconf_dump_file, + EVOUSERDATADIR_MAGIC, + e_get_user_data_dir ()); + + command = g_strconcat ( + "gconftool-2 --load ", gconf_dump_file, NULL); + run_cmd (command); + g_free (command); + + command = g_strconcat ("rm ", gconf_dump_file, NULL); + run_cmd (command); + g_free (command); + + g_free (gconf_dump_file); } if (g_cancellable_is_cancelled (cancellable)) @@ -519,7 +552,7 @@ restore (const gchar *filename, txt = _("Ensuring local sources"); - end: +end: if (restart_arg) { if (g_cancellable_is_cancelled (cancellable)) return; @@ -662,7 +695,8 @@ main (gint argc, { GCancellable *cancellable; gchar *file = NULL, *oper = NULL; - gint i; + const gchar *title = NULL; + gint ii; GError *error = NULL; #ifdef G_OS_WIN32 @@ -671,18 +705,26 @@ main (gint argc, typedef BOOL (WINAPI *t_SetDllDirectoryA) (LPCSTR lpPathName); t_SetDllDirectoryA p_SetDllDirectoryA; - p_SetDllDirectoryA = GetProcAddress (GetModuleHandle ("kernel32.dll"), "SetDllDirectoryA"); - if (p_SetDllDirectoryA) - (*p_SetDllDirectoryA) (""); + p_SetDllDirectoryA = GetProcAddress ( + GetModuleHandle ("kernel32.dll"), + "SetDllDirectoryA"); + + if (p_SetDllDirectoryA != NULL) + p_SetDllDirectoryA (""); } #ifndef _WIN64 { typedef BOOL (WINAPI *t_SetProcessDEPPolicy) (DWORD dwFlags); t_SetProcessDEPPolicy p_SetProcessDEPPolicy; - p_SetProcessDEPPolicy = GetProcAddress (GetModuleHandle ("kernel32.dll"), "SetProcessDEPPolicy"); + 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 #endif @@ -691,31 +733,32 @@ main (gint argc, bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); - g_thread_init (NULL); - gtk_init_with_args ( - &argc, &argv, NULL, options, (gchar *) GETTEXT_PACKAGE, &error); + &argc, &argv, NULL, options, GETTEXT_PACKAGE, &error); + if (error != NULL) { g_printerr ("%s\n", error->message); g_error_free (error); - exit (1); + exit (EXIT_FAILURE); } - if (opt_remaining) { - for (i = 0; i < g_strv_length (opt_remaining); i++) { + if (opt_remaining != NULL) { + for (ii = 0; ii < g_strv_length (opt_remaining); ii++) { if (backup_op) { + title = _("Evolution Back Up"); oper = _("Backing up to the folder %s"); - d(g_message ("Backing up to the folder %s", (gchar *) opt_remaining[i])); - bk_file = g_strdup ((gchar *) opt_remaining[i]); + d(g_message ("Backing up to the folder %s", (gchar *) opt_remaining[ii])); + bk_file = g_strdup ((gchar *) opt_remaining[ii]); file = bk_file; } else if (restore_op) { + title = _("Evolution Restore"); oper = _("Restoring from the folder %s"); - d(g_message ("Restoring from the folder %s", (gchar *) opt_remaining[i])); - res_file = g_strdup ((gchar *) opt_remaining[i]); + d(g_message ("Restoring from the folder %s", (gchar *) opt_remaining[ii])); + res_file = g_strdup ((gchar *) opt_remaining[ii]); file = res_file; } else if (check_op) { - d(g_message ("Checking %s", (gchar *) opt_remaining[i])); - chk_file = g_strdup ((gchar *) opt_remaining[i]); + d(g_message ("Checking %s", (gchar *) opt_remaining[ii])); + chk_file = g_strdup ((gchar *) opt_remaining[ii]); } } } @@ -732,15 +775,19 @@ main (gint argc, gtk_window_set_default_icon_name ("evolution"); - /* Backup / Restore only can have GUI. We should restrict the rest */ - progress_dialog = gtk_dialog_new_with_buttons (backup_op ? _("Evolution Back up"): _("Evolution Restore"), - NULL, - GTK_DIALOG_MODAL, - GTK_STOCK_CANCEL, - GTK_RESPONSE_REJECT, - NULL); + /* Backup / Restore only can have GUI. + * We should restrict the rest. */ + progress_dialog = gtk_dialog_new_with_buttons ( + title, NULL, + GTK_DIALOG_MODAL, + GTK_STOCK_CANCEL, + GTK_RESPONSE_REJECT, + NULL); - gtk_container_set_border_width (GTK_CONTAINER (progress_dialog), 12); + gtk_container_set_border_width ( + GTK_CONTAINER (progress_dialog), 12); + gtk_window_set_default_size ( + GTK_WINDOW (progress_dialog), 450, 120); action_area = gtk_dialog_get_action_area ( GTK_DIALOG (progress_dialog)); @@ -764,11 +811,14 @@ main (gint argc, gtk_box_pack_start ( GTK_BOX (content_area), container, FALSE, TRUE, 0); - widget = gtk_image_new_from_stock (GTK_STOCK_COPY, GTK_ICON_SIZE_DIALOG); + widget = gtk_image_new_from_stock ( + GTK_STOCK_COPY, GTK_ICON_SIZE_DIALOG); gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.0); gtk_widget_show (widget); - gtk_table_attach (GTK_TABLE (container), widget, 0, 1, 0, 3, GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); + gtk_table_attach ( + GTK_TABLE (container), widget, 0, 1, 0, 3, + GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); if (backup_op) { txt = _("Backing up Evolution Data"); @@ -777,53 +827,62 @@ main (gint argc, txt = _("Restoring Evolution Data"); txt2 = _("Please wait while Evolution is restoring your data."); } else { - /* do not translate these two, it's just a fallback when something goes wrong, - * we should never get here anyway. */ - txt = "Oops, doing nothing..."; - txt2 = "Should not be here now, really..."; + g_return_val_if_reached (EXIT_FAILURE); } - markup = g_strconcat ("<b><big>", txt, "</big></b>", NULL); - widget = gtk_label_new (NULL); + markup = g_markup_printf_escaped ("<b><big>%s</big></b>", txt); + widget = gtk_label_new (markup); gtk_label_set_line_wrap (GTK_LABEL (widget), FALSE); - gtk_label_set_markup (GTK_LABEL (widget), markup); + gtk_label_set_use_markup (GTK_LABEL (widget), TRUE); gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.0); gtk_widget_show (widget); g_free (markup); - gtk_table_attach (GTK_TABLE (container), widget, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); + gtk_table_attach ( + GTK_TABLE (container), widget, 1, 2, 0, 1, + GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); - markup = g_strconcat (txt2, " ", _("This may take a while depending on the amount of data in your account."), NULL); - widget = gtk_label_new (NULL); + markup = g_strconcat ( + txt2, " ", _("This may take a while depending " + "on the amount of data in your account."), NULL); + widget = gtk_label_new (markup); gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE); - gtk_label_set_markup (GTK_LABEL (widget), markup); gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5); gtk_widget_show (widget); g_free (markup); - gtk_table_attach (GTK_TABLE (container), widget, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); + gtk_table_attach ( + GTK_TABLE (container), widget, 1, 2, 1, 2, + GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); pbar = gtk_progress_bar_new (); - if (str) { - markup = g_strconcat ("<i>", str, "</i>", NULL); - widget = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (widget), markup); + if (str != NULL) { + markup = g_markup_printf_escaped ("<i>%s</i>", str); + widget = gtk_label_new (markup); + gtk_label_set_use_markup (GTK_LABEL (widget), TRUE); gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5); g_free (markup); g_free (str); - gtk_table_attach (GTK_TABLE (container), widget, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); + + gtk_table_attach ( + GTK_TABLE (container), widget, 1, 2, 2, 3, + GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); gtk_table_set_row_spacing (GTK_TABLE (container), 2, 6); - gtk_table_attach (GTK_TABLE (container), pbar, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); + gtk_table_attach ( + GTK_TABLE (container), pbar, 1, 2, 3, 4, + GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); } else - gtk_table_attach (GTK_TABLE (container), pbar, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); + gtk_table_attach ( + GTK_TABLE (container), pbar, 1, 2, 2, 3, + GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); - gtk_window_set_default_size ((GtkWindow *) progress_dialog, 450, 120); g_signal_connect ( progress_dialog, "response", G_CALLBACK (dlg_response), cancellable); gtk_widget_show_all (progress_dialog); + } else if (check_op) { /* For sanity we don't need gui */ check (chk_file, NULL); diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am index e4e9cdff03..e92d0549e6 100644 --- a/plugins/bbdb/Makefile.am +++ b/plugins/bbdb/Makefile.am @@ -16,9 +16,9 @@ liborg_gnome_evolution_bbdb_la_CPPFLAGS = \ -I$(top_builddir)/composer \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) + $(GTKHTML_CFLAGS) liborg_gnome_evolution_bbdb_la_SOURCES = bbdb.c bbdb.h gaimbuddies.c @@ -29,8 +29,9 @@ liborg_gnome_evolution_bbdb_la_LIBADD = \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-evolution-bbdb.eplug.xml diff --git a/plugins/caldav/Makefile.am b/plugins/caldav/Makefile.am index f75d1c0f4c..6d89204eff 100644 --- a/plugins/caldav/Makefile.am +++ b/plugins/caldav/Makefile.am @@ -3,25 +3,23 @@ plugin_DATA = org-gnome-evolution-caldav.eplug plugin_LTLIBRARIES = liborg-gnome-evolution-caldav.la -liborg_gnome_evolution_caldav_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -I . \ - -I$(top_srcdir) \ - -DCALDAV_UIDIR=\""$(uidir)"\" \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(LIBSOUP_CFLAGS) - -liborg_gnome_evolution_caldav_la_SOURCES = \ - caldav-source.c \ - caldav-browse-server.h \ +liborg_gnome_evolution_caldav_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -I . \ + -I$(top_srcdir) \ + -DCALDAV_UIDIR=\""$(uidir)"\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) + +liborg_gnome_evolution_caldav_la_SOURCES = \ + caldav-source.c \ + caldav-browse-server.h \ caldav-browse-server.c -liborg_gnome_evolution_caldav_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ +liborg_gnome_evolution_caldav_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EPLUGIN_LIBS) \ - $(LIBSOUP_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) liborg_gnome_evolution_caldav_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) diff --git a/plugins/calendar-file/Makefile.am b/plugins/calendar-file/Makefile.am index a4577e5019..c36053f550 100644 --- a/plugins/calendar-file/Makefile.am +++ b/plugins/calendar-file/Makefile.am @@ -7,9 +7,8 @@ plugin_LTLIBRARIES = liborg-gnome-calendar-file.la liborg_gnome_calendar_file_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(SOURCE_SEL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) liborg_gnome_calendar_file_la_SOURCES = calendar-file.c @@ -17,7 +16,7 @@ liborg_gnome_calendar_file_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_calendar_file_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_CALENDAR_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) EXTRA_DIST = org-gnome-calendar-file.eplug.xml diff --git a/plugins/calendar-http/Makefile.am b/plugins/calendar-http/Makefile.am index 54457c3c8b..7333fd31d5 100644 --- a/plugins/calendar-http/Makefile.am +++ b/plugins/calendar-http/Makefile.am @@ -7,9 +7,8 @@ plugin_LTLIBRARIES = liborg-gnome-calendar-http.la liborg_gnome_calendar_http_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(SOURCE_SEL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) liborg_gnome_calendar_http_la_SOURCES = calendar-http.c @@ -17,7 +16,7 @@ liborg_gnome_calendar_http_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_calendar_http_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_CALENDAR_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) EXTRA_DIST = org-gnome-calendar-http.eplug.xml diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am index 5cc4b8cd07..4283318ffb 100644 --- a/plugins/calendar-weather/Makefile.am +++ b/plugins/calendar-weather/Makefile.am @@ -9,11 +9,10 @@ liborg_gnome_calendar_weather_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(SOURCE_SEL_CFLAGS) \ -DWEATHER_DATADIR=\""$(weatherdatadir)"\" \ -DWEATHER_EDS_DATADIR=\""$(eds_datadir)/weather"\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) \ $(GWEATHER_CFLAGS) liborg_gnome_calendar_weather_la_SOURCES = calendar-weather.c @@ -21,9 +20,9 @@ liborg_gnome_calendar_weather_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED liborg_gnome_calendar_weather_la_LIBADD = \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(GWEATHER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GWEATHER_LIBS) EXTRA_DIST = \ org-gnome-calendar-weather.eplug.xml \ diff --git a/plugins/dbx-import/Makefile.am b/plugins/dbx-import/Makefile.am index ecd4890c37..67d5e0d5d3 100644 --- a/plugins/dbx-import/Makefile.am +++ b/plugins/dbx-import/Makefile.am @@ -1,9 +1,7 @@ if OS_WIN32 NO_UNDEFINED_REQUIRED_LIBS = \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(top_builddir)/e-util/libeutil.la endif @EVO_PLUGIN_RULE@ @@ -17,10 +15,9 @@ liborg_gnome_dbx_import_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_builddir) \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(CAMEL_CFLAGS) + $(GTKHTML_CFLAGS) liborg_gnome_dbx_import_la_SOURCES = dbx-importer.c @@ -30,11 +27,9 @@ liborg_gnome_dbx_import_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(CAMEL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CAMEL_LIBS) + $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-dbx-import.eplug.xml diff --git a/plugins/default-source/Makefile.am b/plugins/default-source/Makefile.am index f9778926bc..07efb18d20 100644 --- a/plugins/default-source/Makefile.am +++ b/plugins/default-source/Makefile.am @@ -7,10 +7,8 @@ plugin_LTLIBRARIES = liborg-gnome-default-source.la liborg_gnome_default_source_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ - $(SOURCE_SEL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) liborg_gnome_default_source_la_SOURCES = default-source.c @@ -19,8 +17,7 @@ liborg_gnome_default_source_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_default_source_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) EXTRA_DIST = org-gnome-default-source.eplug.xml diff --git a/plugins/default-source/default-source.c b/plugins/default-source/default-source.c index 62ebd4b2a5..c80aba39cd 100644 --- a/plugins/default-source/default-source.c +++ b/plugins/default-source/default-source.c @@ -55,7 +55,8 @@ e_plugin_lib_enable (EPlugin *ep, } static void -mark_default_source_in_list (ESourceList *source_list, ESource *source) +mark_default_source_in_list (ESourceList *source_list, + ESource *source) { GSList *g, *s; g_return_if_fail (source_list != NULL); @@ -106,7 +107,7 @@ commit_default_calendar (EPlugin *epl, if (source_list) { /* mark in the backend's source_list, to avoid race - with saving of two different source lists + * with saving of two different source lists */ mark_default_source_in_list (source_list, source); } else { @@ -139,7 +140,7 @@ commit_default_book (EPlugin *epl, if (source_list) { /* mark in the backend's source_list, to avoid race - with saving of two different source lists + * with saving of two different source lists */ mark_default_source_in_list (source_list, source); } else { diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am index 9778980b9f..d76a894cce 100644 --- a/plugins/email-custom-header/Makefile.am +++ b/plugins/email-custom-header/Makefile.am @@ -7,27 +7,27 @@ plugin_LTLIBRARIES = liborg-gnome-email-custom-header.la liborg_gnome_email_custom_header_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I. \ - -I$(top_srcdir) \ + -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ - -I$(top_builddir)/mail \ + -I$(top_builddir)/mail \ -I$(top_builddir)/composer \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - -DEVOLUTION_UIDIR=\""$(uidir)"\" \ - -DCONNECTOR_UIDIR=\""$(uidir)"\" + $(GTKHTML_CFLAGS) liborg_gnome_email_custom_header_la_SOURCES = \ email-custom-header.c \ - email-custom-header.h + email-custom-header.h liborg_gnome_email_custom_header_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) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) liborg_gnome_email_custom_header_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am index 02591aaebc..7f801d7d06 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -1,6 +1,5 @@ if OS_WIN32 NO_UNDEFINED_REQUIRED_LIBS = \ - $(EVOLUTION_MAIL_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la @@ -28,10 +27,9 @@ liborg_gnome_external_editor_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/composer \ -I$(top_srcdir)/widgets \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(SHELL_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - $(E_UTIL_CFLAGS) + $(GTKHTML_CFLAGS) liborg_gnome_external_editor_la_SOURCES = \ external-editor.c @@ -45,8 +43,9 @@ liborg_gnome_external_editor_la_LIBADD = \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = apps-evolution-external-editor.schemas.in diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am index c358f8df83..9c413dbb18 100644 --- a/plugins/face/Makefile.am +++ b/plugins/face/Makefile.am @@ -12,20 +12,20 @@ liborg_gnome_face_la_CPPFLAGS = \ -I$(top_srcdir)/widgets/misc \ -I$(top_builddir)/mail \ -I$(top_builddir)/composer \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - -DEVOLUTION_UIDIR=\""$(uidir)"\" \ - -DCONNECTOR_UIDIR=\""$(uidir)"\" + $(GTKHTML_CFLAGS) liborg_gnome_face_la_SOURCES = face.c -liborg_gnome_face_la_LIBADD = \ +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) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) liborg_gnome_face_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) diff --git a/plugins/google-account-setup/Makefile.am b/plugins/google-account-setup/Makefile.am index ed3ab93d5d..7380912a40 100644 --- a/plugins/google-account-setup/Makefile.am +++ b/plugins/google-account-setup/Makefile.am @@ -10,9 +10,8 @@ liborg_gnome_evolution_google_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -DCALDAV_UIDIR=\""$(uidir)"\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ $(GDATA_CFLAGS) liborg_gnome_evolution_google_la_SOURCES = \ @@ -23,8 +22,7 @@ liborg_gnome_evolution_google_la_SOURCES = \ liborg_gnome_evolution_google_la_LIBADD = \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EPLUGIN_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GDATA_LIBS) diff --git a/plugins/image-inline/Makefile.am b/plugins/image-inline/Makefile.am index 1c456e2d14..9cb4f9f242 100644 --- a/plugins/image-inline/Makefile.am +++ b/plugins/image-inline/Makefile.am @@ -9,7 +9,6 @@ liborg_gnome_image_inline_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ $(GTKIMAGEVIEW_CFLAGS) liborg_gnome_image_inline_la_SOURCES = image-inline.c @@ -20,7 +19,6 @@ liborg_gnome_image_inline_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(GTKIMAGEVIEW_LIBS) \ - $(EVOLUTION_MAIL_LIBS) \ $(GNOME_PLATFORM_LIBS) EXTRA_DIST = org-gnome-image-inline.eplug.xml diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am index de16f4e94d..3f492bf698 100644 --- a/plugins/imap-features/Makefile.am +++ b/plugins/imap-features/Makefile.am @@ -12,9 +12,8 @@ liborg_gnome_imap_features_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/mail \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - $(CAMEL_IMAP_CFLAGS) \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" @@ -23,7 +22,7 @@ liborg_gnome_imap_features_la_SOURCES = imap-headers.c liborg_gnome_imap_features_la_LIBADD= \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) liborg_gnome_imap_features_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) diff --git a/plugins/itip-formatter/Makefile.am b/plugins/itip-formatter/Makefile.am index 62346f4c17..793908ecad 100644 --- a/plugins/itip-formatter/Makefile.am +++ b/plugins/itip-formatter/Makefile.am @@ -7,9 +7,9 @@ liborg_gnome_itip_formatter_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) + $(GTKHTML_CFLAGS) liborg_gnome_itip_formatter_la_SOURCES = itip-formatter.c itip-view.c itip-view.h @@ -22,9 +22,9 @@ liborg_gnome_itip_formatter_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(CAMEL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) error_DATA = org-gnome-itip-formatter.error errordir = $(privdatadir)/errors diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index 189362c102..9ab5895c3d 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -2326,7 +2326,7 @@ view_response_cb (GtkWidget *widget, camel_message_info_free (mi); if (tag) { CamelStore *parent_store; - GSList *list = NULL; + GList *list = NULL; const gchar *full_name; gint i = 0, count; @@ -2339,7 +2339,7 @@ view_response_cb (GtkWidget *widget, if ( camel_message_info_user_tag (mi, "recurrence-key") && g_str_equal (camel_message_info_user_tag (mi, "recurrence-key"), tag)) { camel_folder_summary_remove_uid_fast (pitip->folder->summary, (gchar *)(mi->uid)); camel_folder_change_info_remove_uid (changes, (gchar *) mi->uid); - list = g_slist_prepend (list, (gpointer) mi->uid); + list = g_list_prepend (list, (gpointer) mi->uid); /* step back once to have the right index */ count--; @@ -2351,7 +2351,7 @@ view_response_cb (GtkWidget *widget, full_name = camel_folder_get_full_name (pitip->folder); parent_store = camel_folder_get_parent_store (pitip->folder); camel_db_delete_uids (parent_store->cdb_w, full_name, list, NULL); - g_slist_free (list); + g_list_free (list); } } else { /* Either not a recurring appointment or "apply-to-all" is not selected. So just delete this instance alone */ diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index 149e01b185..5163d25e02 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -411,19 +411,19 @@ set_calendar_sender_text (ItipView *view) if (priv->organizer_sentby) sender = dupe_first_bold (_("%s through %s has canceled the following meeting:"), organizer, priv->organizer_sentby); else - sender = dupe_first_bold (_("%s has canceled the following meeting."), organizer, NULL); + sender = dupe_first_bold (_("%s has canceled the following meeting:"), organizer, NULL); break; case ITIP_VIEW_MODE_COUNTER: if (priv->attendee_sentby) sender = dupe_first_bold (_("%s through %s has proposed the following meeting changes."), attendee, priv->attendee_sentby); else - sender = dupe_first_bold (_("%s has proposed the following meeting changes."), attendee, NULL); + sender = dupe_first_bold (_("%s has proposed the following meeting changes:"), attendee, NULL); break; case ITIP_VIEW_MODE_DECLINECOUNTER: if (priv->organizer_sentby) sender = dupe_first_bold (_("%s through %s has declined the following meeting changes:"), organizer, priv->organizer_sentby); else - sender = dupe_first_bold (_("%s has declined the following meeting changes."), organizer, NULL); + sender = dupe_first_bold (_("%s has declined the following meeting changes:"), organizer, NULL); break; default: break; diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index ed916e64ec..bcac34a81c 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -15,23 +15,25 @@ liborg_gnome_mail_notification_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ - $(CANBERRA_CFLAGS) + $(CANBERRA_CFLAGS) \ + $(GTKHTML_CFLAGS) liborg_gnome_mail_notification_la_SOURCES = mail-notification.c liborg_gnome_mail_notification_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_mail_notification_la_LIBADD = \ - $(CANBERRA_LIBS) \ - $(LIBNOTIFY_LIBS) \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(LIBNOTIFY_LIBS) \ + $(CANBERRA_LIBS) \ + $(GTKHTML_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = apps-evolution-mail-notification.schemas.in diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index 9639bc6908..d85987df55 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -37,7 +37,6 @@ #include <time.h> #include <e-util/e-config.h> -#include <e-util/e-account-utils.h> #include <e-util/gconf-bridge.h> #include <mail/e-mail-folder-utils.h> #include <mail/em-utils.h> diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am index c263702904..845a82c7a3 100644 --- a/plugins/mail-to-task/Makefile.am +++ b/plugins/mail-to-task/Makefile.am @@ -8,9 +8,9 @@ liborg_gnome_mail_to_task_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) + $(GTKHTML_CFLAGS) liborg_gnome_mail_to_task_la_SOURCES = mail-to-task.c @@ -23,9 +23,9 @@ liborg_gnome_mail_to_task_la_LIBADD = \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-mail-to-task.eplug.xml diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index 1d9f1fa0d0..810a2b593c 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -1131,10 +1131,12 @@ mail_to_event (ECalClientSourceType source_type, /* ask the user which tasks list to save to */ dialog = e_source_selector_dialog_new (NULL, source_list); - e_source_selector_dialog_select_default_source (E_SOURCE_SELECTOR_DIALOG (dialog)); + e_source_selector_dialog_select_default_source ( + E_SOURCE_SELECTOR_DIALOG (dialog)); if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) - source = e_source_selector_dialog_peek_primary_selection (E_SOURCE_SELECTOR_DIALOG (dialog)); + source = e_source_selector_dialog_peek_primary_selection ( + E_SOURCE_SELECTOR_DIALOG (dialog)); else source = NULL; diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am index c429a5ca84..77f6fdce6e 100644 --- a/plugins/mailing-list-actions/Makefile.am +++ b/plugins/mailing-list-actions/Makefile.am @@ -8,8 +8,9 @@ liborg_gnome_mailing_list_actions_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_builddir)/composer \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) + $(GTKHTML_CFLAGS) liborg_gnome_mailing_list_actions_la_SOURCES = mailing-list-actions.c @@ -20,8 +21,9 @@ liborg_gnome_mailing_list_actions_la_LIBADD = \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) error_DATA = org-gnome-mailing-list-actions.error errordir = $(privdatadir)/errors diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am index f868aa0bdb..c159b7af02 100644 --- a/plugins/mark-all-read/Makefile.am +++ b/plugins/mark-all-read/Makefile.am @@ -8,8 +8,9 @@ liborg_gnome_mark_all_read_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) + $(GTKHTML_CFLAGS) liborg_gnome_mark_all_read_la_SOURCES = mark-all-read.c @@ -19,8 +20,9 @@ liborg_gnome_mark_all_read_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-mark-all-read.eplug.xml diff --git a/plugins/prefer-plain/Makefile.am b/plugins/prefer-plain/Makefile.am index b747c55a69..5375da81fd 100644 --- a/plugins/prefer-plain/Makefile.am +++ b/plugins/prefer-plain/Makefile.am @@ -7,8 +7,8 @@ plugin_LTLIBRARIES = liborg-gnome-prefer-plain.la liborg_gnome_prefer_plain_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) liborg_gnome_prefer_plain_la_SOURCES = prefer-plain.c @@ -17,7 +17,7 @@ liborg_gnome_prefer_plain_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_prefer_plain_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/em-format/libemformat.la \ - $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) EXTRA_DIST = org-gnome-prefer-plain.eplug.xml diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am index 71b37a9d0f..1ded6e0f80 100644 --- a/plugins/pst-import/Makefile.am +++ b/plugins/pst-import/Makefile.am @@ -2,7 +2,6 @@ if OS_WIN32 NO_UNDEFINED_REQUIRED_LIBS = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_CALENDAR_LIBS) \ $(EVOLUTION_MAIL_LIBS) endif @@ -17,11 +16,10 @@ liborg_gnome_pst_import_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_builddir) \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(LIBPST_CFLAGS) \ - $(CAMEL_CFLAGS) + $(GTKHTML_CFLAGS) \ + $(LIBPST_CFLAGS) liborg_gnome_pst_import_la_SOURCES = pst-importer.c @@ -31,11 +29,10 @@ liborg_gnome_pst_import_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(LIBPST_LIBS) \ - $(CAMEL_LIBS) + $(GTKHTML_LIBS) \ + $(LIBPST_LIBS) EXTRA_DIST = org-gnome-pst-import.eplug.xml diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index b330a371ba..fc19d7a4fd 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -412,7 +412,9 @@ add_source_list_with_check (GtkWidget *frame, gtk_box_pack_end ((GtkBox *) hbox, combo, FALSE, FALSE, 0); - g_signal_connect (check, "toggled", G_CALLBACK (widget_sanitizer_cb), combo); + g_signal_connect ( + check, "toggled", + G_CALLBACK (widget_sanitizer_cb), combo); widget_sanitizer_cb (GTK_TOGGLE_BUTTON (check), combo); } @@ -472,10 +474,22 @@ org_credativ_evolution_readpst_getwidget (EImport *ei, gtk_box_pack_start ((GtkBox *) framebox, hbox, FALSE, FALSE, 0); - add_source_list_with_check (framebox, _("_Address Book"), E_CLIENT_SOURCE_TYPE_CONTACTS, G_CALLBACK (checkbox_addr_toggle_cb), target); - add_source_list_with_check (framebox, _("A_ppointments"), E_CLIENT_SOURCE_TYPE_EVENTS, G_CALLBACK (checkbox_appt_toggle_cb), target); - add_source_list_with_check (framebox, _("_Tasks"), E_CLIENT_SOURCE_TYPE_TASKS, G_CALLBACK (checkbox_task_toggle_cb), target); - add_source_list_with_check (framebox, _("_Journal entries"), E_CLIENT_SOURCE_TYPE_MEMOS, G_CALLBACK (checkbox_journal_toggle_cb), target); + add_source_list_with_check ( + framebox, _("_Address Book"), + E_CLIENT_SOURCE_TYPE_CONTACTS, + G_CALLBACK (checkbox_addr_toggle_cb), target); + add_source_list_with_check ( + framebox, _("A_ppointments"), + E_CLIENT_SOURCE_TYPE_EVENTS, + G_CALLBACK (checkbox_appt_toggle_cb), target); + add_source_list_with_check ( + framebox, _("_Tasks"), + E_CLIENT_SOURCE_TYPE_TASKS, + G_CALLBACK (checkbox_task_toggle_cb), target); + add_source_list_with_check ( + framebox, _("_Journal entries"), + E_CLIENT_SOURCE_TYPE_MEMOS, + G_CALLBACK (checkbox_journal_toggle_cb), target); gtk_widget_show_all (framebox); @@ -550,7 +564,8 @@ open_client (PstImporter *m, m->waiting_open++; - e_client_utils_open_new (source, source_type, FALSE, m->cancellable, + e_client_utils_open_new ( + source, source_type, FALSE, m->cancellable, e_client_utils_authenticate_handler, NULL, client_opened_cb, m); } diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am index 94c29f11b5..b19dc8d1a4 100644 --- a/plugins/publish-calendar/Makefile.am +++ b/plugins/publish-calendar/Makefile.am @@ -13,9 +13,9 @@ liborg_gnome_publish_calendar_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_builddir)/shell \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(E_UTIL_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ + $(LIBNOTIFY_CFLAGS) \ -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" \ -DEVOLUTION_UIDIR=\""$(uidir)"\" @@ -36,9 +36,9 @@ liborg_gnome_publish_calendar_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ - $(E_UTIL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(LIBNOTIFY_LIBS) EXTRA_DIST = \ org-gnome-publish-calendar.eplug.xml \ diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index c55782985c..1ce9f17e41 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -252,11 +252,7 @@ unmount_done_cb (GObject *source_object, { GError *error = NULL; -#if GLIB_CHECK_VERSION(2,21,3) g_mount_unmount_with_operation_finish (G_MOUNT (source_object), result, &error); -#else - g_mount_unmount_finish (G_MOUNT (source_object), result, &error); -#endif if (error) { g_warning ("Unmount failed: %s", error->message); @@ -305,11 +301,7 @@ mount_ready_cb (GObject *source_object, mount = g_file_find_enclosing_mount (G_FILE (source_object), NULL, NULL); if (mount) -#if GLIB_CHECK_VERSION(2,21,3) g_mount_unmount_with_operation (mount, G_MOUNT_UNMOUNT_NONE, NULL, NULL, unmount_done_cb, NULL); -#else - g_mount_unmount (mount, G_MOUNT_UNMOUNT_NONE, NULL, unmount_done_cb, NULL); -#endif g_object_unref (source_object); } diff --git a/plugins/publish-calendar/publish-calendar.ui b/plugins/publish-calendar/publish-calendar.ui index efd9613aec..88bce4265e 100644 --- a/plugins/publish-calendar/publish-calendar.ui +++ b/plugins/publish-calendar/publish-calendar.ui @@ -64,7 +64,7 @@ </columns> <data> <row> - <col id="0" translatable="yes">Secure FTP (SSH)</col> + <col id="0" translatable="yes">Secure FTP (SFTP)</col> </row> <row> <col id="0" translatable="yes">Public FTP</col> diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am index a4b7a4ef1c..982b6724ec 100644 --- a/plugins/save-calendar/Makefile.am +++ b/plugins/save-calendar/Makefile.am @@ -8,8 +8,8 @@ liborg_gnome_save_calendar_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) liborg_gnome_save_calendar_la_SOURCES = \ save-calendar.c \ @@ -22,7 +22,7 @@ liborg_gnome_save_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_save_calendar_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_CALENDAR_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) EXTRA_DIST = org-gnome-save-calendar.eplug.xml diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c index b5f1e283d0..ed9cf18bb6 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -45,6 +45,17 @@ static void add_string_to_rdf (xmlNodePtr node, const gchar *tag, const gchar *value); +/* Use { */ + +/* #include <calendar/gui/calendar-config-keys.h> */ +/* #include <calendar/gui/calendar-config.h> */ + +/* } or { */ +#define CALENDAR_CONFIG_PREFIX "/apps/evolution/calendar" +#define CALENDAR_CONFIG_TIMEZONE CALENDAR_CONFIG_PREFIX "/display/timezone" + +static GConfClient *config = NULL; + static gchar * calendar_config_get_timezone (void) { diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am index 9104b3eb07..a64a10e1dd 100644 --- a/plugins/templates/Makefile.am +++ b/plugins/templates/Makefile.am @@ -10,10 +10,9 @@ liborg_gnome_templates_la_CPPFLAGS = \ -I$(top_srcdir)/widgets \ -I$(top_builddir) \ -I$(top_builddir)/composer \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - -DEVOLUTION_UIDIR=\""$(uidir)"\" \ - -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" + $(GTKHTML_CFLAGS) liborg_gnome_templates_la_SOURCES = templates.c @@ -24,8 +23,9 @@ liborg_gnome_templates_la_LIBADD = \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = apps-evolution-template-placeholders.schemas.in diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am index 97240ce075..250453d740 100644 --- a/plugins/tnef-attachments/Makefile.am +++ b/plugins/tnef-attachments/Makefile.am @@ -1,7 +1,5 @@ if OS_WIN32 NO_UNDEFINED_REQUIRED_LIBS = \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la endif @@ -16,8 +14,9 @@ liborg_gnome_tnef_attachments_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(TNEF_CFLAGS) liborg_gnome_tnef_attachments_la_SOURCES = tnef-plugin.c @@ -27,8 +26,9 @@ liborg_gnome_tnef_attachments_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINE liborg_gnome_tnef_attachments_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/em-format/libemformat.la \ - $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) \ -lytnef EXTRA_DIST = org-gnome-tnef-attachments.eplug.xml diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am index f595145418..07b747af79 100644 --- a/plugins/vcard-inline/Makefile.am +++ b/plugins/vcard-inline/Makefile.am @@ -15,23 +15,23 @@ liborg_gnome_vcard_inline_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) + $(GTKHTML_CFLAGS) liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c liborg_gnome_vcard_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -liborg_gnome_vcard_inline_la_LIBADD = \ - $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/addressbook/util/libeabutil.la \ - $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \ - $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ - $(top_builddir)/addressbook/printing/libecontactprint.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) +liborg_gnome_vcard_inline_la_LIBADD = \ + $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/addressbook/util/libeabutil.la \ + $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \ + $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ + $(top_builddir)/addressbook/printing/libecontactprint.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-vcard-inline.eplug.xml diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c index 1b72958712..cfe461b163 100644 --- a/plugins/vcard-inline/vcard-inline.c +++ b/plugins/vcard-inline/vcard-inline.c @@ -119,14 +119,13 @@ org_gnome_vcard_inline_decode (VCardInlinePObject *vcard_object, } static void -org_gnome_vcard_inline_client_loaded_cb (GObject *source_object, +org_gnome_vcard_inline_client_loaded_cb (ESource *source, GAsyncResult *result, - gpointer user_data) + GSList *contact_list) { - ESource *source = E_SOURCE (source_object); EClient *client = NULL; EBookClient *book_client; - GSList *contact_list = user_data, *iter; + GSList *iter; GError *error = NULL; e_client_utils_open_new_finish (source, result, &client, &error); @@ -185,9 +184,11 @@ org_gnome_vcard_inline_save_cb (VCardInlinePObject *vcard_object) contact_list = e_client_util_copy_object_slist (NULL, vcard_object->contact_list); - e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL, - e_client_utils_authenticate_handler, NULL, - org_gnome_vcard_inline_client_loaded_cb, contact_list); + e_client_utils_open_new ( + source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, + NULL, e_client_utils_authenticate_handler, NULL, + (GAsyncReadyCallback) org_gnome_vcard_inline_client_loaded_cb, + contact_list); } static void diff --git a/plugins/webdav-account-setup/Makefile.am b/plugins/webdav-account-setup/Makefile.am index 305d4ff06d..d4d9d006aa 100644 --- a/plugins/webdav-account-setup/Makefile.am +++ b/plugins/webdav-account-setup/Makefile.am @@ -8,16 +8,15 @@ liborg_gnome_evolution_webdav_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I . \ -I$(top_srcdir) \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) liborg_gnome_evolution_webdav_la_SOURCES = \ webdav-contacts-source.c liborg_gnome_evolution_webdav_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(EPLUGIN_LIBS) \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) liborg_gnome_evolution_webdav_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) |