changeset 17138:b40f3d7da1fc

merge of '49922af0141ac5ca1baaa557377a5343ae781fb9' and 'db33dae23c4751158ddcd578ea0fc89ae1090fdd'

--- a/libpurple/plugins/perl/perl-common.c	Sat May 19 02:43:28 2007 +0000
+++ b/libpurple/plugins/perl/perl-common.c	Sat May 19 02:46:34 2007 +0000
@@ -80,7 +80,7 @@
 	stash = gv_stashpv(stash_name, 1);
 
 	hv = newHV();
-	hv_store(hv, "_purple", 5, create_sv_ptr(object), 0);
+	hv_store(hv, "_purple", 7, create_sv_ptr(object), 0);
 
 	return sv_bless(newRV_noinc((SV *)hv), stash);
 }
@@ -94,7 +94,7 @@
 	hv = hvref(o);
 
 	if (hv != NULL) {
-		sv = hv_fetch(hv, "_purple", 5, 0);
+		sv = hv_fetch(hv, "_purple", 7, 0);
 
 		if (sv != NULL)
 			return TRUE;
@@ -118,7 +118,7 @@
 	if (hv == NULL)
 		return NULL;
 
-	sv = hv_fetch(hv, "_purple", 5, 0);
+	sv = hv_fetch(hv, "_purple", 7, 0);
 
 	if (sv == NULL)
 		croak("variable is damaged");

--- a/pidgin/plugins/pidginrc.c	Sat May 19 02:43:28 2007 +0000
+++ b/pidgin/plugins/pidginrc.c	Sat May 19 02:46:34 2007 +0000
@@ -81,16 +81,15 @@
 };
 static GtkWidget *font_widgets[G_N_ELEMENTS(font_prefs)];
 
+/*
 static const char *widget_bool_prefs[] = {
-	"/plugins/gtk/purplerc/bool/GtkTreeView::indent_expanders",
 };
 static const char *widget_bool_prefs_set[] = {
-	"/plugins/gtk/purplerc/set/bool/GtkTreeView::indent_expanders",
 };
 static const char *widget_bool_names[] = {
-	N_("GtkTreeView Indent Expanders"),
 };
 static GtkWidget *widget_bool_widgets[G_N_ELEMENTS(widget_bool_prefs)];
+*/
 
 static void
 purplerc_make_changes()
@@ -143,6 +142,7 @@
 		}
 	}
 
+	/*
 	for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
 		if (purple_prefs_get_bool(widget_bool_prefs_set[i])) {
 			prefbase = g_path_get_basename(widget_bool_prefs[i]);
@@ -152,6 +152,7 @@
 			g_free(prefbase);
 		}
 	}
+	*/
 
 	g_string_append(style_string, "}");
 	g_string_append(style_string, "widget_class \"*\" style \"purplerc_style\"\n");
@@ -236,6 +237,7 @@
 		}
 	}
 
+	/*
 	for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
 		if (purple_prefs_get_bool(widget_bool_prefs_set[i])) {
 			prefbase = g_path_get_basename(widget_bool_prefs[i]);
@@ -245,6 +247,7 @@
 			g_free(prefbase);
 		}
 	}
+	*/
 
 	g_string_append(style_string, "}");
 	g_string_append(style_string, "widget_class \"*\" style \"purplerc_style\"\n");
@@ -486,6 +489,7 @@
 	g_signal_connect(G_OBJECT(check), "toggled",
 	                 G_CALLBACK(pidgin_toggle_sensitive), widget);
 
+	/*
 	for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
 		hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
 		gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
@@ -495,15 +499,16 @@
 		gtk_size_group_add_widget(labelsg, check);
 
 		widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-		/*
+		*
 		gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-		*/
+		*
 		gtk_widget_set_sensitive(widget_bool_widgets[i],
 		                         purple_prefs_get_bool(widget_bool_prefs_set[i]));
 		g_signal_connect(G_OBJECT(check), "toggled",
 		                 G_CALLBACK(pidgin_toggle_sensitive),
 		                 widget_bool_widgets[i]);
 	}
+	*/
 
 	frame = pidgin_make_frame(ret, _("Interface colors"));
 	/* imhtml stuff */
@@ -677,12 +682,14 @@
 		purple_prefs_add_bool(font_prefs_set[i], FALSE);
 	}
 
+	/*
 	purple_prefs_add_none("/plugins/gtk/purplerc/bool");
 	purple_prefs_add_none("/plugins/gtk/purplerc/set/bool");
 	for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
 		purple_prefs_add_bool(widget_bool_prefs[i], TRUE);
 		purple_prefs_add_bool(widget_bool_prefs_set[i], FALSE);
 	}
+	*/
 }
 
 PURPLE_INIT_PLUGIN(purplerc, purplerc_init, purplerc_info)