cpw.malu.client_type: 9213b5f6: Changed "type" to "client_type" for the ...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 9213b5f683680ad5a42aaf46e0b77b78262eed7a
Ancestor: 24f10a7c63bc238236989461230f97a0eedf0fcd
Author: malu at pidgin.im
Date: 2009-02-10T18:41:22
Branch: im.pidgin.cpw.malu.client_type
URL: http://d.pidgin.im/viewmtn/revision/info/9213b5f683680ad5a42aaf46e0b77b78262eed7a

Modified files:
        finch/finch.c libpurple/core.h
        libpurple/protocols/jabber/disco.c pidgin/gtkmain.c

ChangeLog: 

Changed "type" to "client_type" for the hash value specifying client type

-------------- next part --------------
============================================================
--- finch/finch.c	0c604a8c5f91af7c8da259a07998c9bcb9eb9fdf
+++ finch/finch.c	8c094d9ed8ac527472c39e24646f71cea6ccbc54
@@ -65,7 +65,7 @@ static GHashTable *finch_ui_get_info(voi
 		g_hash_table_insert(ui_info, "version", VERSION);
 		g_hash_table_insert(ui_info, "website", "http://pidgin.im");
 		g_hash_table_insert(ui_info, "dev_website", "http://developer.pidgin.im");
-		g_hash_table_insert(ui_info, "type", "console");
+		g_hash_table_insert(ui_info, "client_type", "console");
 	}
 
 	return ui_info;
============================================================
--- libpurple/core.h	ecfd21f14feec2986bb0a22b21365986df82b40c
+++ libpurple/core.h	d25a584c336a44ab3283627926fd5bc0ed3361a0
@@ -187,7 +187,7 @@ gboolean purple_core_ensure_single_insta
  *   <dt><tt>dev_website</tt></dt>
  *   <dd>the UI's development/support website, such as http://developer.pidgin.im.</dd>
  *
- *   <dt><tt>type</tt></dt>
+ *   <dt><tt>client_type</tt></dt>
  *   <dd>the type of UI (pc, console, phone, handheld, web, bot)</dd>
  *   
  * </dl>
============================================================
--- libpurple/protocols/jabber/disco.c	6b2c3a2bc94412e24d78940c18a25453a41d7a3e
+++ libpurple/protocols/jabber/disco.c	6dcc5172079771444cbd0fa10ec5d386b73390d4
@@ -118,7 +118,7 @@ void jabber_disco_info_parse(JabberStrea
 
 		if(!node || !strcmp(node, CAPS0115_NODE "#" VERSION)) {
 			GHashTable *ui_info = purple_core_get_ui_info();
-			const gchar *ui_type = g_hash_table_lookup(ui_info, "type");
+			const gchar *ui_type = g_hash_table_lookup(ui_info, "client_type");
 			const gchar *type = "pc"; /* default client type, if unknown or
 										unspecified */
 
============================================================
--- pidgin/gtkmain.c	fffd0ce914d5d854bafe11106dcb61bb436b132a
+++ pidgin/gtkmain.c	37809486b7db7caab8ae4f1f6c5bf9a768584bcb
@@ -349,7 +349,7 @@ static GHashTable *pidgin_ui_get_info(vo
 		g_hash_table_insert(ui_info, "version", VERSION);
 		g_hash_table_insert(ui_info, "website", "http://pidgin.im");
 		g_hash_table_insert(ui_info, "dev_website", "http://developer.pidgin.im");
-		g_hash_table_insert(ui_info, "type", "pc");
+		g_hash_table_insert(ui_info, "client_type", "pc");
 	}
 
 	return ui_info;