Merge lp:~ris/ubuntu/natty/empathy/fix-538963 into lp:ubuntu/natty/empathy

[Robert Sajdok]

[Martin Pitt (pitti)]

Thanks for your patch! It has been accepted upstream, and thus we'll get it once upstream pushes out the next release.

Closing this merge proposal, because it's against the wrong branch (we use lp:~ubuntu-desktop/empathy/ubuntu, see Vcs-Bzr: header), it uses an inline patch instead of a separate debian/patches/ patch header, and we don't need to cherrypick it now as we'll get the next upstream release into natty. Thanks!

review: Disapprove

Unmerged revisions

140. By Robert Sajdok on 2011-02-27

src/empathy-main-window.c: fixed: "reducing the width of contact list disappears combobox" (LP: #538963)

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-24 15:52:19 +0000
+++ debian/changelog	2011-02-27 20:11:23 +0000
@@ -1,3 +1,9 @@
+empathy (2.33.2-0ubuntu3) natty; urgency=low
+
+  * src/empathy-main-window.c: fixed: "reducing the width of contact list disappears combobox" (LP: #538963)
+
+ -- Robert Sajdok <[e-mail]>  Sun, 27 Feb 2011 21:02:32 +0100
+
 empathy (2.33.2-0ubuntu2) natty; urgency=low
 
   * debian/patches/23_idomessagedialog_for_voip_and_ft.patch
 
=== modified file 'src/empathy-main-window.c'
--- src/empathy-main-window.c	2011-02-24 11:54:47 +0000
+++ src/empathy-main-window.c	2011-02-27 20:11:23 +0000
@@ -1858,6 +1858,7 @@
 	gtk_widget_show (priv->presence_chooser);
 	item = gtk_tool_item_new ();
 	gtk_widget_show (GTK_WIDGET (item));
+	gtk_widget_set_size_request(priv->presence_chooser, 10, -1);
 	gtk_container_add (GTK_CONTAINER (item), priv->presence_chooser);
 	gtk_tool_item_set_is_important (item, TRUE);
 	gtk_tool_item_set_expand (item, TRUE);