commit - 25dd6ebbabbc2ce5a122d71a89c0b4fe40e7756b
commit + fae93e2bc6999859312a2f1e290c171d605b2c59
blob - 596f19353483f8052d1c3a6ebd81a015d5c6dc2c
blob + 70b6a49ba4b41fd76e2e6dc7a3e503824f1e006e
--- claws-features.h.in
+++ claws-features.h.in
@@ -1,6 +1,4 @@
-#undef HAVE_DIRENT_D_TYPE
 #undef HAVE_LIBETPAN
-#undef HAVE_STARTUP_NOTIFICATION
 #undef HAVE_VALGRIND
 #undef HAVE_SVG
 #undef USE_ENCHANT
blob - 736c8662af737fcc28dcb88c4e3113467915f0e1
blob + a154d6415ff59fa7a8ee45ed66e8347bdf82f101
--- configure.ac
+++ configure.ac
@@ -196,10 +196,6 @@ AC_ARG_ENABLE(enchant,
 		[  --disable-enchant               Do not build Enchant support for spell-checking],
 		[enable_enchant=$enableval], [enable_enchant=yes])
 
-AC_ARG_ENABLE(startup-notification,
-		[  --disable-startup-notification  Do not startup notification support],
-		[enable_startup_notification=$enableval], [enable_startup_notification=yes])
-
 AC_ARG_ENABLE(libetpan,
 		[  --disable-libetpan              Do not build libetpan support for IMAP4/NNTP],
 		[enable_libetpan=$enableval], [enable_libetpan=yes])
@@ -429,22 +425,6 @@ AC_SUBST(LIBRESOLV)
 
 LIBS="$LIBS $LIBRESOLV"
 
-if test "x$enable_startup_notification" = "xyes"; then
-	PKG_CHECK_MODULES(STARTUP_NOTIFICATION, pkg_info libstartup-notification-1.0 >= 0.5,
-	[
-		AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, [Define if we're using libstartup-notification.])
-		echo "Building with libstartup-notification"
-		enable_startup_notification=yes
-	],
-	[
-		echo "Building without libstartup-notification"
-		enable_startup_notification=no
-	])
-
-	AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
-	AC_SUBST(STARTUP_NOTIFICATION_LIBS)
-fi
-
 dnl Libetpan
 AC_MSG_CHECKING([whether to use libetpan])
 if test x"$enable_libetpan" = xyes; then
@@ -582,17 +562,6 @@ fi
 AC_SUBST(EXPAT_CFLAGS)
 AC_SUBST(EXPAT_LIBS)
 
-dnl libarchive *****************************************************************
-PKG_CHECK_MODULES(LIBARCHIVE, libarchive, HAVE_ARCHIVE=yes, HAVE_ARCHIVE=no)
-AC_SUBST(ARCHIVE_LIBS)
-AC_SUBST(ARCHIVE_CFLAGS)
-AC_CHECK_LIB([archive], [archive_read_new],
-		       ARCHIVE_LIBS=-larchive
-		       HAVE_ARCHIVE=yes
-		       AC_SUBST(ARCHIVE_LIBS,$ARCHIVE_CFLAGS),
-		       HAVE_ARCHIVE=no
-		       )
-
 dnl cairo **********************************************************************
 PKG_CHECK_MODULES(CAIRO, cairo >= 1.12.0, HAVE_CAIRO=yes, HAVE_CAIRO=no)
 AC_SUBST(CAIRO_CFLAGS)
@@ -603,11 +572,6 @@ PKG_CHECK_MODULES(FONTCONFIG, fontconfig, HAVE_FONTCON
 AC_SUBST(FONTCONFIG_CFLAGS)
 AC_SUBST(FONTCONFIG_LIBS)
 
-dnl libical ********************************************************************
-PKG_CHECK_MODULES(LIBICAL, libical >= 2.0, HAVE_LIBICAL=yes, HAVE_LIBICAL=no)
-AC_SUBST(LIBICAL_CFLAGS)
-AC_SUBST(LIBICAL_LIBS)
-
 dnl Gpgme **********************************************************************
 PKG_CHECK_MODULES(GPGME, [gpgme >= 1.1.1], HAVE_GPGME_PKGCONFIG=yes, HAVE_GPGME_PKGCONFIG=no)
 if test x"$HAVE_GPGME_PKGCONFIG" = xyes; then
@@ -623,22 +587,6 @@ else
 	HAVE_GPGME=no
 fi
 
-dnl libnotify ******************************************************************
-PKG_CHECK_MODULES(libnotify, libnotify >= 0.4.3, HAVE_LIBNOTIFY=yes, HAVE_LIBNOTIFY=no)
-if test x"$HAVE_LIBNOTIFY" = xyes; then
-	AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify support is enabled])
-fi
-AC_SUBST(libnotify_CFLAGS)
-AC_SUBST(libnotify_LIBS)
-
-dnl libcanberra-gtk3 ************************************************************
-PKG_CHECK_MODULES(libcanberra_gtk3, libcanberra-gtk3, HAVE_LIBCANBERRA_GTK=yes, HAVE_LIBCANBERRA_GTK=no)
-if test x"$HAVE_LIBCANBERRA_GTK" = xyes; then
-	AC_DEFINE(HAVE_LIBCANBERRA_GTK, 1, [Define if libcanberra-gtk3 support is enabled])
-fi
-AC_SUBST(libcanberra_gtk3_CFLAGS)
-AC_SUBST(libcanberra_gtk3_LIBS)
-
 AC_CONFIG_FILES([
 Makefile
 po/Makefile.in
@@ -672,7 +620,6 @@ echo "NNTP (libetpan)      : $enable_libetpan"
 echo "Manual               : $enable_manual"
 echo "SVG support          : $enable_svg"
 echo "Unit tests           : $enable_tests"
-echo "Startup notification : $enable_startup_notification"
 echo "Valgrind support     : $enable_valgrind"
 
 if test -n "$more_debug_output_modules"; then
blob - 28986a35b65cafa84ec61319148cbff98d08c0a7
blob + f8bd67bb4429af7e6e4cf0da96cd8a19494370fd
--- src/Makefile.am
+++ src/Makefile.am
@@ -486,7 +486,6 @@ claws_mail_LDADD = \
 	$(NETTLE_LIBS) \
 	-lpthread \
 	$(LIBICONV) \
-	$(STARTUP_NOTIFICATION_LIBS) \
 	$(LIBETPAN_LIBS) \
 	$(SVG_LIBS) \
 	-lfence
@@ -508,7 +507,6 @@ AM_CPPFLAGS = \
 	$(NETTLE_CFLAGS) \
 	$(GPGME_CFLAGS) \
 	$(LIBETPAN_CPPFLAGS) \
-	$(STARTUP_NOTIFICATION_CFLAGS) \
 	$(SVG_CFLAGS) \
 	$(VALGRIND_CFLAGS)
 
blob - 266d8f10141f048549b01441ad9dcabcbe0a9f4b
blob + 49a818719b02224d0e495454b772039ee2c1bb5c
--- src/main.c
+++ src/main.c
@@ -46,14 +46,6 @@
 #include <sys/file.h>
 #endif
 
-#ifdef HAVE_STARTUP_NOTIFICATION
-#ifdef GDK_WINDOWING_X11
-# define SN_API_NOT_YET_FROZEN
-# include <libsn/sn-launchee.h>
-# include <gdk/gdkx.h>
-#endif
-#endif
-
 #ifdef HAVE_VALGRIND
 #include <valgrind.h>
 #endif
@@ -134,11 +126,6 @@
 
 gchar *prog_version;
 
-#ifdef HAVE_STARTUP_NOTIFICATION
-static SnLauncheeContext *sn_context = NULL;
-static SnDisplay *sn_display = NULL;
-#endif
-
 static gint lock_socket = -1;
 static gint lock_socket_tag = 0;
 
@@ -219,50 +206,6 @@ static MainWindow *static_mainwindow;
 
 static gboolean emergency_exit = FALSE;
 
-#ifdef HAVE_STARTUP_NOTIFICATION
-static void sn_error_trap_push(SnDisplay *display, Display *xdisplay)
-{
-	gdk_error_trap_push();
-}
-
-static void sn_error_trap_pop(SnDisplay *display, Display *xdisplay)
-{
-	gdk_error_trap_pop();
-}
-
-static void startup_notification_complete(gboolean with_window)
-{
-	Display *xdisplay;
-	GtkWidget *hack = NULL;
-
-	if (with_window) {
-		/* this is needed to make the startup notification leave,
-		 * if we have been launched from a menu.
-		 * We have to display a window, so let it be very little */
-		hack = gtk_window_new(GTK_WINDOW_POPUP);
-		gtk_window_move(GTK_WINDOW(hack), 0, 0);
-		gtk_widget_set_size_request(hack, 1, 1);
-		gtk_widget_show(hack);
-	}
-
-	xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
-	sn_display = sn_display_new(xdisplay,
-				sn_error_trap_push,
-				sn_error_trap_pop);
-	sn_context = sn_launchee_context_new_from_environment(sn_display,
-						 DefaultScreen(xdisplay));
-
-	if (sn_context != NULL)	{
-		sn_launchee_context_complete(sn_context);
-		sn_launchee_context_unref(sn_context);
-		sn_display_unref(sn_display);
-	}
-	if (with_window) {
-		gtk_widget_destroy(hack);
-	}
-}
-#endif /* HAVE_STARTUP_NOTIFICATION */
-
 static void claws_gtk_idle(void)
 {
 	while(gtk_events_pending()) {
@@ -499,14 +442,6 @@ int main(int argc, char *argv[])
 	/* check and create unix domain socket for remote operation */
 	lock_socket = prohibit_duplicate_launch(&argc, &argv);
 	if (lock_socket < 0) {
-#ifdef HAVE_STARTUP_NOTIFICATION
-#ifdef GDK_WINDOWING_X11
-	if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
-		if (gtk_init_check(&argc, &argv))
-			startup_notification_complete(TRUE);
-	}
-#endif
-#endif
 		return 0;
 	}
 
@@ -769,14 +704,6 @@ int main(int argc, char *argv[])
 	}
 
 	static_mainwindow = mainwin;
-
-#ifdef HAVE_STARTUP_NOTIFICATION
-#ifdef GDK_WINDOWING_X11
-	if (GDK_IS_X11_DISPLAY(gdk_display_get_default()))
-		startup_notification_complete(FALSE);
-#endif
-#endif
-
 	folder_item_update_thaw();
 	folderview_thaw(mainwin->folderview);
 	main_window_cursor_normal(mainwin);