72 lines
1.9 KiB
Plaintext
72 lines
1.9 KiB
Plaintext
$OpenBSD: patch-libpurple_protocols_silc_silc_c,v 1.6 2009/12/07 06:27:59 steven Exp $
|
|
--- libpurple/protocols/silc/silc.c.orig Sun Nov 29 22:13:53 2009
|
|
+++ libpurple/protocols/silc/silc.c Sun Dec 6 13:05:09 2009
|
|
@@ -672,31 +672,12 @@ silcpurple_close(PurpleConnection *gc)
|
|
SilcPurpleTask task;
|
|
#endif /* __SILC_TOOLKIT_VERSION */
|
|
GHashTable *ui_info;
|
|
- const char *ui_name = NULL, *ui_website = NULL;
|
|
- char *quit_msg;
|
|
|
|
g_return_if_fail(sg != NULL);
|
|
|
|
- ui_info = purple_core_get_ui_info();
|
|
-
|
|
- if(ui_info) {
|
|
- ui_name = g_hash_table_lookup(ui_info, "name");
|
|
- ui_website = g_hash_table_lookup(ui_info, "website");
|
|
- }
|
|
-
|
|
- if(!ui_name || !ui_website) {
|
|
- ui_name = "Pidgin";
|
|
- ui_website = PURPLE_WEBSITE;
|
|
- }
|
|
- quit_msg = g_strdup_printf(_("Download %s: %s"),
|
|
- ui_name, ui_website);
|
|
-
|
|
/* Send QUIT */
|
|
silc_client_command_call(sg->client, sg->conn, NULL,
|
|
- "QUIT", quit_msg,
|
|
- NULL);
|
|
- g_free(quit_msg);
|
|
-
|
|
+ "QUIT", NULL);
|
|
if (sg->conn)
|
|
silc_client_close_connection(sg->client, sg->conn);
|
|
|
|
@@ -1842,9 +1823,6 @@ static PurpleCmdRet silcpurple_cmd_quit(PurpleConversa
|
|
{
|
|
PurpleConnection *gc;
|
|
SilcPurple sg;
|
|
- GHashTable *ui_info;
|
|
- const char *ui_name = NULL, *ui_website = NULL;
|
|
- char *quit_msg;
|
|
|
|
gc = purple_conversation_get_gc(conv);
|
|
|
|
@@ -1856,23 +1834,8 @@ static PurpleCmdRet silcpurple_cmd_quit(PurpleConversa
|
|
if (sg == NULL)
|
|
return PURPLE_CMD_RET_FAILED;
|
|
|
|
- ui_info = purple_core_get_ui_info();
|
|
-
|
|
- if(ui_info) {
|
|
- ui_name = g_hash_table_lookup(ui_info, "name");
|
|
- ui_website = g_hash_table_lookup(ui_info, "website");
|
|
- }
|
|
-
|
|
- if(!ui_name || !ui_website) {
|
|
- ui_name = "Pidgin";
|
|
- ui_website = PURPLE_WEBSITE;
|
|
- }
|
|
- quit_msg = g_strdup_printf(_("Download %s: %s"),
|
|
- ui_name, ui_website);
|
|
-
|
|
silc_client_command_call(sg->client, sg->conn, NULL,
|
|
- "QUIT", (args && args[0]) ? args[0] : quit_msg, NULL);
|
|
- g_free(quit_msg);
|
|
+ "QUIT", NULL);
|
|
|
|
return PURPLE_CMD_RET_OK;
|
|
}
|