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

[Robert Sajdok]

[Bilal Akhtar (bilalakhtar)]

Please add a debian/changelog message as well.

To do this, run:

dch -i

in a terminal and describe the changes you made there.

Oh, and, please ensure that these changes are made into a quilt patch. http://wiki.debian.org/UsingQuilt will help.

review: Needs Fixing

[lp:~ris/ubuntu/natty/empathy/fix-681413]

129. By Robert Sajdok on 2010-12-10

src/empathy-main-window.c fixed: add tooltip for error. (LP: #681413)

[Robert Sajdok (ris)]

On 12/10/10 at 10:09am, Bilal Akhtar wrote:
> Review: Needs Fixing
> Please add a debian/changelog message as well.
>
> To do this, run:
>
> dch -i
>
> in a terminal and describe the changes you made there.
>
> Oh, and, please ensure that these changes are made into a quilt patch. http://wiki.debian.org/UsingQuilt will help.

I did it this way:

$ dch -i
$ bzr diff
$ debcommit
$ bzr push lp:~ris/ubuntu/natty/empathy/fix-681413

Correct?

[Bilal Akhtar (bilalakhtar)]

On 12/10/2010 03:13 PM, Robert Sajdok wrote:
> On 12/10/10 at 10:09am, Bilal Akhtar wrote:
>> Review: Needs Fixing
>> Please add a debian/changelog message as well.
>>
>> To do this, run:
>>
>> dch -i
>>
>> in a terminal and describe the changes you made there.
>>
>> Oh, and, please ensure that these changes are made into a quilt patch. http://wiki.debian.org/UsingQuilt will help.
>
> I did it this way:
>
> $ dch -i
> $ bzr diff
> $ debcommit
> $ bzr push lp:~ris/ubuntu/natty/empathy/fix-681413
>
> Correct?

yes

Unmerged revisions

129. By Robert Sajdok on 2010-12-10

src/empathy-main-window.c fixed: add tooltip for error. (LP: #681413)

128. By Robert Sajdok on 2010-12-09

Fix bug:
https://bugs.launchpad.net/ubuntu/+source/empathy/+bug/681413

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-06 16:14:51 +0000
+++ debian/changelog	2010-12-10 12:06:28 +0000
@@ -1,3 +1,9 @@
+empathy (2.32.2-0ubuntu3) lucid; urgency=low
+
+  * src/empathy-main-window.c fixed: add tooltip for error. (LP: #681413)
+
+ -- Robert Sajdok <[e-mail]>  Fri, 10 Dec 2010 12:52:47 +0100
+
 empathy (2.32.2-0ubuntu2) natty; urgency=low
 
   * debian/patches/00git_folks_aliasable_groupable.patch:

=== modified file 'src/empathy-main-window.c'
--- src/empathy-main-window.c	2010-11-17 10:05:40 +0000
+++ src/empathy-main-window.c	2010-12-10 12:06:28 +0000
@@ -612,7 +612,8 @@
 	g_signal_connect (retry_button, "clicked",
 			  G_CALLBACK (main_window_error_retry_clicked_cb),
 			  window);
-
+	
+	gtk_widget_set_tooltip_text(priv->errors_vbox, error_message);
 	gtk_widget_show (priv->errors_vbox);
 
 	g_hash_table_insert (priv->errors, g_object_ref (account), info_bar);