# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1039838150 0
# Node ID 3ccbdf8e7f8d12019cf99eabaa4fbcae9fc66dc9
# Parent  405340263d75f5133d37c4f2ac1a05a91410d354
[gaim-migrate @ 4289]
Thanks Robot101

committer: Tailor Script <tailor@pidgin.im>

diff -r 405340263d75 -r 3ccbdf8e7f8d plugins/ticker/ticker.c
--- a/plugins/ticker/ticker.c	Sat Dec 14 03:06:34 2002 +0000
+++ b/plugins/ticker/ticker.c	Sat Dec 14 03:55:50 2002 +0000
@@ -94,8 +94,7 @@
         gtk_signal_connect (GTK_OBJECT(tickerwindow), "destroy",
                 GTK_SIGNAL_FUNC (BuddyTickerDestroyWindow), "WM destroy");
         gtk_window_set_title (GTK_WINDOW(tickerwindow), "Gaim - Buddy Ticker");
-        gtk_window_set_wmclass (GTK_WINDOW(tickerwindow), 
-                                "ticker", "Gaim");
+        gtk_window_set_role (GTK_WINDOW(tickerwindow), "ticker");
 	gtk_widget_realize(tickerwindow);
 
         ticker = gtk_ticker_new();
diff -r 405340263d75 -r 3ccbdf8e7f8d src/about.c
--- a/src/about.c	Sat Dec 14 03:06:34 2002 +0000
+++ b/src/about.c	Sat Dec 14 03:55:50 2002 +0000
@@ -81,7 +81,7 @@
 		gtk_window_set_default_size(GTK_WINDOW(about), 450, -1);
 		g_snprintf(abouttitle, sizeof(abouttitle), _("About Gaim v%s"), VERSION);
 		gtk_window_set_title(GTK_WINDOW(about), abouttitle);
-		gtk_window_set_wmclass(GTK_WINDOW(about), "about", "Gaim");
+		gtk_window_set_role(GTK_WINDOW(about), "about");
 		gtk_window_set_policy(GTK_WINDOW(about), FALSE, TRUE, TRUE);
 		gtk_widget_realize(about);
 
diff -r 405340263d75 -r 3ccbdf8e7f8d src/aim.c
--- a/src/aim.c	Sat Dec 14 03:06:34 2002 +0000
+++ b/src/aim.c	Sat Dec 14 03:55:50 2002 +0000
@@ -264,7 +264,7 @@
 
 	mainwindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
-	gtk_window_set_wmclass(GTK_WINDOW(mainwindow), "login", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(mainwindow), "login");
 	gtk_window_set_policy(GTK_WINDOW(mainwindow), FALSE, FALSE, TRUE);
 	gtk_window_set_title(GTK_WINDOW(mainwindow), _("Gaim - Login"));
 	gtk_widget_realize(mainwindow);
diff -r 405340263d75 -r 3ccbdf8e7f8d src/away.c
--- a/src/away.c	Sat Dec 14 03:06:34 2002 +0000
+++ b/src/away.c	Sat Dec 14 03:55:50 2002 +0000
@@ -181,7 +181,7 @@
 
 	if (!imaway) {
 		GAIM_DIALOG(imaway);
-		gtk_window_set_wmclass(GTK_WINDOW(imaway), "imaway", "Gaim");
+		gtk_window_set_role(GTK_WINDOW(imaway), "imaway");
 		if (strlen(a->name))
 			 gtk_window_set_title(GTK_WINDOW(imaway), a->name);
 		else
diff -r 405340263d75 -r 3ccbdf8e7f8d src/buddy.c
--- a/src/buddy.c	Sat Dec 14 03:06:34 2002 +0000
+++ b/src/buddy.c	Sat Dec 14 03:55:50 2002 +0000
@@ -2619,7 +2619,7 @@
 	gtk_window_set_gravity(GTK_WINDOW(blist), GDK_GRAVITY_STATIC);
 	gtk_window_set_policy(GTK_WINDOW(blist), TRUE, TRUE, TRUE);
 	gtk_window_set_title(GTK_WINDOW(blist), _("Gaim - Buddy List"));
-	gtk_window_set_wmclass(GTK_WINDOW(blist), "buddy_list", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(blist), "buddy_list");
 
 	gtk_widget_realize(blist);
 
diff -r 405340263d75 -r 3ccbdf8e7f8d src/buddy_chat.c
--- a/src/buddy_chat.c	Sat Dec 14 03:06:34 2002 +0000
+++ b/src/buddy_chat.c	Sat Dec 14 03:55:50 2002 +0000
@@ -267,7 +267,7 @@
 
 	if (!joinchat) {
 		GAIM_DIALOG(joinchat);
-		gtk_window_set_wmclass(GTK_WINDOW(joinchat), "joinchat", "Gaim");
+		gtk_window_set_role(GTK_WINDOW(joinchat), "joinchat");
 		gtk_window_set_policy(GTK_WINDOW(joinchat), FALSE, TRUE, TRUE);
 		gtk_widget_realize(joinchat);
 		gtk_signal_connect(GTK_OBJECT(joinchat), "delete_event",
@@ -1203,7 +1203,7 @@
 			win = all_chats = b->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 			if ((convo_options & OPT_CONVO_COMBINE) && (im_options & OPT_IM_ONE_WINDOW))
 				all_convos = all_chats;
-			gtk_window_set_wmclass(GTK_WINDOW(win), "buddy_chat", "Gaim");
+			gtk_window_set_role(GTK_WINDOW(win), "buddy_chat");
 			gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, FALSE);
 			gtk_container_border_width(GTK_CONTAINER(win), 0);
 			gtk_widget_realize(win);
@@ -1266,7 +1266,7 @@
 		win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 		b->window = win;
 		gtk_object_set_user_data(GTK_OBJECT(win), b);
-		gtk_window_set_wmclass(GTK_WINDOW(win), "buddy_chat", "Gaim");
+		gtk_window_set_role(GTK_WINDOW(win), "buddy_chat");
 		gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, TRUE);
 		gtk_container_border_width(GTK_CONTAINER(win), 10);
 		gtk_widget_realize(win);
diff -r 405340263d75 -r 3ccbdf8e7f8d src/conversation.c
--- a/src/conversation.c	Sat Dec 14 03:06:34 2002 +0000
+++ b/src/conversation.c	Sat Dec 14 03:55:50 2002 +0000
@@ -2813,7 +2813,7 @@
 			win = all_convos = c->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 			if ((convo_options & OPT_CONVO_COMBINE) && (chat_options & OPT_CHAT_ONE_WINDOW))
 				all_chats = all_convos;
-			gtk_window_set_wmclass(GTK_WINDOW(win), "conversation", "Gaim");
+			gtk_window_set_role(GTK_WINDOW(win), "conversation");
 			gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, FALSE);
 			gtk_container_border_width(GTK_CONTAINER(win), 0);
 			gtk_widget_realize(win);
@@ -2883,7 +2883,7 @@
 		cont = win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 		c->window = win;
 		gtk_object_set_user_data(GTK_OBJECT(win), c);
-		gtk_window_set_wmclass(GTK_WINDOW(win), "conversation", "Gaim");
+		gtk_window_set_role(GTK_WINDOW(win), "conversation");
 		gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, TRUE);
 		gtk_container_border_width(GTK_CONTAINER(win), 0);
 		gtk_widget_realize(win);
diff -r 405340263d75 -r 3ccbdf8e7f8d src/dialogs.c
--- a/src/dialogs.c	Sat Dec 14 03:06:34 2002 +0000
+++ b/src/dialogs.c	Sat Dec 14 03:55:50 2002 +0000
@@ -1046,7 +1046,7 @@
 	a->gc = gc ? gc : connections->data;
 
 	GAIM_DIALOG(a->window);
-	gtk_window_set_wmclass(GTK_WINDOW(a->window), "add_buddy", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(a->window), "add_buddy");
 	gtk_window_set_policy(GTK_WINDOW(a->window), FALSE, FALSE, TRUE);
 	gtk_window_set_title(GTK_WINDOW(a->window), _("Gaim - Add Buddy"));
 
@@ -1392,7 +1392,7 @@
 	
 	privacy_win = pwin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_policy(GTK_WINDOW(pwin), FALSE, TRUE, TRUE);
-	gtk_window_set_wmclass(GTK_WINDOW(pwin), "privacy", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(pwin), "privacy");
 	gtk_window_set_title(GTK_WINDOW(pwin), _("Gaim - Privacy"));
 	gtk_signal_connect(GTK_OBJECT(pwin), "destroy", GTK_SIGNAL_FUNC(destroy_privacy), NULL);
 	gtk_widget_realize(pwin);
@@ -1660,7 +1660,7 @@
 	GAIM_DIALOG(b->window);
 	dialogwindows = g_list_prepend(dialogwindows, b->window);
 	gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
-	gtk_window_set_wmclass(GTK_WINDOW(b->window), "new_bp", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(b->window), "new_bp");
 	gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - New Buddy Pounce"));
 	gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window);
 	gtk_widget_realize(b->window);
@@ -1944,7 +1944,7 @@
 
 	GAIM_DIALOG(b->window);
 	dialogwindows = g_list_prepend(dialogwindows, b->window);
-	gtk_window_set_wmclass(GTK_WINDOW(b->window), "set_dir", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(b->window), "set_dir");
 	gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
 	gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Set Dir Info"));
 	gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window);
@@ -2129,7 +2129,7 @@
 
 	GAIM_DIALOG(b->window);
 	gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
-	gtk_window_set_wmclass(GTK_WINDOW(b->window), "change_passwd", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(b->window), "change_passwd");
 	gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Password Change"));
 	gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window);
 	gtk_widget_realize(b->window);
@@ -2226,7 +2226,7 @@
 	b->user = tmp;
 
 	GAIM_DIALOG(b->window);
-	gtk_window_set_wmclass(GTK_WINDOW(b->window), "set_info", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(b->window), "set_info");
 	dialogwindows = g_list_prepend(dialogwindows, b->window);
 	gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Set User Info"));
 	gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window);
@@ -2650,7 +2650,7 @@
 	b->gc = gc;
 	GAIM_DIALOG(b->window);
 	gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
-	gtk_window_set_wmclass(GTK_WINDOW(b->window), "find_info", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(b->window), "find_info");
 	gtk_widget_show(b->window);
 
 	dialogwindows = g_list_prepend(dialogwindows, b->window);
@@ -2806,7 +2806,7 @@
 		b->gc = gc;
 	GAIM_DIALOG(b->window);
 	gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
-	gtk_window_set_wmclass(GTK_WINDOW(b->window), "find_email", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(b->window), "find_email");
 	gtk_widget_realize(b->window);
 	dialogwindows = g_list_prepend(dialogwindows, b->window);
 	gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window);
@@ -2890,7 +2890,7 @@
 	if (!c->link_dialog) {
 		struct linkdlg *b = g_new0(struct linkdlg, 1);
 		GAIM_DIALOG(c->link_dialog);
-		gtk_window_set_wmclass(GTK_WINDOW(c->link_dialog), "add_link", "Gaim");
+		gtk_window_set_role(GTK_WINDOW(c->link_dialog), "add_link");
 		dialogwindows = g_list_prepend(dialogwindows, c->link_dialog);
 
 		gtk_widget_set_usize(c->link_dialog, 270, 165);
@@ -3470,7 +3470,7 @@
 	GAIM_DIALOG(ca->window);
 	gtk_widget_set_usize(ca->window, -1, 250);
 	gtk_container_border_width(GTK_CONTAINER(ca->window), 5);
-	gtk_window_set_wmclass(GTK_WINDOW(ca->window), "away_mess", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(ca->window), "away_mess");
 	gtk_window_set_title(GTK_WINDOW(ca->window), _("Gaim - New away message"));
 	gtk_signal_connect(GTK_OBJECT(ca->window), "delete_event",
 			   GTK_SIGNAL_FUNC(destroy_dialog), ca->window);
@@ -3627,7 +3627,7 @@
 
 	GAIM_DIALOG(dialog);
 	gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, FALSE, TRUE);
-	gtk_window_set_wmclass(GTK_WINDOW(dialog), "smiley_dialog", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(dialog), "smiley_dialog");
 	gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE);
 
 	/* setup boxes */
@@ -3712,7 +3712,7 @@
 
 	GAIM_DIALOG(aliasdlg);
 	gtk_window_set_policy(GTK_WINDOW(aliasdlg), FALSE, FALSE, TRUE);
-	gtk_window_set_wmclass(GTK_WINDOW(aliasdlg), "alias_dialog", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(aliasdlg), "alias_dialog");
 	gtk_widget_realize(aliasdlg);
 	dialogwindows = g_list_prepend(dialogwindows, aliasdlg);
 
@@ -3883,7 +3883,7 @@
 	GtkWidget *hsep;
 
 	GAIM_DIALOG(window);
-	gtk_window_set_wmclass(GTK_WINDOW(window), "dialog", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(window), "dialog");
 	gtk_container_set_border_width(GTK_CONTAINER(window), 10);
 	gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE);
 	gtk_signal_connect(GTK_OBJECT(window), "delete_event", GTK_SIGNAL_FUNC(destroy_dialog), window);
@@ -4056,7 +4056,7 @@
 	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_object_set_user_data(GTK_OBJECT(window), name);
 	gtk_signal_connect(GTK_OBJECT(window), "destroy", GTK_SIGNAL_FUNC(des_log_win), NULL);
-	gtk_window_set_wmclass(GTK_WINDOW(window), "log", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(window), "log");
 	if (name)
 		g_snprintf(buf, BUF_LONG, "Gaim - Conversations with %s", name);
 	else
@@ -4252,7 +4252,7 @@
 
 	if (!rename_dialog) {
 		GAIM_DIALOG(rename_dialog);
-		gtk_window_set_wmclass(GTK_WINDOW(rename_dialog), "rename_dialog", "Gaim");
+		gtk_window_set_role(GTK_WINDOW(rename_dialog), "rename_dialog");
 		gtk_window_set_policy(GTK_WINDOW(rename_dialog), FALSE, TRUE, TRUE);
 		gtk_window_set_title(GTK_WINDOW(rename_dialog), _("Gaim - Rename Group"));
 		gtk_signal_connect(GTK_OBJECT(rename_dialog), "destroy",
@@ -4357,7 +4357,7 @@
 
 	if (!rename_bud_dialog) {
 		GAIM_DIALOG(rename_bud_dialog);
-		gtk_window_set_wmclass(GTK_WINDOW(rename_bud_dialog), "rename_bud_dialog", "Gaim");
+		gtk_window_set_role(GTK_WINDOW(rename_bud_dialog), "rename_bud_dialog");
 		gtk_window_set_policy(GTK_WINDOW(rename_bud_dialog), FALSE, TRUE, TRUE);
 		gtk_window_set_title(GTK_WINDOW(rename_bud_dialog), _("Gaim - Rename Buddy"));
 		gtk_signal_connect(GTK_OBJECT(rename_bud_dialog), "destroy",
@@ -5078,8 +5078,7 @@
  * data == pointer to MultiEntryDlg with the following
  *         initialized:
  *
- *           wmclass_name
- *           wmclass_class
+ *           role
  *           title
  *	     user
  *           multi_entry_items - pointers to MultiEntryData list
@@ -5101,7 +5100,7 @@
 
 	GAIM_DIALOG(b->window);
 	gtk_container_set_border_width(GTK_CONTAINER(b->window), 5);
-	gtk_window_set_wmclass(GTK_WINDOW(b->window), b->wmclass_name, b->wmclass_class);
+	gtk_window_set_role(GTK_WINDOW(b->window), b->role);
 	gtk_window_set_title(GTK_WINDOW (b->window), b->title);
 
 	/* Clean up if user dismisses window via window manager! */
diff -r 405340263d75 -r 3ccbdf8e7f8d src/gaim.h
--- a/src/gaim.h	Sat Dec 14 03:06:34 2002 +0000
+++ b/src/gaim.h	Sat Dec 14 03:55:50 2002 +0000
@@ -512,8 +512,7 @@
  */
 typedef struct multi_entry_dlg {
 	GtkWidget *window;			/* dialog main window */
-	gchar *wmclass_name;			/* window name */
-	gchar *wmclass_class;			/* window class */
+	gchar *role;				/* window role */
 	char *title;				/* window title */
 
 	struct aim_user *user;			/* user info - needed for most everything */
diff -r 405340263d75 -r 3ccbdf8e7f8d src/multi.c
--- a/src/multi.c	Sat Dec 14 03:06:34 2002 +0000
+++ b/src/multi.c	Sat Dec 14 03:55:50 2002 +0000
@@ -859,7 +859,7 @@
 	}
 
 	u->mod = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_wmclass(GTK_WINDOW(u->mod), "account", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(u->mod), "account");
 	gtk_widget_realize(u->mod);
 	gtk_window_set_title(GTK_WINDOW(u->mod), _("Gaim - Modify Account"));
 	gtk_window_set_policy(GTK_WINDOW(u->mod), FALSE, FALSE, TRUE);	/* nothing odd here :) */
@@ -1001,7 +1001,7 @@
 	passes = g_slist_append(passes, p);
 
 	GAIM_DIALOG(p->win);
-	gtk_window_set_wmclass(GTK_WINDOW(p->win), "password", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(p->win), "password");
 	gtk_container_border_width(GTK_CONTAINER(p->win), 5);
 	gtk_signal_connect(GTK_OBJECT(p->win), "destroy", GTK_SIGNAL_FUNC(pass_des), p);
 	gtk_widget_realize(p->win);
@@ -1181,7 +1181,7 @@
 	
 	acctedit = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_title(GTK_WINDOW(acctedit), _("Gaim - Account Editor"));
-	gtk_window_set_wmclass(GTK_WINDOW(acctedit), "accounteditor", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(acctedit), "accounteditor");
 	gtk_widget_realize(acctedit);
 	gtk_widget_set_usize(acctedit, -1, 250);
 	gtk_window_set_default_size(GTK_WINDOW(acctedit), 550, 250);
@@ -1496,7 +1496,7 @@
 		meter_win->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 		GAIM_DIALOG(meter_win->window);
 		gtk_window_set_policy(GTK_WINDOW(meter_win->window), 0, 0, 1);
-		gtk_window_set_wmclass(GTK_WINDOW(meter_win->window), "signon", "Gaim");
+		gtk_window_set_role(GTK_WINDOW(meter_win->window), "signon");
 		gtk_container_set_border_width(GTK_CONTAINER(meter_win->window), 5);
 		gtk_window_set_title (GTK_WINDOW (meter_win->window), "Gaim Account Signon");
 		gtk_widget_realize(meter_win->window);
diff -r 405340263d75 -r 3ccbdf8e7f8d src/prefs.c
--- a/src/prefs.c	Sat Dec 14 03:06:34 2002 +0000
+++ b/src/prefs.c	Sat Dec 14 03:55:50 2002 +0000
@@ -1436,7 +1436,7 @@
 
 	/* Create the window */
 	prefs = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_wmclass(GTK_WINDOW(prefs), "preferences", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(prefs), "preferences");
 	gtk_widget_realize(prefs);
 	gtk_window_set_title(GTK_WINDOW(prefs), _("Gaim - Preferences"));
 	gtk_window_set_policy (GTK_WINDOW(prefs), FALSE, FALSE, TRUE);
diff -r 405340263d75 -r 3ccbdf8e7f8d src/protocols/jabber/jabber.c
--- a/src/protocols/jabber/jabber.c	Sat Dec 14 03:06:34 2002 +0000
+++ b/src/protocols/jabber/jabber.c	Sat Dec 14 03:55:50 2002 +0000
@@ -3926,8 +3926,7 @@
 	}
 
 	b->title = _("Gaim - Edit Jabber vCard");
-	b->wmclass_name = "set_info";
-	b->wmclass_class = "Gaim";
+	b->role = "set_info";
 	b->instructions->text = g_strdup(multi_entry_instructions);
 	b->entries_title = g_strdup(entries_title);
 
diff -r 405340263d75 -r 3ccbdf8e7f8d src/prpl.c
--- a/src/prpl.c	Sat Dec 14 03:06:34 2002 +0000
+++ b/src/prpl.c	Sat Dec 14 03:55:50 2002 +0000
@@ -247,7 +247,7 @@
 
 	GAIM_DIALOG(window);
 	p->window = window;
-	gtk_window_set_wmclass(GTK_WINDOW(window), "prompt", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(window), "prompt");
 	gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE);
 	gtk_window_set_title(GTK_WINDOW(window), _("Gaim - Prompt"));
 	gtk_signal_connect(GTK_OBJECT(window), "destroy", GTK_SIGNAL_FUNC(des_prompt), p);
@@ -469,7 +469,7 @@
 
 
 	GAIM_DIALOG(mn->email_win);
-	gtk_window_set_wmclass(GTK_WINDOW(mn->email_win), "mail", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(mn->email_win), "mail");
 	gtk_window_set_policy(GTK_WINDOW(mn->email_win), FALSE, TRUE, TRUE);
 	gtk_window_set_title(GTK_WINDOW(mn->email_win), _("Gaim - New Mail"));
 	gtk_signal_connect(GTK_OBJECT(mn->email_win), "destroy", GTK_SIGNAL_FUNC(des_email_win), mn);
@@ -712,7 +712,7 @@
 
 	regdlg = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_title(GTK_WINDOW(regdlg), _("Gaim - Registration"));
-	gtk_window_set_wmclass(GTK_WINDOW(regdlg), "register", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(regdlg), "register");
 	gtk_widget_realize(regdlg);
 	gtk_signal_connect(GTK_OBJECT(regdlg), "destroy", GTK_SIGNAL_FUNC(delete_regdlg), NULL);
 
diff -r 405340263d75 -r 3ccbdf8e7f8d src/server.c
--- a/src/server.c	Sat Dec 14 03:06:34 2002 +0000
+++ b/src/server.c	Sat Dec 14 03:55:50 2002 +0000
@@ -1118,7 +1118,7 @@
 	char *url = g_strdup(u);
 
 	GAIM_DIALOG(window);
-	gtk_window_set_wmclass(GTK_WINDOW(window), "popup", "Gaim");
+	gtk_window_set_role(GTK_WINDOW(window), "popup");
 	gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, TRUE);
 	gtk_window_set_title(GTK_WINDOW(window), "Gaim - Popup");
 	gtk_container_set_border_width(GTK_CONTAINER(window), 5);