/soc/2013/ankitkv/gobjectification: 30cbb41e0803: Merged default...

[Ankit Vani]

Changeset: 30cbb41e0803be3bb3e9169ec992432657ea22cf
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-12-07 02:03 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/30cbb41e0803

Description:

Merged default branch

diffstat:

 libpurple/conversations.c |   2 +-
 libpurple/conversations.h |   6 +++---
 pidgin/gtkconv.c          |   4 ++--
 pidgin/gtknotify.c        |  11 -----------
 pidgin/gtkprefs.c         |   8 +++++++-
 5 files changed, 13 insertions(+), 18 deletions(-)

diffs (102 lines):

diff --git a/libpurple/conversations.c b/libpurple/conversations.c
--- a/libpurple/conversations.c
+++ b/libpurple/conversations.c
@@ -137,7 +137,7 @@ purple_conversations_update_cache(Purple
 	if (account)
 		hc->account = account;
 	if (name)
-		hc->name = g_strdup(purple_normalize(account, name));
+		hc->name = g_strdup(purple_normalize(hc->account, name));
 
 	g_hash_table_insert(conversation_cache, hc, conv);
 }
diff --git a/libpurple/conversations.h b/libpurple/conversations.h
--- a/libpurple/conversations.h
+++ b/libpurple/conversations.h
@@ -90,7 +90,7 @@ GList *purple_conversations_get_chats(vo
  * Finds a conversation of any type with the specified name and Purple account.
  *
  * @param name The name of the conversation.
- * @param account The purple_account associated with the conversation.
+ * @param account The account associated with the conversation.
  *
  * @return The conversation if found, or @c NULL otherwise.
  */
@@ -101,7 +101,7 @@ PurpleConversation *purple_conversations
  * Finds an IM with the specified name and Purple account.
  *
  * @param name The name of the conversation.
- * @param account The purple_account associated with the conversation.
+ * @param account The account associated with the conversation.
  *
  * @return The conversation if found, or @c NULL otherwise.
  */
@@ -112,7 +112,7 @@ PurpleIMConversation *purple_conversatio
  * Finds a chat with the specified name and Purple account.
  *
  * @param name The name of the conversation.
- * @param account The purple_account associated with the conversation.
+ * @param account The account associated with the conversation.
  *
  * @return The conversation if found, or @c NULL otherwise.
  */
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -8563,8 +8563,8 @@ pidgin_conv_attach(PurpleConversation *c
 	g_object_set_data(G_OBJECT(conv), "unseen-count", NULL);
 	g_object_set_data(G_OBJECT(conv), "unseen-state", NULL);
 	purple_conversation_set_ui_ops(conv, pidgin_conversations_get_conv_ui_ops());
-	purple_conversation_set_ui_data(conv, NULL);
-	private_gtkconv_new(conv, FALSE);
+	if (!PIDGIN_CONVERSATION(conv))
+		private_gtkconv_new(conv, FALSE);
 	timer = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(conv), "close-timer"));
 	if (timer) {
 		purple_timeout_remove(timer);
diff --git a/pidgin/gtknotify.c b/pidgin/gtknotify.c
--- a/pidgin/gtknotify.c
+++ b/pidgin/gtknotify.c
@@ -1377,17 +1377,6 @@ pidgin_notify_uri(const char *uri)
 											 "openURL(%s,new-tab)",
 											 web_browser, args, escaped);
 	}
-	else if (!strcmp(web_browser, "netscape"))
-	{
-		command = g_strdup_printf("netscape %s", escaped);
-
-		if (place == PIDGIN_BROWSER_NEW_WINDOW)
-		{
-			remote_command = g_strdup_printf("netscape -remote "
-											 "openURL(%s,new-window)",
-											 escaped);
-		}
-	}
 	else if (!strcmp(web_browser, "opera"))
 	{
 		if (place == PIDGIN_BROWSER_NEW_WINDOW)
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -2302,7 +2302,6 @@ get_available_browsers(void)
 	static const struct browser possible_browsers[] = {
 		{N_("Seamonkey"), "seamonkey"},
 		{N_("Opera"), "opera"},
-		{N_("Netscape"), "netscape"},
 		{N_("Mozilla"), "mozilla"},
 		{N_("Konqueror"), "kfmclient"},
 		{N_("Google Chrome"), "google-chrome"},
@@ -4416,6 +4415,13 @@ pidgin_prefs_update_old(void)
 		purple_prefs_set_int(PIDGIN_PREFS_ROOT "/browsers/place",
 				PIDGIN_BROWSER_DEFAULT);
 	}
+
+	/* Added in 3.0.0. */
+	if (g_str_equal(
+			purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/browser"),
+			"netscape")) {
+		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/browsers/browser", "xdg-open");
+	}
 #endif /* !_WIN32 */
 }