diff options
| -rw-r--r-- | .hgignore | 2 | ||||
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | libpurple/Makefile.am | 16 | ||||
| -rw-r--r-- | libpurple/data/purple-url-handler.desktop.in.in | 14 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | po/POTFILES.skip | 1 |
7 files changed, 36 insertions, 0 deletions
@@ -78,6 +78,8 @@ libpurple/dbus-types.[ch] 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$ @@ -20,6 +20,7 @@ version 3.0.0 (??/??/????): 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 diff --git a/configure.ac b/configure.ac index b8cd0f0a81..bb56251bbf 100644 --- a/configure.ac +++ b/configure.ac @@ -2241,6 +2241,7 @@ AC_CONFIG_FILES([Makefile 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 diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am index b1450104fe..3a082d1073 100644 --- a/libpurple/Makefile.am +++ b/libpurple/Makefile.am @@ -17,6 +17,7 @@ EXTRA_DIST = \ 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 @@ mediainclude_HEADERS = \ 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) diff --git a/libpurple/data/purple-url-handler.desktop.in.in b/libpurple/data/purple-url-handler.desktop.in.in new file mode 100644 index 0000000000..2756de111c --- /dev/null +++ b/libpurple/data/purple-url-handler.desktop.in.in @@ -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@ diff --git a/po/POTFILES.in b/po/POTFILES.in index 80530acb1a..fa8e340560 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -46,6 +46,7 @@ libpurple/connection.c 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 diff --git a/po/POTFILES.skip b/po/POTFILES.skip index b2c637e7ce..292656d016 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -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 |