Merged in default (pull request #427)

Don't clobber pidgin2 with pidgin3

Approved-by: Elliott Sales de Andrade
Approved-by: Eion Robb

8 files changed, 55 insertions, 40 deletions

diff --git a/doc/finch.1.in b/doc/finch3.1.in
index 6f6def0fa1..d75043f38a 100644
--- a/doc/finch.1.in
+++ b/doc/finch3.1.in
@@ -19,24 +19,24 @@
 .\" License along with this manual; if not, write to the Free
 .\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
 .\" USA.
-.TH finch 1
+.TH finch3 1
 .SH NAME
 Finch \- A Pimpin' Penguin console frontend to libpurple. Instant
 Messaging client.
 .SH SYNOPSIS
 .TP 5
-\fBfinch \fI[options]\fR
+\fBfinch3 \fI[options]\fR
 
 .SH DESCRIPTION
 .PP
-\fBfinch\fR is a console-based modular messaging client based on libpurple
+\fBfinch3\fR is a console-based modular messaging client based on libpurple
 which is capable of connecting to AIM, XMPP, ICQ, IRC, SILC,
 Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, and QQ all at once. It has
 many common features found in other clients, as well as many unique features.
 Finch is not endorsed by or affiliated with America Online, ICQ, or Microsoft.
 
 .SH OPTIONS
-The following options are provided by \fBfinch\fR using the standard GNU
+The following options are provided by \fBfinch3\fR using the standard GNU
 command line syntax:
 .TP
 .B \-c, \-\-config=\fIDIR\fB
@@ -51,7 +51,7 @@ stderr.
 Print this help and exit.
 .TP
 .B \-n, \-\-nologin
-Don't automatically login when \fBfinch\fR starts.  Sets all accounts to
+Don't automatically login when \fBfinch3\fR starts.  Sets all accounts to
 Offline.
 .TP
 .B \-v, \-\-version
@@ -563,7 +563,7 @@ for the preferences window.
 for the status window.
 
 .SH FAQ
-FAQ for \fBfinch\fR is located at
+FAQ for \fBfinch3\fR is located at
 .br
 \fIhttps://developer.pidgin.im/wiki/Using%20Finch\fR
 
@@ -573,13 +573,13 @@ Known bugs are listed at
 \fIhttps://developer.pidgin.im/query?status=new&status=assigned&status=reopened&component=finch+%28gnt%2Fncurses%29&order=priority\fR
 
 Before sending a bug report, please verify that you have the latest
-version of \fBfinch\fR and libpurple.  Many bugs (major and minor) are
+version of \fBfinch3\fR and libpurple.  Many bugs (major and minor) are
 fixed at each release, and if yours is out of date, the problem may already have
 been solved.
 
 .SH PATCHES
-If you fix a bug in \fBfinch\fR (or otherwise enhance it), please submit a
-patch (using \fBmtn diff > my.diff\fR against the latest version from the
+If you fix a bug in \fBfinch3\fR (or otherwise enhance it), please submit a
+patch (using \fBhg diff > my.diff\fR against the latest version from the
 Mercurial repository) at \fIhttps://developer.pidgin.im/newticket\fR
 
 You are also encouraged to drop by at \fB#pidgin\fR on \fIirc.freenode.net\fR
diff --git a/doc/meson.build b/doc/meson.build
index d44dbec9f6..592fe8e924 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -4,8 +4,8 @@ endif
 
 if ENABLE_GTK
 	pidgin_man = configure_file(
-	    input : 'pidgin.1.in',
-	    output : 'pidgin.1',
+	    input : 'pidgin3.1.in',
+	    output : 'pidgin3.1',
 	    configuration : man_conf,
 	    install : true,
 	    install_dir : get_option('mandir') + '/man1')
@@ -13,8 +13,8 @@ endif
 
 if enable_consoleui
 	finch_man = configure_file(
-	    input : 'finch.1.in',
-	    output : 'finch.1',
+	    input : 'finch3.1.in',
+	    output : 'finch3.1',
 	    configuration : man_conf,
 	    install : true,
 	    install_dir : get_option('mandir') + '/man1')
diff --git a/doc/pidgin.1.in b/doc/pidgin3.1.in
index 64b5d852ed..b3ae5f126c 100644
--- a/doc/pidgin.1.in
+++ b/doc/pidgin3.1.in
@@ -1,4 +1,4 @@
-Ri.\" Copyright (c) 2000, Dennis Ristuccia <dennis@dennisr.net>
+.\" Copyright (c) 2000, Dennis Ristuccia <dennis@dennisr.net>
 .\"
 .\" This is free documentation; you can redistribute it and/or
 .\" modify it under the terms of the GNU General Public License as
@@ -19,16 +19,16 @@ Ri.\" Copyright (c) 2000, Dennis Ristuccia <dennis@dennisr.net>
 .\" License along with this manual; if not, write to the Free
 .\" Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 .\" Boston, MA  02111-1301  USA.
-.TH pidgin 1 "" "Pidgin v@VERSION@"
+.TH pidgin3 1 "" "Pidgin v@VERSION@"
 .SH NAME
-pidgin \- Instant Messaging client
+pidgin3 \- Instant Messaging client
 .SH SYNOPSIS
 .TP 5
-\fBpidgin \fI[options]\fR
+\fBpidgin3 \fI[options]\fR
 
 .SH DESCRIPTION
 .PP
-\fBpidgin\fR is a graphical modular messaging client based on libpurple
+\fBpidgin3\fR is a graphical modular messaging client based on libpurple
 which is capable of connecting to AIM, XMPP, ICQ, IRC, SILC,
 Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, and QQ all at once. It has
 many common features found in other clients, as well as many unique features.
@@ -524,7 +524,7 @@ Pidgin allows for interaction via D-Bus.  Currently very little documentation
 about this interaction exists.
 
 .SH FILES
-  \fI@prefix@/bin/pidgin\fR: Pidgin's location.
+  \fI@prefix@/bin/pidgin3\fR: Pidgin's location.
 .br
   \fI~/.purple/blist.xml\fR: the buddy list.
 .br
@@ -539,9 +539,9 @@ about this interaction exists.
   \fI~/.purple/logs/PROTOCOL/ACCOUNT/BUDDYNAME/DATE.{html,txt}\fR: conversation logs.
 
 .SH DIRECTORIES
-  \fI@prefix@/lib/pidgin/\fR: Pidgin's plugins directory.
+  \fI@prefix@/lib/pidgin3/\fR: Pidgin's plugins directory.
 .br
-  \fI@prefix@/lib/purple-2/\fR: libpurple's plugins directory.
+  \fI@prefix@/lib/purple-3/\fR: libpurple's plugins directory.
 .br
   \fI~/.purple\fR: users' local settings
 .br
diff --git a/finch/meson.build b/finch/meson.build
index 0ac2f6e5da..70f1aef35c 100644
--- a/finch/meson.build
+++ b/finch/meson.build
@@ -160,10 +160,10 @@ if IS_WIN32
 endif
 
 if enable_consoleui
-	install_headers(libfinch_headers, subdir : 'finch')
+	install_headers(libfinch_headers, subdir : 'finch-3')
 
 	libfinch_inc = include_directories('.')
-	libfinch = shared_library('finch',
+	libfinch = shared_library('finch3',
 	    libfinch_SOURCES,
 	    c_args : ['-DSTANDALONE', ncurses_header],
 	    include_directories : [toplevel_inc],
@@ -175,7 +175,7 @@ if enable_consoleui
 	    link_with : libfinch,
 	    dependencies : [libpurple_dep, libgnt_dep, glib])
 
-	finch = executable('finch',
+	finch = executable('finch3',
 	    finch_SOURCES,
 	    c_args : '-DSTANDALONE',
 	    dependencies : [libpurple_dep, libgnt_dep, libfinch_dep],
@@ -185,10 +185,11 @@ if enable_consoleui
 	    name : 'Finch',
 	    description : 'Finch is an instant messenger application that uses libpurple for protocol support and ncurses (libgnt) for the UI.',
 	    version : meson.project_version(),
-	    filebase : 'finch',
-	    subdirs : 'finch',
+	    filebase : 'finch-3',
+	    subdirs : 'finch-3',
 	    libraries : [libfinch],
-	    requires : ['gnt', 'purple-3'])
+	    requires : ['gnt', 'purple-3'],
+	    variables : ['plugindir=${libdir}/finch-@0@'.format(purple_major_version)])
 
 	if enable_introspection
 		introspection_sources = libfinch_headers
diff --git a/libpurple/data/purple3-url-handler.desktop.in.in b/libpurple/data/purple3-url-handler.desktop.in.in
new file mode 100644
index 0000000000..09513fa627
--- /dev/null
+++ b/libpurple/data/purple3-url-handler.desktop.in.in
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Name=Pidgin
+GenericName=Internet Messenger
+Comment=Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, and more
+Exec=purple3-url-handler %u
+TryExec=purple3-url-handler
+Icon=pidgin
+StartupNotify=false
+Terminal=false
+NoDisplay=true
+Type=Application
+Categories=Network;InstantMessaging;RemoteAccess;ConsoleOnly;
+MimeType=x-scheme-handler/aim;x-scheme-handler/gg;x-scheme-handler/icq;x-scheme-handler/irc;x-scheme-handler/msnim;x-scheme-handler/sip;x-scheme-handler/xmpp;x-scheme-handler/ymsgr
+@USES_MM_CHAT_SECTION@
diff --git a/pidgin/data/im.pidgin.Pidgin.appdata.xml.in b/pidgin/data/im.pidgin.Pidgin3.appdata.xml.in
index dcc77bc72f..8fced931fb 100644
--- a/pidgin/data/im.pidgin.Pidgin.appdata.xml.in
+++ b/pidgin/data/im.pidgin.Pidgin3.appdata.xml.in
@@ -3,7 +3,7 @@
 <!-- Copyright 2014-2017 Pidgin Developers <devel@pidgin.im> -->
 
 <component type="desktop-application">
-  <id>im.pidgin.Pidgin.desktop</id>
+  <id>im.pidgin.Pidgin3.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0</project_license>
   <description>
@@ -18,9 +18,9 @@
     </p>
   </description>
 
-  <launchable type="desktop-id">im.pidgin.Pidgin.desktop</launchable>
+  <launchable type="desktop-id">im.pidgin.Pidgin3.desktop</launchable>
   <provides>
-    <id>pidgin.desktop</id>
+    <id>pidgin3.desktop</id>
   </provides>
 
   <screenshots>
diff --git a/pidgin/data/im.pidgin.Pidgin.desktop.in.in b/pidgin/data/im.pidgin.Pidgin3.desktop.in.in
index 450fbe0512..7bc5ef7f00 100644
--- a/pidgin/data/im.pidgin.Pidgin.desktop.in.in
+++ b/pidgin/data/im.pidgin.Pidgin3.desktop.in.in
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=Pidgin
+Name=Pidgin 3
 GenericName=Internet Messenger
 Comment=Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, and more
-Exec=pidgin %U
+Exec=pidgin3 %U
 Icon=pidgin
 StartupNotify=true
 Terminal=false
diff --git a/pidgin/meson.build b/pidgin/meson.build
index a40e28cb87..83780486f6 100644
--- a/pidgin/meson.build
+++ b/pidgin/meson.build
@@ -149,10 +149,10 @@ if ENABLE_GTK
 		)
 	endif
 
-	install_headers(libpidgin_headers, subdir : 'pidgin')
+	install_headers(libpidgin_headers, subdir : 'pidgin-3')
 
 	libpidgin_inc = include_directories('.')
-	libpidgin = shared_library('pidgin',
+	libpidgin = shared_library('pidgin3',
 	    libpidgin_SOURCES,
 	    package_revision,
 	    include_directories : [toplevel_inc],
@@ -176,7 +176,7 @@ if ENABLE_GTK
 	    link_with : libpidgin,
 	    dependencies : [webkit, gtk, glib, math])
 
-	pidgin = executable('pidgin',
+	pidgin = executable('pidgin3',
 	    pidgin_SOURCES,
 	    include_directories : toplevel_inc,
 	    dependencies : IS_WIN32 ? [] : [libpurple_dep, libpidgin_dep],
@@ -193,13 +193,13 @@ if ENABLE_GTK
 	    description : 'Pidgin is a GTK3-based instant messenger application.',
 	    version : meson.project_version(),
 	    filebase : 'pidgin-3',
-	    subdirs : 'pidgin',
+	    subdirs : 'pidgin-3',
 	    libraries : [libpidgin],
 	    requires : ['gtk+-3.0', 'webkitgtk-3.0', 'purple-3'],
-	    variables : ['plugindir=${libdir}/pidgin'])
+	    variables : ['plugindir=${libdir}/pidgin-@0@'.format(purple_major_version)])
 
 	if INSTALL_I18N
-		DESKTOP_FILE = 'im.pidgin.Pidgin.desktop'
+		DESKTOP_FILE = 'im.pidgin.Pidgin3.desktop'
 		desktop_file_in = configure_file(
 		    input : 'data/' + DESKTOP_FILE + '.in.in',
 		    output : DESKTOP_FILE + '.in',
@@ -213,8 +213,8 @@ if ENABLE_GTK
 		    install_dir : get_option('datadir') + '/applications')
 
 		appdata = i18n.merge_file(
-		    input : 'data/im.pidgin.Pidgin.appdata.xml.in',
-		    output : 'im.pidgin.Pidgin.appdata.xml',
+		    input : 'data/im.pidgin.Pidgin3.appdata.xml.in',
+		    output : 'im.pidgin.Pidgin3.appdata.xml',
 		    po_dir : meson.source_root() + '/po',
 		    install : true,
 		    install_dir : get_option('datadir') + '/metainfo')