[Xfce4-commits] [xfce/exo] 01/02: Install helpers in exo-2 paths

noreply at xfce.org noreply at xfce.org
Fri Mar 29 03:28:42 CET 2019 

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/exo.

commit de2d50f242299b8d6ea9945b91eff23585e6f091
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Thu Mar 28 21:29:41 2019 -0400

    Install helpers in exo-2 paths
---
 .gitignore                                               | 15 +++++++++++++++
 configure.ac.in                                          |  3 +++
 exo-helper/Makefile.am                                   | 16 ++++++++--------
 exo-helper/exo-preferred-applications.in                 |  2 +-
 exo-helper/helpers/Makefile.am                           | 10 ++++++----
 exo-helper/helpers/balsa.desktop.in.in                   |  2 +-
 exo-helper/helpers/evolution.desktop.in.in               |  2 +-
 .../helpers/{exo-compose-mail-1 => exo-compose-mail-2}   |  2 +-
 exo-helper/helpers/geary.desktop.in.in                   |  2 +-
 exo-helper/helpers/icedove.desktop.in.in                 |  2 +-
 exo-helper/helpers/kmail.desktop.in.in                   |  2 +-
 exo-helper/helpers/mozilla-mailer.desktop.in.in          |  2 +-
 exo-helper/helpers/mutt.desktop.in.in                    |  2 +-
 exo-helper/helpers/sylpheed-claws.desktop.in.in          |  2 +-
 exo-helper/helpers/sylpheed.desktop.in.in                |  2 +-
 exo-helper/helpers/thunderbird.desktop.in.in             |  2 +-
 exo/Makefile.am                                          |  3 ++-
 exo/exo-2.pc.in                                          |  2 +-
 exo/exo-execute.c                                        |  2 +-
 exo/exo-thumbnail-preview.c                              |  2 +-
 pixmaps/Makefile.am                                      |  2 +-
 21 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index f01a6fd..cbdeb73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.vscode
+
 # Files generated by autogen.sh
 INSTALL
 aclocal.m4
@@ -42,6 +44,7 @@ exo/stamp-exo-marshal.h
 exo-csource/exo-csource
 exo-desktop-item-edit/exo-desktop-item-edit
 exo-helper/exo-helper-1
+exo-helper/exo-helper-2
 exo-helper/exo-helper-enum-types.c
 exo-helper/exo-helper-enum-types.h
 exo-helper/exo-preferred-applications
@@ -64,4 +67,16 @@ tests/test-exo-wrap-table
 *.stamp
 exo-*.tar.bz2
 *.tgz
+docs/reference/exo-decl-list.txt
+docs/reference/exo-decl.txt
+docs/reference/exo-undeclared.txt
+docs/reference/exo-undocumented.txt
+docs/reference/exo-unused.txt
+docs/reference/exo.args
+docs/reference/exo.hierarchy
+docs/reference/exo.interfaces
+docs/reference/exo.prerequisites
+docs/reference/exo.signals
+docs/reference/html/
+docs/reference/xml/
 
diff --git a/configure.ac.in b/configure.ac.in
index 2bf9dcc..9281a9e 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -10,6 +10,7 @@ dnl *** Version information ***
 dnl ***************************
 m4_define([libexo_verinfo], [1:0:1])
 m4_define([libexo_version_api], [1])
+m4_define([libexo2_version_api], [2])
 m4_define([libexo_version_major], [0])
 m4_define([libexo_version_minor], [12])
 m4_define([libexo_version_micro], [4])
@@ -57,10 +58,12 @@ dnl ****************************
 dnl *** Subst libexo version ***
 dnl ****************************
 LIBEXO_VERSION_API=libexo_version_api()
+LIBEXO2_VERSION_API=libexo2_version_api()
 LIBEXO_VERSION_MAJOR=libexo_version_major()
 LIBEXO_VERSION_MINOR=libexo_version_minor()
 LIBEXO_VERSION_MICRO=libexo_version_micro()
 AC_SUBST([LIBEXO_VERSION_API])
+AC_SUBST([LIBEXO2_VERSION_API])
 AC_SUBST([LIBEXO_VERSION_MAJOR])
 AC_SUBST([LIBEXO_VERSION_MINOR])
 AC_SUBST([LIBEXO_VERSION_MICRO])
diff --git a/exo-helper/Makefile.am b/exo-helper/Makefile.am
index 0c4f9de..635bd68 100644
--- a/exo-helper/Makefile.am
+++ b/exo-helper/Makefile.am
@@ -9,10 +9,10 @@ AM_CPPFLAGS = 								\
 	-DG_LOG_DOMAIN=\"exo-helper\"					\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
 
-exo_helperdir = $(HELPER_PATH_PREFIX)/xfce4/exo-$(LIBEXO_VERSION_API)
+exo_helperdir = $(HELPER_PATH_PREFIX)/xfce4/exo-$(LIBEXO2_VERSION_API)
 
 exo_helper_PROGRAMS = \
-	exo-helper-1
+	exo-helper-2
 
 exo_helper_built_sources =						\
 	exo-helper-enum-types.c						\
@@ -21,7 +21,7 @@ exo_helper_built_sources =						\
 exo_helper_headers =							\
 	exo-helper.h
 
-exo_helper_1_SOURCES =						\
+exo_helper_2_SOURCES =						\
 	$(exo_helper_built_sources)					\
 	$(exo_helper_headers)						\
 	exo-helper-chooser-dialog.c					\
@@ -35,15 +35,15 @@ exo_helper_1_SOURCES =						\
 	exo-helper.c							\
 	main.c
 
-exo_helper_1_CFLAGS =							\
+exo_helper_2_CFLAGS =							\
 	$(GTK3_CFLAGS)							\
 	$(LIBXFCE4UTIL_CFLAGS)						\
 	$(LIBXFCE4UI2_CFLAGS)
 
-exo_helper_1_DEPENDENCIES =						\
+exo_helper_2_DEPENDENCIES =						\
 	$(top_builddir)/exo/libexo-2.la
 
-exo_helper_1_LDADD =							\
+exo_helper_2_LDADD =							\
 	$(GTK3_LIBS)							\
 	$(LIBXFCE4UTIL_LIBS)						\
 	$(LIBXFCE4UI2_LIBS)						\
@@ -53,8 +53,8 @@ bin_SCRIPTS =								\
 	exo-preferred-applications
 
 exo-preferred-applications: Makefile $(srcdir)/exo-preferred-applications.in
-	sed -e 's, at HELPERDIR\@,$(HELPER_PATH_PREFIX)/xfce4/exo-$(LIBEXO_VERSION_API),g' \
-	    -e 's, at LIBEXO_VERSION_API\@,$(LIBEXO_VERSION_API),g' 	\
+	sed -e 's, at HELPERDIR\@,$(HELPER_PATH_PREFIX)/xfce4/exo-$(LIBEXO2_VERSION_API),g' \
+	    -e 's, at LIBEXO2_VERSION_API\@,$(LIBEXO2_VERSION_API),g' 	\
 	    < $(srcdir)/exo-preferred-applications.in			\
 	    > exo-preferred-applications
 
diff --git a/exo-helper/exo-preferred-applications.in b/exo-helper/exo-preferred-applications.in
index ce857bd..4c53127 100644
--- a/exo-helper/exo-preferred-applications.in
+++ b/exo-helper/exo-preferred-applications.in
@@ -8,4 +8,4 @@
 # Browser, Mail Reader and Terminal Emulator.
 #
 
-exec @HELPERDIR@/exo-helper- at LIBEXO_VERSION_API@ --configure "$@"
+exec @HELPERDIR@/exo-helper- at LIBEXO2_VERSION_API@ --configure "$@"
diff --git a/exo-helper/helpers/Makefile.am b/exo-helper/helpers/Makefile.am
index ce342ef..2fde669 100644
--- a/exo-helper/helpers/Makefile.am
+++ b/exo-helper/helpers/Makefile.am
@@ -62,12 +62,14 @@ desktop_in_in_files =							\
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 %.desktop.in: %.desktop.in.in
-	sed -e 's,\@HELPERDIR\@,$(HELPER_PATH_PREFIX)/xfce4/exo-$(LIBEXO_VERSION_API),g' < $< > $@
+	sed -e 's,\@HELPERDIR\@,$(HELPER_PATH_PREFIX)/xfce4/exo-$(LIBEXO2_VERSION_API),g' \
+	    -e 's, at LIBEXO2_VERSION_API\@,$(LIBEXO2_VERSION_API),g' \
+		< $< > $@
 @INTLTOOL_DESKTOP_RULE@
 
-exo_composedir = $(HELPER_PATH_PREFIX)/xfce4/exo-$(LIBEXO_VERSION_API)
+exo_composedir = $(HELPER_PATH_PREFIX)/xfce4/exo-$(LIBEXO2_VERSION_API)
 exo_compose_SCRIPTS =							\
-	exo-compose-mail-$(LIBEXO_VERSION_API)
+	exo-compose-mail-$(LIBEXO2_VERSION_API)
 
 DISTCLEANFILES =							\
 	$(desktop_in_files)						\
@@ -76,6 +78,6 @@ DISTCLEANFILES =							\
 EXTRA_DIST =								\
 	$(defaults_DATA)						\
 	$(desktop_in_in_files)						\
-	exo-compose-mail-$(LIBEXO_VERSION_API)
+	exo-compose-mail-$(LIBEXO2_VERSION_API)
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/exo-helper/helpers/balsa.desktop.in.in b/exo-helper/helpers/balsa.desktop.in.in
index c945416..d4fe40f 100644
--- a/exo-helper/helpers/balsa.desktop.in.in
+++ b/exo-helper/helpers/balsa.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
 X-XFCE-Binaries=balsa;
 X-XFCE-Category=MailReader
 X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 balsa %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ balsa %B "mailto:%s";
diff --git a/exo-helper/helpers/evolution.desktop.in.in b/exo-helper/helpers/evolution.desktop.in.in
index 5c303ff..68b81a2 100644
--- a/exo-helper/helpers/evolution.desktop.in.in
+++ b/exo-helper/helpers/evolution.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
 X-XFCE-Binaries=evolution-2.4;evolution-2.3;evolution-2.2;evolution-2.0;evolution-1.6;evolution-1.5;evolution-1.4;evolution;
 X-XFCE-Category=MailReader
 X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 evolution %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ evolution %B "mailto:%s";
diff --git a/exo-helper/helpers/exo-compose-mail-1 b/exo-helper/helpers/exo-compose-mail-2
similarity index 99%
rename from exo-helper/helpers/exo-compose-mail-1
rename to exo-helper/helpers/exo-compose-mail-2
index fead65c..ef94116 100755
--- a/exo-helper/helpers/exo-compose-mail-1
+++ b/exo-helper/helpers/exo-compose-mail-2
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# exo-compose-mail-1 - Perl script to parse mailto:-URIs and invoke the
+# exo-compose-mail-2 - Perl script to parse mailto:-URIs and invoke the
 #                      various included MailReaders with the appropriate
 #                      parameters.
 #
diff --git a/exo-helper/helpers/geary.desktop.in.in b/exo-helper/helpers/geary.desktop.in.in
index 8923b29..f16a38c 100644
--- a/exo-helper/helpers/geary.desktop.in.in
+++ b/exo-helper/helpers/geary.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
 X-XFCE-Binaries=geary
 X-XFCE-Category=MailReader
 X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 geary %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ geary %B "mailto:%s";
diff --git a/exo-helper/helpers/icedove.desktop.in.in b/exo-helper/helpers/icedove.desktop.in.in
index 35545e9..3cd59cb 100644
--- a/exo-helper/helpers/icedove.desktop.in.in
+++ b/exo-helper/helpers/icedove.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
 X-XFCE-Binaries=icedove;
 X-XFCE-Category=MailReader
 X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 mozilla-remote %B "mailto:%s";@HELPERDIR@/exo-compose-mail-1 mozilla %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ mozilla-remote %B "mailto:%s";@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ mozilla %B "mailto:%s";
diff --git a/exo-helper/helpers/kmail.desktop.in.in b/exo-helper/helpers/kmail.desktop.in.in
index 4f7035b..fd7ef12 100644
--- a/exo-helper/helpers/kmail.desktop.in.in
+++ b/exo-helper/helpers/kmail.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=true
 X-XFCE-Binaries=kmail;
 X-XFCE-Category=MailReader
 X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParamter=@HELPERDIR@/exo-compose-mail-1 kmail %B "mailto:%s";
+X-XFCE-CommandsWithParamter=@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ kmail %B "mailto:%s";
diff --git a/exo-helper/helpers/mozilla-mailer.desktop.in.in b/exo-helper/helpers/mozilla-mailer.desktop.in.in
index 4cff73e..cd208f7 100644
--- a/exo-helper/helpers/mozilla-mailer.desktop.in.in
+++ b/exo-helper/helpers/mozilla-mailer.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
 X-XFCE-Binaries=mozilla;mozilla-gtk2;mozilla-gtk;
 X-XFCE-Category=MailReader
 X-XFCE-Commands=%B -mail;
-X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 mozilla-remote %B "mailto:%s";@HELPERDIR@/exo-compose-mail-1 mozilla %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ mozilla-remote %B "mailto:%s";@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ mozilla %B "mailto:%s";
diff --git a/exo-helper/helpers/mutt.desktop.in.in b/exo-helper/helpers/mutt.desktop.in.in
index 69b496d..dcad525 100644
--- a/exo-helper/helpers/mutt.desktop.in.in
+++ b/exo-helper/helpers/mutt.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
 X-XFCE-Binaries=mutt;
 X-XFCE-Category=MailReader
 X-XFCE-Commands=exo-open --launch TerminalEmulator %B;
-X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator @HELPERDIR@/exo-compose-mail-1 mutt %B "mailto:%s";
+X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator @HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ mutt %B "mailto:%s";
diff --git a/exo-helper/helpers/sylpheed-claws.desktop.in.in b/exo-helper/helpers/sylpheed-claws.desktop.in.in
index 7a0144e..ea4e1be 100644
--- a/exo-helper/helpers/sylpheed-claws.desktop.in.in
+++ b/exo-helper/helpers/sylpheed-claws.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=true
 X-XFCE-Binaries=claws-mail;sylpheed-claws-gtk2;sylpheed-claws
 X-XFCE-Category=MailReader
 X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 sylpheed %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ sylpheed %B "mailto:%s";
diff --git a/exo-helper/helpers/sylpheed.desktop.in.in b/exo-helper/helpers/sylpheed.desktop.in.in
index a6bc882..4340db7 100644
--- a/exo-helper/helpers/sylpheed.desktop.in.in
+++ b/exo-helper/helpers/sylpheed.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=true
 X-XFCE-Binaries=sylpheed;
 X-XFCE-Category=MailReader
 X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 sylpheed %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ sylpheed %B "mailto:%s";
diff --git a/exo-helper/helpers/thunderbird.desktop.in.in b/exo-helper/helpers/thunderbird.desktop.in.in
index 745c011..f9a373c 100644
--- a/exo-helper/helpers/thunderbird.desktop.in.in
+++ b/exo-helper/helpers/thunderbird.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
 X-XFCE-Binaries=thunderbird;thunderbird-gtk2;thunderbird-gtk;mozilla-thunderbird;
 X-XFCE-Category=MailReader
 X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 mozilla-remote %B "mailto:%s";@HELPERDIR@/exo-compose-mail-1 mozilla %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ mozilla-remote %B "mailto:%s";@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ mozilla %B "mailto:%s";
diff --git a/exo/Makefile.am b/exo/Makefile.am
index 3c30b9b..bcecbb1 100644
--- a/exo/Makefile.am
+++ b/exo/Makefile.am
@@ -4,8 +4,9 @@ AM_CPPFLAGS = 								\
 	-DDATADIR=\"$(datadir)\"					\
 	-DEXO_COMPILATION						\
 	-DG_LOG_DOMAIN=\"exo\"						\
-	-DHELPERDIR=\"$(HELPER_PATH_PREFIX)/xfce4/exo-$(LIBEXO_VERSION_API)\"	\
+	-DHELPERDIR=\"$(HELPER_PATH_PREFIX)/xfce4/exo-$(LIBEXO2_VERSION_API)\"	\
 	-DLIBEXO_VERSION_API=\"$(LIBEXO_VERSION_API)\"			\
+	-DLIBEXO2_VERSION_API=\"$(LIBEXO2_VERSION_API)\"			\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
 
 
diff --git a/exo/exo-2.pc.in b/exo/exo-2.pc.in
index 355ab79..2ac65a2 100644
--- a/exo/exo-2.pc.in
+++ b/exo/exo-2.pc.in
@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-exo_api_version=2
+exo_api_version=@LIBEXO2_VERSION_API@
 
 Name: @PACKAGE_TARNAME@
 Description: Extension library for Xfce
diff --git a/exo/exo-execute.c b/exo/exo-execute.c
index 3ef7048..3931617 100644
--- a/exo/exo-execute.c
+++ b/exo/exo-execute.c
@@ -139,7 +139,7 @@ exo_execute_preferred_application_on_screen (const gchar *category,
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
   /* generate the argument vector */
-  argv[argc++] = HELPERDIR G_DIR_SEPARATOR_S "exo-helper-" LIBEXO_VERSION_API;
+  argv[argc++] = HELPERDIR G_DIR_SEPARATOR_S "exo-helper-" LIBEXO2_VERSION_API;
   argv[argc++] = "--launch";
   argv[argc++] = (gchar *) category;
 
diff --git a/exo/exo-thumbnail-preview.c b/exo/exo-thumbnail-preview.c
index 243a6f3..7355e68 100644
--- a/exo/exo-thumbnail-preview.c
+++ b/exo/exo-thumbnail-preview.c
@@ -237,7 +237,7 @@ thumbnail_add_frame (GdkPixbuf *thumbnail)
 
   /* try to load the frame image */
   frame = gdk_pixbuf_new_from_file (DATADIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S "exo-"
-                                    LIBEXO_VERSION_API G_DIR_SEPARATOR_S "exo-thumbnail-frame.png", NULL);
+                                    LIBEXO2_VERSION_API G_DIR_SEPARATOR_S "exo-thumbnail-frame.png", NULL);
   if (G_LIKELY (frame != NULL))
     {
       /* add a frame to the thumbnail */
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 7c24a5c..775f563 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -1,5 +1,5 @@
 
-pixmapsdir = $(datadir)/pixmaps/exo-$(LIBEXO_VERSION_API)
+pixmapsdir = $(datadir)/pixmaps/exo-$(LIBEXO2_VERSION_API)
 pixmaps_DATA =								\
 	exo-thumbnail-frame.png
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

More information about the Xfce4-commits mailing list