diff options
| author | monsta <[email protected]> | 2016-07-28 11:47:40 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-07-28 11:47:40 +0300 |
| commit | 0309e46b72b82b2cc6d9a355442e61f70865719b (patch) | |
| tree | a43008d8fc7172f3973c536b91b91251b6dd0f5e | |
| parent | 26d006bed0a52e487c7ad80977481362822a2107 (diff) | |
| download | pluma-0309e46b72b82b2cc6d9a355442e61f70865719b.tar.bz2 pluma-0309e46b72b82b2cc6d9a355442e61f70865719b.tar.xz | |
use GtkAboutDialog and get rid of build-dep on libmate-desktop
| -rw-r--r-- | configure.ac | 23 | ||||
| -rw-r--r-- | pluma/Makefile.am | 4 | ||||
| -rw-r--r-- | pluma/pluma-commands-help.c | 7 |
3 files changed, 1 insertions, 33 deletions
diff --git a/configure.ac b/configure.ac index 71c67341..2b8d9f5a 100644 --- a/configure.ac +++ b/configure.ac @@ -198,28 +198,6 @@ AC_SUBST(EGG_SMCLIENT_CFLAGS) AC_SUBST(EGG_SMCLIENT_LIBS) dnl ================================================================ -dnl Mate-desktop support -dnl ================================================================ - -MATEDESKTOP_REQUIRED=1.9.0 - -AC_ARG_WITH(matedesktop, - [AS_HELP_STRING([--without-matedesktop], - [Disable the use of matedesktop])], - [], - [with_matedesktop=yes]) - -AM_CONDITIONAL([WITH_MATEDESKTOP],[test "$with_matedesktop" = "yes"]) - -if test "$with_matedesktop" = "yes"; then - PKG_CHECK_MODULES([MATE_DESKTOP], mate-desktop-2.0 >= $MATEDESKTOP_REQUIRED) - AC_DEFINE([WITH_MATEDESKTOP],[1],[Define if mate-desktop support is enabled]) -fi - -AC_SUBST([MATE_DESKTOP_CFLAGS]) -AC_SUBST([MATE_DESKTOP_LIBS]) - -dnl ================================================================ dnl GSettings related settings dnl ================================================================ @@ -442,7 +420,6 @@ Configuration: Source code location: ${srcdir} Compiler: ${CC} GTK API version: $GTK_API_VERSION - MATE desktop Support: $with_matedesktop Python Plugins Support: $enable_python Spell Plugin enabled: $enable_enchant Gvfs metadata enabled: $enable_gvfs_metadata diff --git a/pluma/Makefile.am b/pluma/Makefile.am index 13a03742..01914351 100644 --- a/pluma/Makefile.am +++ b/pluma/Makefile.am @@ -10,7 +10,6 @@ AM_CPPFLAGS = \ -I$(srcdir) \ -I$(srcdir)/smclient \ $(PLUMA_CFLAGS) \ - $(MATE_DESKTOP_CFLAGS) \ $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ -DDATADIR=\""$(datadir)"\" \ @@ -27,8 +26,7 @@ libpluma_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_ libpluma_la_LIBADD = \ dialogs/libdialogs.la \ - smclient/libeggsmclient.la \ - $(MATE_DESKTOP_LIBS) + smclient/libeggsmclient.la # PLUMA_LIBS must be the last to ensure correct order on some platforms libpluma_la_LIBADD += $(PLUMA_LIBS) -lICE diff --git a/pluma/pluma-commands-help.c b/pluma/pluma-commands-help.c index 1f69a58e..88f4d8a7 100644 --- a/pluma/pluma-commands-help.c +++ b/pluma/pluma-commands-help.c @@ -37,9 +37,6 @@ #include <glib/gi18n.h> #include <gtk/gtk.h> -#ifdef WITH_MATEDESKTOP -#include <libmate-desktop/mate-aboutdialog.h> -#endif #include "pluma-commands.h" #include "pluma-debug.h" @@ -87,11 +84,7 @@ void _pluma_cmd_help_about(GtkAction* action, PlumaWindow* window) pluma_debug (DEBUG_COMMANDS); -#ifdef WITH_MATEDESKTOP - mate_show_about_dialog(GTK_WINDOW(window), -#else gtk_show_about_dialog(GTK_WINDOW(window), -#endif "program-name", "Pluma", "authors", authors, |