diff pidgin-twitter.c @ 176:7affa10c1f0e multiaccounts

removed some global preferences that was replaced preferences per conversation

--- a/pidgin-twitter.c	Sat Aug 02 12:15:05 2008 +0900
+++ b/pidgin-twitter.c	Sat Aug 02 22:09:41 2008 +0900
@@ -2435,14 +2435,6 @@
 	}
 }
 
-static void
-api_base_post_cb(const char *name, PurplePrefType type, gconstpointer value,
-                 gpointer data)
-{
-    signed_on_cb(NULL);
-    get_status_with_api((gpointer)(source.conv));
-}
-
 static gboolean
 load_plugin(PurplePlugin *plugin)
 {
@@ -2631,21 +2623,6 @@
 }
 
 static void
-interval_prefs_cb(const char *name, PurplePrefType type,
-                   gconstpointer val, gpointer data)
-{
-    /* remove idle func */
-    g_source_remove_by_user_data((gpointer)(source.conv));
-
-    /* add idle func */
-    if(purple_prefs_get_bool(OPT_API_BASE_POST)) {
-        source.id = g_timeout_add_seconds(
-            purple_prefs_get_int(OPT_API_BASE_GET_INTERVAL),
-            get_status_with_api, (gpointer)(source.conv));
-    }
-}
-
-static void
 text_changed_cb(gpointer *data)
 {
     const gchar *text;
@@ -2735,78 +2712,6 @@
     /* connect to signals */
     /**********************/
 
-    /****************/
-    /* account page */
-    /****************/
-    e = GTK_WIDGET(gtk_builder_get_object (builder, "account_twitter"));
-    g_object_set_data(G_OBJECT(e), "pref", OPT_SCREEN_NAME_TWITTER);
-    text = purple_prefs_get_string(OPT_SCREEN_NAME_TWITTER);
-    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_wassr"));
-    g_object_set_data(G_OBJECT(e), "pref", OPT_SCREEN_NAME_WASSR);
-    text = purple_prefs_get_string(OPT_SCREEN_NAME_WASSR);
-    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_identica"));
-    g_object_set_data(G_OBJECT(e), "pref", OPT_SCREEN_NAME_IDENTICA);
-    text = purple_prefs_get_string(OPT_SCREEN_NAME_IDENTICA);
-    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),
-                                 purple_prefs_get_bool(OPT_API_BASE_POST));
-    g_signal_connect(e, "toggled",
-                     G_CALLBACK(bool_toggled_cb), &e);
-    purple_prefs_connect_callback(plugin, OPT_API_BASE_POST, /* xxx divide? */
-                                  api_base_post_cb, NULL);
-
-    e = GTK_WIDGET(gtk_builder_get_object (builder, "account_api_password"));
-    g_object_set_data(G_OBJECT(e), "pref", OPT_PASSWORD_TWITTER);
-
-    gtk_entry_set_visibility(GTK_ENTRY(e), FALSE);
-    if (gtk_entry_get_invisible_char(GTK_ENTRY(e)) == '*')
-        gtk_entry_set_invisible_char(GTK_ENTRY(e), PIDGIN_INVISIBLE_CHAR);
-
-    text = purple_prefs_get_string(OPT_PASSWORD_TWITTER);
-    gtk_entry_set_text(GTK_ENTRY(e), text);
-    g_signal_connect(e, "changed",
-                     G_CALLBACK(text_changed_cb), &e);
-
-
-    /* interval spin */
-    e = GTK_WIDGET(gtk_builder_get_object (builder,
-                       "account_api_get_interval_spin"));
-    g_object_set_data(G_OBJECT(e), "pref", OPT_API_BASE_GET_INTERVAL);
-
-    spin = GTK_SPIN_BUTTON(e);
-
-    value = purple_prefs_get_int(OPT_API_BASE_GET_INTERVAL);
-    twitter_debug("spin value = %d\n", value);
-
-	adjust = gtk_adjustment_new(value, 40, 3600, 10, 100, 100);
-    gtk_spin_button_set_adjustment(spin, GTK_ADJUSTMENT(adjust));
-    gtk_widget_set_size_request(GTK_WIDGET(spin), 50, -1);
-
-    if(value == 0) {
-        value = TWITTER_DEFAULT_INTERVAL;
-        purple_prefs_set_int(OPT_API_BASE_GET_INTERVAL, value);
-    }
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(e), (gdouble)value);
-    g_signal_connect(e, "value-changed",
-                     G_CALLBACK(spin_changed_cb), &e);
-    purple_prefs_connect_callback(plugin, OPT_API_BASE_GET_INTERVAL,
-                                  interval_prefs_cb, NULL);
-
-
-
     /********************/
     /* translation page */
     /********************/
@@ -3311,7 +3216,7 @@
     g_source_remove_by_user_data((gpointer)(source.conv));
 
     /* add idle func */
-    if(purple_prefs_get_bool(OPT_API_BASE_POST)) {
+    if(service_account_get_bool(account, conv_name, OPT_API_BASE_POST, FALSE)) {
         source.id = g_timeout_add_seconds(
             service_account_get_int(account,
                                     conv_name,
@@ -3508,13 +3413,6 @@
     purple_prefs_add_bool(OPT_SUPPRESS_OOPS, TRUE);
     purple_prefs_add_bool(OPT_PREVENT_NOTIFICATION, FALSE);
 
-    purple_prefs_add_bool(OPT_API_BASE_POST, FALSE);
-    purple_prefs_add_int(OPT_API_BASE_GET_INTERVAL, TWITTER_DEFAULT_INTERVAL);
-    purple_prefs_add_string(OPT_SCREEN_NAME_TWITTER, EMPTY);
-    purple_prefs_add_string(OPT_PASSWORD_TWITTER, EMPTY);
-    purple_prefs_add_string(OPT_SCREEN_NAME_WASSR, EMPTY);
-    purple_prefs_add_string(OPT_SCREEN_NAME_IDENTICA, EMPTY);
-
     purple_prefs_add_bool(OPT_SHOW_ICON, TRUE);
     purple_prefs_add_int(OPT_ICON_SIZE, DEFAULT_ICON_SIZE);
     purple_prefs_add_bool(OPT_UPDATE_ICON, TRUE);