summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--finch/finch.c2
-rw-r--r--libpurple/core.h2
-rw-r--r--libpurple/protocols/jabber/disco.c2
-rw-r--r--pidgin/gtkmain.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/finch/finch.c b/finch/finch.c
index 0cc95f65f0..cfb5e2acbf 100644
--- a/finch/finch.c
+++ b/finch/finch.c
@@ -65,7 +65,7 @@ static GHashTable *finch_ui_get_info(void)
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;
diff --git a/libpurple/core.h b/libpurple/core.h
index 20060d90b2..7365152b77 100644
--- a/libpurple/core.h
+++ b/libpurple/core.h
@@ -187,7 +187,7 @@ gboolean purple_core_ensure_single_instance(void);
* <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>
diff --git a/libpurple/protocols/jabber/disco.c b/libpurple/protocols/jabber/disco.c
index cf923cb3c2..2903f72d76 100644
--- a/libpurple/protocols/jabber/disco.c
+++ b/libpurple/protocols/jabber/disco.c
@@ -118,7 +118,7 @@ void jabber_disco_info_parse(JabberStream *js, xmlnode *packet) {
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 */
diff --git a/pidgin/gtkmain.c b/pidgin/gtkmain.c
index a4933acdb5..21a4539a0f 100644
--- a/pidgin/gtkmain.c
+++ b/pidgin/gtkmain.c
@@ -349,7 +349,7 @@ static GHashTable *pidgin_ui_get_info(void)
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;