Mercurial > pidgin3 / changeset

--- a/.hgignore	Tue Aug 23 11:35:35 2016 -0500
+++ b/.hgignore	Tue Aug 23 13:50:32 2016 -0500
@@ -78,6 +78,8 @@
 libpurple/enums.[ch]
 libpurple/example/nullclient
 libpurple/data/gconf/purple.schemas$
+libpurple/data/purple-url-handler.desktop$
+libpurple/data/purple-url-handler.desktop.in$
 libpurple/marshallers.[ch]
 libpurple/plugins/dbus-example-bindings.c
 libpurple/plugins/perl/common/Makefile.PL$

--- a/ChangeLog	Tue Aug 23 11:35:35 2016 -0500
+++ b/ChangeLog	Tue Aug 23 13:50:32 2016 -0500
@@ -20,6 +20,7 @@
 	  using GnuTLS. (elrond, belmyst, and Mark Doliner) (#8061)
 	* Don't allow SSL 3.0 (only TLS 1.0 and newer) for TLS connections when
 	  using either GnuTLS or NSS.
+	* Install a purple-url-handler file to handle protocol schemes on Linux.
 
 	Pidgin:
 	* Support building with the GTK+ 3.x toolkit.  When configuring the

--- a/configure.ac	Tue Aug 23 11:35:35 2016 -0500
+++ b/configure.ac	Tue Aug 23 13:50:32 2016 -0500
@@ -2241,6 +2241,7 @@
 		   pidgin/win32/pidgin_dll_rc.rc
 		   pidgin/win32/pidgin_exe_rc.rc
 		   libpurple/data/gconf/Makefile
+		   libpurple/data/purple-url-handler.desktop.in
 		   libpurple/data/purple-3.pc
 		   libpurple/data/purple-3-uninstalled.pc
 		   libpurple/example/Makefile

--- a/libpurple/Makefile.am	Tue Aug 23 11:35:35 2016 -0500
+++ b/libpurple/Makefile.am	Tue Aug 23 13:50:32 2016 -0500
@@ -17,6 +17,7 @@
 		Makefile.mingw \
 		data/purple-3.pc.in \
 		data/purple-3-uninstalled.pc.in \
+		data/purple-url-handler.desktop.in \
 		win32/global.mak \
 		win32/libc_interface.c \
 		win32/libc_interface.h \
@@ -419,6 +420,21 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = data/purple-3.pc
 
+if INSTALL_I18N
+DESKTOP_FILE=data/purple-url-handler.desktop
+
+appsdir = $(datadir)/applications
+apps_in_files = data/purple-url-handler.desktop.in
+apps_DATA = $(apps_in_files:.desktop.in=.desktop)
+
+# silenced INTLTOOL_DESKTOP_RULE
+%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
+	$(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ > /dev/null
+
+@INTLTOOL_XML_RULE@
+
+endif # INSTALL_I18N
+
 libpurple_la_DEPENDENCIES = \
 	$(STATIC_LINK_LIBS) $(LIBPURPLE_WIN32RES)
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/data/purple-url-handler.desktop.in.in	Tue Aug 23 13:50:32 2016 -0500
@@ -0,0 +1,14 @@
+[Desktop Entry]
+_Name=Pidgin Internet Messenger
+_GenericName=Internet Messenger
+_Comment=Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more
+Exec=purple-url-handler %u
+TryExec=purple-url-handler
+Icon=pidgin
+StartupNotify=false
+Terminal=false
+NoDisplay=true
+Type=Application
+Categories=Network;InstantMessaging;RemoteAccess;ConsoleOnly;
+MimeType=x-scheme-handler/xmpp;
+@USES_MM_CHAT_SECTION@

--- a/po/POTFILES.in	Tue Aug 23 11:35:35 2016 -0500
+++ b/po/POTFILES.in	Tue Aug 23 13:50:32 2016 -0500
@@ -46,6 +46,7 @@
 libpurple/conversation.c
 libpurple/conversationtypes.c
 libpurple/data/gconf/purple.schemas.in
+libpurple/data/purple-url-handler.desktop.in
 libpurple/dbus-server.c
 libpurple/dbus-server.h
 libpurple/http.c

--- a/po/POTFILES.skip	Tue Aug 23 11:35:35 2016 -0500
+++ b/po/POTFILES.skip	Tue Aug 23 13:50:32 2016 -0500
@@ -1,3 +1,4 @@
+libpurple/data/purple-url-handler.desktop.in.in
 libpurple/plugins/mono/loader/mono.c
 libpurple/plugins/perl/common/Account.c
 libpurple/plugins/perl/common/AccountOpts.c