diff options
Diffstat (limited to 'plugins/pst-import')
| -rw-r--r-- | plugins/pst-import/Makefile.am | 15 | ||||
| -rw-r--r-- | plugins/pst-import/pst-importer.c | 27 |
2 files changed, 27 insertions, 15 deletions
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); } |