changeset 16198:88a93f78b489

I don't like the pidginfoo_bar widget names that resulted from the sed. This changes them to pidgin_foo_bar, which is nicer and more consistent with some that survived the sed with an _ intact. I've also updated our gtkrc-2.0 to match these changes and be Gaim free.

--- a/doc/gtkrc-2.0	Mon Apr 16 02:09:17 2007 +0000
+++ b/doc/gtkrc-2.0	Mon Apr 16 02:19:58 2007 +0000
@@ -11,30 +11,25 @@
 
 # The following section allows you to change the style of the conversation
 # window widgets, log viewer widget, and request and notify window widgets.
-# These only work in Gaim 0.78 or higher.
 style "imhtml-fix"
 {
 font_name = "Sans 10"
 }
 # Set the widget style for the conversation entry box
-widget "*gaim_gtkconv_entry" style "imhtml-fix"
+widget "*pidgin_conv_entry" style "imhtml-fix"
 # Set the widget style for the conversation
-widget "*gaim_gtkconv_imhtml" style "imhtml-fix"
+widget "*pidgin_conv_imhtml" style "imhtml-fix"
 
 # Set the widget style for the log viewer
-widget "*gaim_gtklog_imhtml" style "imhtml-fix"
+widget "*pidgin_log_imhtml" style "imhtml-fix"
 
 # Set the widget style for IMHtml input widgets in request dialogs
-widget "*gaim_gtkrequest_imhtml" style "imhtml-fix"
+widget "*pidgin_request_imhtml" style "imhtml-fix"
 # Set the widget style for IMHtml widgets in notify dialogs
-widget "*gaim_gtknotify_imhtml" style "imhtml-fix"
-
-# Uncommenting the line below sets all IMHtml widgets in Gaim to the same style
-# and will work in Gaim versions prior to 0.78
-#widget_class "*.GtkScrolledWindow.GtkIMHtml" style "imhtml-fix"
+widget "*pidgin_notify_imhtml" style "imhtml-fix"
 
 # The following lets you customize the color of hyperlinks
-# and also the text cursors. The link color thing is Gaim specific
+# and also the text cursors. The link color thing is Pidgin specific
 # but the rest work for any Gtk2 program. You can search the Gtk2
 # docs for other style properties.
 style "my-style-name" {
@@ -46,18 +41,17 @@
 
 # This style sets the expander size on a treeview to 0, which has the result
 # of reducing the indent for items in the tree. This can be applied to the
-# Gaim buddy list to reduce it's width.
-# This only works in Gaim 0.79 and higher
+# Pidgin buddy list to reduce it's width.
 style "my-narrow-tree"
 {
   GtkTreeView::expander_size = 0
 }
 
 # And apply the style to the buddy list:
-widget "*gaim_gtkblist_treeview" style "my-narrow-tree"
+widget "*pidgin_blist_treeview" style "my-narrow-tree"
 
-# In Gaim 2.0.0 and later, you can set custom keybindings in your theme.  Here
-# is an example to follow
+# In Pidgin, you can set custom keybindings in your theme.
+# Here is an example to follow:
 
 binding "my-bindings"
 {
@@ -73,7 +67,8 @@
 	bind "<ctrl><alt><shift>F3" { "format_toggle" (4) }
 }
   
-widget "*gaim_gtkconv_entry" binding "my-bindings"
+widget "*pidgin_conv_entry" binding "my-bindings"
  
-#to let you edit your gaim key bindings
+# This lets you edit your Pidgin key bindings from within Pidgin,
+# by hovering over a menu item and hitting a key combo.
 gtk-can-change-accels = 1

--- a/pidgin/gtkblist.c	Mon Apr 16 02:09:17 2007 +0000
+++ b/pidgin/gtkblist.c	Mon Apr 16 02:19:58 2007 +0000
@@ -4322,7 +4322,7 @@
 	gtkblist->treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(gtkblist->treemodel));
 
 	gtk_widget_show(gtkblist->treeview);
-	gtk_widget_set_name(gtkblist->treeview, "pidginblist_treeview");
+	gtk_widget_set_name(gtkblist->treeview, "pidgin_blist_treeview");
 
 	g_signal_connect(gtkblist->treeview,
 			 "style-set",
@@ -4465,7 +4465,7 @@
 	/* Add the statusbox */
 	gtkblist->statusbox = pidgin_status_box_new();
 	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->statusbox, FALSE, TRUE, 0);
-	gtk_widget_set_name(gtkblist->statusbox, "pidginblist_statusbox");
+	gtk_widget_set_name(gtkblist->statusbox, "pidgin_blist_statusbox");
 	gtk_container_set_border_width(GTK_CONTAINER(gtkblist->statusbox), 3);
 	gtk_widget_show(gtkblist->statusbox);
 

--- a/pidgin/gtklog.c	Mon Apr 16 02:09:17 2007 +0000
+++ b/pidgin/gtklog.c	Mon Apr 16 02:19:58 2007 +0000
@@ -619,7 +619,7 @@
 
 	/* Viewer ************/
 	frame = pidgin_create_imhtml(FALSE, &lv->imhtml, NULL, NULL);
-	gtk_widget_set_name(lv->imhtml, "pidginlog_imhtml");
+	gtk_widget_set_name(lv->imhtml, "pidgin_log_imhtml");
 	gtk_widget_set_size_request(lv->imhtml, 320, 200);
 	gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
 	gtk_widget_show(frame);

--- a/pidgin/gtknotify.c	Mon Apr 16 02:09:17 2007 +0000
+++ b/pidgin/gtknotify.c	Mon Apr 16 02:19:58 2007 +0000
@@ -597,7 +597,7 @@
 
 	/* Add the imhtml */
 	frame = pidgin_create_imhtml(FALSE, &imhtml, NULL, NULL);
-	gtk_widget_set_name(imhtml, "pidginnotify_imhtml");
+	gtk_widget_set_name(imhtml, "pidgin_notify_imhtml");
 	gtk_imhtml_set_format_functions(GTK_IMHTML(imhtml),
 			gtk_imhtml_get_format_functions(GTK_IMHTML(imhtml)) | GTK_IMHTML_IMAGE);
 	gtk_widget_set_size_request(imhtml, 300, 250);

--- a/pidgin/gtkprefs.c	Mon Apr 16 02:09:17 2007 +0000
+++ b/pidgin/gtkprefs.c	Mon Apr 16 02:19:58 2007 +0000
@@ -925,7 +925,7 @@
 	vbox = pidgin_make_frame(ret, _("Default Formatting"));
 
 	frame = pidgin_create_imhtml(TRUE, &imhtml, &toolbar, NULL);
-	gtk_widget_set_name(imhtml, "pidginprefs_font_imhtml");
+	gtk_widget_set_name(imhtml, "pidgin_prefs_font_imhtml");
 	gtk_imhtml_set_whole_buffer_formatting_only(GTK_IMHTML(imhtml), TRUE);
 	gtk_imhtml_set_format_functions(GTK_IMHTML(imhtml),
 									GTK_IMHTML_BOLD |

--- a/pidgin/gtkrequest.c	Mon Apr 16 02:09:17 2007 +0000
+++ b/pidgin/gtkrequest.c	Mon Apr 16 02:19:58 2007 +0000
@@ -372,7 +372,7 @@
 		/* imhtml */
 		frame = pidgin_create_imhtml(TRUE, &entry, &toolbar, NULL);
 		gtk_widget_set_size_request(entry, 320, 130);
-		gtk_widget_set_name(entry, "pidginrequest_imhtml");
+		gtk_widget_set_name(entry, "pidgin_request_imhtml");
 		if (default_value != NULL)
 			gtk_imhtml_append_text(GTK_IMHTML(entry), default_value, GTK_IMHTML_NO_SCROLL);
 		gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);