# HG changeset patch # User Yoshiki Yazawa # Date 1218432714 -32400 # Node ID 9a2d727f39b4b4c2353be41625d0f38e1b26b3c3 # Parent 5ddf8bee768d24d94db49bb349e08fbb4683af66 removed jisko support as a protest to their expulsion policy. diff -r 5ddf8bee768d -r 9a2d727f39b4 pidgin-twitter.c --- a/pidgin-twitter.c Mon Aug 11 10:17:46 2008 +0900 +++ b/pidgin-twitter.c Mon Aug 11 14:31:54 2008 +0900 @@ -24,8 +24,8 @@ /***********/ /* globals */ /***********/ -#define NUM_REGPS 12 -#define NUM_SERVICES 4 /* twitter, wassr, identica, jisko. */ +#define NUM_REGPS 11 +#define NUM_SERVICES 3 /* twitter, wassr, identica. */ static GRegex *regp[NUM_REGPS]; static gboolean suppress_oops = FALSE; static GHashTable *icon_hash[NUM_SERVICES]; @@ -849,9 +849,6 @@ case identica_service: format = RECIPIENT_FORMAT_IDENTICA; break; - case jisko_service: - format = RECIPIENT_FORMAT_JISKO; - break; default: twitter_debug("unknown service\n"); break; @@ -874,9 +871,6 @@ case identica_service: format = SENDER_FORMAT_IDENTICA; break; - case jisko_service: - format = SENDER_FORMAT_JISKO; - break; default: twitter_debug("unknown service\n"); break; @@ -1003,9 +997,6 @@ case identica_service: screen_name = purple_prefs_get_string(OPT_SCREEN_NAME_IDENTICA); break; - case jisko_service: - screen_name = purple_prefs_get_string(OPT_SCREEN_NAME_JISKO); - break; } if (screen_name) { @@ -1088,18 +1079,6 @@ markup = g_markup_printf_escaped("%u", bytes <= 140 ? "black" : "red", bytes); break; - case jisko_service: - gtk_text_buffer_get_start_iter(textbuffer, &head); - gtk_text_buffer_get_end_iter(textbuffer, &tail); - - text = gtk_text_buffer_get_text(textbuffer, &head, &tail, TRUE); - if(text) - bytes = strlen(text) + new_text_length; - g_free(text); - markup = g_markup_printf_escaped("%u", - bytes >= 5 && bytes <= 140 ? - "black" : "red", bytes); - break; default: twitter_debug("unknown service\n"); break; @@ -1163,26 +1142,6 @@ markup = g_markup_printf_escaped("%u", bytes <= 140 ? "black" : "red", bytes); break; - case jisko_service: - gtk_text_buffer_get_start_iter(textbuffer, &head); - gtk_text_buffer_get_end_iter(textbuffer, &tail); - - text = gtk_text_buffer_get_text(textbuffer, - &head, &tail, TRUE); - if(text) - bytes = strlen(text); - g_free(text); - - text = gtk_text_buffer_get_text(textbuffer, - start_pos, end_pos, TRUE); - if(text) - bytes -= strlen(text); - g_free(text); - - markup = g_markup_printf_escaped("%u", - bytes >= 5 && bytes <= 140 ? - "black" : "red", bytes); - break; default: twitter_debug("unknown service\n"); break; @@ -1211,7 +1170,6 @@ case twitter_service: case wassr_service: case identica_service: - case jisko_service: detach_from_conv(conv, NULL); break; default: @@ -1323,7 +1281,6 @@ case twitter_service: case wassr_service: case identica_service: - case jisko_service: attach_to_conv(conv, NULL); break; default: @@ -1465,30 +1422,6 @@ return is_identica_account(account, name); } -static gboolean -is_jisko_account(PurpleAccount *account, const char *name) -{ - const gchar *proto = purple_account_get_protocol_id(account); - - if(g_strstr_len(name, 16, "bot@jisko.net") && - g_strstr_len(proto, 11, "prpl-jabber")) { - return TRUE; - } - - return FALSE; -} - -static gboolean -is_jisko_conv(PurpleConversation *conv) -{ - g_return_val_if_fail(conv != NULL, FALSE); - - const char *name = purple_conversation_get_name(conv); - PurpleAccount *account = purple_conversation_get_account(conv); - - return is_jisko_account(account, name); -} - static gint get_service_type(PurpleConversation *conv) { @@ -1502,8 +1435,6 @@ service = wassr_service; else if(is_identica_conv(conv)) service = identica_service; - else if(is_jisko_conv(conv)) - service = jisko_service; return service; } @@ -1530,7 +1461,6 @@ break; case wassr_service: case identica_service: - case jisko_service: attach_to_conv(conv, NULL); break; default: @@ -1567,9 +1497,6 @@ case identica_service: hash = icon_hash[identica_service]; break; - case jisko_service: - hash = icon_hash[jisko_service]; - break; default: twitter_debug("unknown service\n"); break; @@ -1707,9 +1634,6 @@ case identica_service: hash = icon_hash[identica_service]; break; - case jisko_service: - hash = icon_hash[jisko_service]; - break; default: twitter_debug("unknown service\n"); } @@ -1756,9 +1680,6 @@ case identica_service: hash = icon_hash[identica_service]; break; - case jisko_service: - hash = icon_hash[jisko_service]; - break; default: twitter_debug("unknown service\n"); break; @@ -1817,11 +1738,6 @@ icon_hash[identica_service], user_name); regp_id = IMAGE_IDENTICA; } - else if(service == jisko_service) { - data = (icon_data *)g_hash_table_lookup( - icon_hash[jisko_service], user_name); - regp_id = IMAGE_JISKO; - } if(!url_text) { if(data) { @@ -1984,9 +1900,6 @@ case identica_service: hash = icon_hash[identica_service]; break; - case jisko_service: - hash = icon_hash[jisko_service]; - break; default: twitter_debug("unknown service\n"); } @@ -2058,9 +1971,6 @@ case identica_service: suffix = "identica"; break; - case jisko_service: - suffix = "jisko"; - break; default: twitter_debug("unknown service\n"); break; @@ -2125,10 +2035,6 @@ suffix = "identica"; hash = icon_hash[identica_service]; break; - case jisko_service: - suffix = "jisko"; - hash = icon_hash[jisko_service]; - break; default: twitter_debug("unknown service\n"); break; @@ -2214,9 +2120,6 @@ case identica_service: url = g_strdup_printf("http://identi.ca/%s", user_name); break; - case jisko_service: - url = g_strdup_printf("http://jisko.net/%s", user_name); - break; default: twitter_debug("unknown service\n"); break; @@ -2230,8 +2133,7 @@ /* gotdata will be released in got_icon_cb */ if(service == twitter_service || service == wassr_service || - service == identica_service || - service == jisko_service) { + service == identica_service) { data->fetch_data = purple_util_fetch_url(url, TRUE, NULL, TRUE, got_page_cb, gotdata); } @@ -2263,9 +2165,6 @@ case identica_service: hash = icon_hash[identica_service]; break; - case jisko_service: - hash = icon_hash[jisko_service]; - break; default: twitter_debug("unknown service\n"); break; @@ -2365,9 +2264,6 @@ case identica_service: hash = icon_hash[identica_service]; break; - case jisko_service: - hash = icon_hash[jisko_service]; - break; default: twitter_debug("unknown service\n"); break; @@ -2517,7 +2413,6 @@ regp[IMAGE_TWITTER] = g_regex_new(P_IMAGE_TWITTER, 0, 0, NULL); regp[IMAGE_WASSR] = g_regex_new(P_IMAGE_WASSR, 0, 0, NULL); regp[IMAGE_IDENTICA] = g_regex_new(P_IMAGE_IDENTICA, 0, 0, NULL); - regp[IMAGE_JISKO] = g_regex_new(P_IMAGE_JISKO, 0, 0, NULL); for(i = twitter_service; i < NUM_SERVICES; i++) { icon_hash[i] = g_hash_table_new_full(g_str_hash, g_str_equal, @@ -2796,13 +2691,6 @@ g_signal_connect(e, "changed", G_CALLBACK(text_changed_cb), &e); - e = GTK_WIDGET(gtk_builder_get_object (builder, "account_jisko")); - g_object_set_data(G_OBJECT(e), "pref", OPT_SCREEN_NAME_JISKO); - text = purple_prefs_get_string(OPT_SCREEN_NAME_JISKO); - gtk_entry_set_text(GTK_ENTRY(e), text); - g_signal_connect(e, "changed", - G_CALLBACK(text_changed_cb), &e); - e = GTK_WIDGET(gtk_builder_get_object (builder, "account_api")); g_object_set_data(G_OBJECT(e), "pref", OPT_API_BASE_POST); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(e), diff -r 5ddf8bee768d -r 9a2d727f39b4 pidgin-twitter.h --- a/pidgin-twitter.h Mon Aug 11 10:17:46 2008 +0900 +++ b/pidgin-twitter.h Mon Aug 11 14:31:54 2008 +0900 @@ -36,8 +36,7 @@ CHANNEL, IMAGE_TWITTER, IMAGE_WASSR, - IMAGE_IDENTICA, - IMAGE_JISKO + IMAGE_IDENTICA }; /* service id */ @@ -45,8 +44,7 @@ unknown_service = -1, twitter_service, wassr_service, - identica_service, - jisko_service + identica_service }; /* container to hold icon data */ @@ -113,7 +111,6 @@ #define OPT_SCREEN_NAME_TWITTER OPT_PIDGINTWITTER "/screen_name_twitter" #define OPT_SCREEN_NAME_WASSR OPT_PIDGINTWITTER "/screen_name_wassr" #define OPT_SCREEN_NAME_IDENTICA OPT_PIDGINTWITTER "/screen_name_identica" -#define OPT_SCREEN_NAME_JISKO OPT_PIDGINTWITTER "/screen_name_jisko" #define OPT_PASSWORD_TWITTER OPT_PIDGINTWITTER "/password_twitter" #define OPT_SHOW_ICON OPT_PIDGINTWITTER "/show_icon" #define OPT_ICON_SIZE OPT_PIDGINTWITTER "/icon_size" @@ -130,8 +127,6 @@ #define SENDER_FORMAT_WASSR "%s%s: " #define RECIPIENT_FORMAT_IDENTICA "@%s" #define SENDER_FORMAT_IDENTICA "%s%s: " -#define RECIPIENT_FORMAT_JISKO "@%s" -#define SENDER_FORMAT_JISKO "%s%s: " #define CHANNEL_FORMAT_WASSR "%s%s " #define DEFAULT_LIST "(list of users: separated with ' ,:;')" #define OOPS_MESSAGE "Oops! Your update was over 140 characters. We sent the short version to your friends (they can view the entire update on the web).
" @@ -149,7 +144,6 @@ #define P_IMAGE_TWITTER "" #define P_IMAGE_WASSR "
" #define P_IMAGE_IDENTICA "\"[A-Za-z0-0_]+\"/" -#define P_IMAGE_JISKO "\"Avatar\"" /* twitter API specific macros */ #define TWITTER_BASE_URL "http://twitter.com" @@ -200,8 +194,6 @@ static gboolean is_wassr_conv(PurpleConversation *conv); static gboolean is_identica_account(PurpleAccount *account, const char *name); static gboolean is_identica_conv(PurpleConversation *conv); -static gboolean is_jisko_account(PurpleAccount *account, const char *name); -static gboolean is_jisko_conv(PurpleConversation *conv); static void conv_created_cb(PurpleConversation *conv, gpointer null); static void deleting_conv_cb(PurpleConversation *conv); static gboolean receiving_im_cb(PurpleAccount *account, char **sender, char **buffer, PurpleConversation *conv, PurpleMessageFlags *flags, void *data); diff -r 5ddf8bee768d -r 9a2d727f39b4 prefs.ui --- a/prefs.ui Mon Aug 11 10:17:46 2008 +0900 +++ b/prefs.ui Mon Aug 11 14:31:54 2008 +0900 @@ -188,47 +188,6 @@ - - True - - - True - 20 - - - True - 0 - jisko - 10 - - - - - - - True - 1 - 4 - - - True - True - 20 - - - - - False - False - 1 - - - - - 4 - - - True 8 @@ -245,7 +204,7 @@ - 5 + 4 @@ -264,7 +223,7 @@ - 6 + 5 @@ -308,7 +267,7 @@ - 7 + 6 @@ -377,7 +336,7 @@ False - 8 + 7 @@ -539,41 +498,46 @@ True 4 - - - - - - - - - - - - - + + True + + + + + + 2 + 3 + + + - - - - + + True + + + + + + 1 + 2 + + - - - - + True - 40 + 20 - + True - Icon size + pixel + 3 + 4 @@ -600,46 +564,17 @@ - + True - 20 + 40 - + True - pixel + Icon size - 3 - 4 - - - - - - - True - - - - - - 1 - 2 - - - - - - True - - - - - - 2 - 3 @@ -694,60 +629,72 @@ True 6 - - - - - - - - - - - - - - - - - - - + + True + + + + + + 1 + 2 + + - - - - - - - - - - - - - - - - + True - 20 + 40 - + True - days + Update every - 5 - 6 + + True + 4 + + + True + True + 1 + True + True + + + + + 2 + 3 + + + + + + + True + + + True + times or + + + + + 3 + 4 + + + + True 4 @@ -770,71 +717,23 @@ - + True + 20 - + True - times or - - - - - 3 - 4 - - - - - - True - 4 - - - True - True - 1 - True - True + days - 2 - 3 + 5 + 6 - - - True - 40 - - - True - Update every - - - - - - - - - - - True - - - - - - 1 - 2 - - - False