/pidgin/main: 4e350598cf7c: Merged in rw_grim/pidgin/release-2.x...

[Gary Kramlich]

Changeset: 4e350598cf7cd60723e045cfc9f2a25ebd7e53cd
Author:	 Gary Kramlich <grim at reaperworld.com>
Date:	 2016-07-01 16:22 -0500
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/4e350598cf7c

Description:

Merged in rw_grim/pidgin/release-2.x.y (pull request #58)

Replace instances of d.pidgin.im with developer.pidgin.im.

diffstat:

 libpurple/protocols/bonjour/bonjour.c |  2 +-
 pidgin/gtkblist.c                     |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff --git a/libpurple/protocols/bonjour/bonjour.c b/libpurple/protocols/bonjour/bonjour.c
--- a/libpurple/protocols/bonjour/bonjour.c
+++ b/libpurple/protocols/bonjour/bonjour.c
@@ -97,7 +97,7 @@ bonjour_login(PurpleAccount *account)
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_OTHER_ERROR,
 				_("Unable to find Apple's \"Bonjour for Windows\" toolkit, see "
-				  "http://d.pidgin.im/BonjourWindows for more information."));
+				  "https://developer.pidgin.im/BonjourWindows for more information."));
 		return;
 	}
 #endif /* _WIN32 */
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -5102,7 +5102,7 @@ generic_error_destroy_cb(GtkObject *dial
 		purple_account_clear_current_error(account);
 }
 
-#define SSL_FAQ_URI "http://d.pidgin.im/wiki/FAQssl"
+#define SSL_FAQ_URI "https://developer.pidgin.im/wiki/FAQssl"
 
 static void
 ssl_faq_clicked_cb(PidginMiniDialog *mini_dialog,