diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.ac | 32 | ||||
| -rw-r--r-- | sendto/caja-sendto.pc.in | 2 | ||||
| -rw-r--r-- | share/caja-share.c | 16 |
5 files changed, 10 insertions, 45 deletions
diff --git a/Makefile.am b/Makefile.am index 5a779ea..6ff345d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,8 +40,7 @@ DISTCLEANFILES = \ DISTCHECK_CONFIGURE_FLAGS = \ --enable-gtk-doc \ - --with-cajadir='$${libdir}/caja/extensions-2.0-distcheck' \ - --with-gtk=$(GTK_API_VERSION) + --with-cajadir='$${libdir}/caja/extensions-2.0-distcheck' # Build ChangeLog from GIT history ChangeLog: @@ -1,3 +1,5 @@ +1.17.0 + 1.16.0 * open-terminal: fix opening terminal in remote folders with single diff --git a/configure.ac b/configure.ac index 4392b97..4f1142f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([caja-extensions], 1.16.0, [https://github.com/mate-desktop/caja-extensions]) +AC_INIT([caja-extensions], 1.17.0, [https://github.com/mate-desktop/caja-extensions]) AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar check-news]) AC_CONFIG_HEADERS(config.h) @@ -10,9 +10,10 @@ AM_PROG_LIBTOOL AC_PROG_INSTALL AC_PROG_MAKE_SET -CAJA_REQUIRED=1.7.0 -LIBMATE_DESKTOP_REQUIRED=1.7.0 +CAJA_REQUIRED=1.17.1 +LIBMATE_DESKTOP_REQUIRED=1.17.0 GLIB_REQUIRED=2.36.0 +GTK_REQUIRED=3.14.0 GLIB_GSETTINGS @@ -32,26 +33,6 @@ fi GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` AC_SUBST(GLIB_GENMARSHAL) -AC_MSG_CHECKING([GTK+ version]) -AC_ARG_WITH([gtk], - [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])], - [case "$with_gtk" in - 2.0|3.0) ;; - *) AC_MSG_ERROR([invalid gtk version specified]) ;; - esac], - [with_gtk=2.0]) -AC_MSG_RESULT([$with_gtk]) - -case "$with_gtk" in - 2.0) GTK_API_VERSION=2.0 - GTK_REQUIRED=2.24.0 - ;; - 3.0) GTK_API_VERSION=3.0 - GTK_REQUIRED=3.0.0 - ;; -esac -AC_SUBST(GTK_API_VERSION) - # Common requirements PKG_CHECK_MODULES(CAJA, libcaja-extension >= $CAJA_REQUIRED) @@ -66,7 +47,7 @@ AC_ARG_ENABLE([image-converter], if test "x$enable_image-converter" = "xyes"; then PKG_CHECK_MODULES(IMAGE_CONVERTER, - gtk+-$GTK_API_VERSION >= $GTK_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED) AC_SUBST(IMAGE_CONVERTER_CFLAGS) @@ -107,7 +88,7 @@ if test "x$enable_sendto" = "xyes"; then gthread-2.0 >= $GTHREAD_REQUIRED gmodule-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED - gtk+-$GTK_API_VERSION >= $GTK_REQUIRED) + gtk+-3.0 >= $GTK_REQUIRED) AC_SUBST(SENDTO_CFLAGS) AC_SUBST(SENDTO_LIBS) @@ -354,7 +335,6 @@ caja-extensions-$VERSION: prefix: ${prefix} compiler: ${CC} caja-extension dir ${ac_with_cajadir} - Gtk+ version: ${GTK_API_VERSION} Plugins to be build: Image Converter: $enable_image_converter diff --git a/sendto/caja-sendto.pc.in b/sendto/caja-sendto.pc.in index 575631e..b0daabf 100644 --- a/sendto/caja-sendto.pc.in +++ b/sendto/caja-sendto.pc.in @@ -6,5 +6,5 @@ pluginsdir=@libdir@/caja-sendto/plugins Name: caja-sendto Description: Extend caja-sendto through plugins Version: @VERSION@ -Requires: glib-2.0 gmodule-2.0 gtk+-@GTK_API_VERSION@ +Requires: glib-2.0 gmodule-2.0 gtk+-3.0 Cflags: -I${includedir}/caja-sendto diff --git a/share/caja-share.c b/share/caja-share.c index 3c183bb..71d640b 100644 --- a/share/caja-share.c +++ b/share/caja-share.c @@ -441,18 +441,12 @@ get_fullpath_from_fileinfo(CajaFileInfo *fileinfo) static void property_page_set_warning (PropertyPage *page) { -#if GTK_CHECK_VERSION (3, 0, 0) GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (page->entry_share_name)); if (gtk_style_context_has_class (context, GTK_STYLE_CLASS_ERROR)) { gtk_style_context_remove_class (context, GTK_STYLE_CLASS_ERROR); } gtk_style_context_add_class (context, GTK_STYLE_CLASS_WARNING); -#else - GdkColor colorYellow; - gdk_color_parse ("#ECDF62", &colorYellow); - gtk_widget_modify_base (page->entry_share_name, GTK_STATE_NORMAL, &colorYellow); -#endif gtk_label_set_text (GTK_LABEL (page->label_status), _("Share name is too long")); } @@ -460,18 +454,12 @@ property_page_set_warning (PropertyPage *page) static void property_page_set_error (PropertyPage *page, const char *message) { -#if GTK_CHECK_VERSION (3, 0, 0) GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (page->entry_share_name)); if (gtk_style_context_has_class (context, GTK_STYLE_CLASS_WARNING)) { gtk_style_context_remove_class (context, GTK_STYLE_CLASS_WARNING); } gtk_style_context_add_class (context, GTK_STYLE_CLASS_ERROR); -#else - GdkColor colorRed; - gdk_color_parse ("#C1665A", &colorRed); - gtk_widget_modify_base (page->entry_share_name, GTK_STATE_NORMAL, &colorRed); -#endif gtk_label_set_text (GTK_LABEL (page->label_status), message); } @@ -479,7 +467,6 @@ property_page_set_error (PropertyPage *page, const char *message) static void property_page_set_normal (PropertyPage *page) { -#if GTK_CHECK_VERSION (3, 0, 0) GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (page->entry_share_name)); if (gtk_style_context_has_class (context, GTK_STYLE_CLASS_WARNING)) { @@ -490,9 +477,6 @@ property_page_set_normal (PropertyPage *page) { gtk_style_context_remove_class (context, GTK_STYLE_CLASS_ERROR); } -#else - gtk_widget_modify_base (page->entry_share_name, GTK_STATE_NORMAL, NULL); -#endif gtk_label_set_text (GTK_LABEL (page->label_status), ""); } |