diff options
Diffstat (limited to 'plugins/publish-calendar')
| -rw-r--r-- | plugins/publish-calendar/Makefile.am | 10 | ||||
| -rw-r--r-- | plugins/publish-calendar/publish-calendar.c | 8 | ||||
| -rw-r--r-- | plugins/publish-calendar/publish-calendar.ui | 2 |
3 files changed, 6 insertions, 14 deletions
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> |