Ubuntu

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

Proposed by Robert Sajdok on 2011-02-27
Status: Rejected
Rejected by: Martin Pitt on 2011-03-02
Proposed branch: lp:~ris/ubuntu/natty/empathy/fix-538963
Merge into: lp:ubuntu/natty/empathy
Diff against target: 25 lines (+7/-0) 2 files modified
To merge this branch: bzr merge lp:~ris/ubuntu/natty/empathy/fix-538963
Reviewer Review Type Date Requested Status
Martin Pitt 2011-02-27 Disapprove on 2011-03-02
Review via email: mp+51471@code.launchpad.net
To post a comment you must log in.
Martin Pitt (pitti) wrote :

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)

Preview Diff

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

Subscribers

People subscribed via source and target branches