changeset 17806:9056a3c1d470

merge of '2438302de25c5f5131f0c555507a057550b51c0f' and '8d549d248cf0e4a67929617edc6edcb977e41f17'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Sat, 26 May 2007 18:45:34 +0000
parents 7f652ef12ed6 (current diff) 202f4df12cf4 (diff)
children f8e3b38f8e12
files pidgin/gtkblist.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/purple-remote	Sat May 26 08:23:15 2007 +0000
+++ b/libpurple/purple-remote	Sat May 26 18:45:34 2007 +0000
@@ -94,7 +94,7 @@
 def execute(uri):
     match = re.match(urlregexp, uri)
     protocol = match.group(2)
-    if protocol == "xmpp"
+    if protocol == "xmpp":
         protocol = "jabber"
     if protocol == "aim" or protocol == "icq":
         protocol = "oscar"
--- a/pidgin/gtkblist.c	Sat May 26 08:23:15 2007 +0000
+++ b/pidgin/gtkblist.c	Sat May 26 18:45:34 2007 +0000
@@ -5779,6 +5779,8 @@
 	gtk_box_pack_end(GTK_BOX(rowbox), data->alias_entry, TRUE, TRUE, 0);
 	gtk_entry_set_activates_default(GTK_ENTRY(data->alias_entry), TRUE);
 	pidgin_set_accessible_label (data->alias_entry, label);
+	if (name != NULL)
+		gtk_widget_grab_focus(data->alias_entry);
 
 	rowbox = gtk_hbox_new(FALSE, 5);
 	gtk_box_pack_start(GTK_BOX(vbox), rowbox, FALSE, FALSE, 0);