Merge lp:~ris/empathy/fix-681413 into lp:~vcs-imports/empathy/master

[Robert Sajdok]

[Bilal Akhtar (bilalakhtar)]

There are a few things wrong with this:

1) You have proposed a merge into lp:empathy, instead you should branch from, and propose into lp:ubuntu/empathy .

2) It would be better if you forwarded this patch to upstream.

[Robert Sajdok (ris)]

On 12/09/10 at 07:06am, Bilal Akhtar wrote:
> There are a few things wrong with this:
>
> 1) You have proposed a merge into lp:empathy, instead you should branch from, and propose into lp:ubuntu/empathy .

I try and I get errors:
 $ bzr push lp:~ris/ubuntu/empathy/fix-681413
 bzr: ERROR: Invalid url supplied to transport: "lp:~ris/ubuntu/empathy/fix-681413": No such distribution series empathy.

 $ bzr push lp:~ris/ubuntu/natty/empathy/fix-681413
 Using default stacking branch /~ubuntu-branches/ubuntu/natty/empathy/natty at lp-89025360:///~ris/ubuntu/natty/empathy
 bzr: ERROR: CHKInventoryRepository('lp-89025360:///~ubuntu-branches/ubuntu/natty/empathy/natty/.bzr/repository')
 is not compatible with
 KnitPackRepository('lp-89025360:///~ris/ubuntu/natty/empathy/fix-681413/.bzr/repository')
 different serializers

Only this works:
 $ bzr push lp:~ris/empathy/fix-681413

>
> 2) It would be better if you forwarded this patch to upstream.

Yes. I will do that.

[Bilal Akhtar (bilalakhtar)]

I said that you will have to branch from lp:ubuntu/empathy first, make the changes, and THEN push to lp:~ris/ubuntu/natty/empathy/whatever .

If you have forwarded your patch already, then its okay. But if you want to request for sponsorship in Ubuntu as well, then you must do the above, else no one will look at this merge request.

[Robert Sajdok (ris)]

On 12/09/10 at 09:39am, Bilal Akhtar wrote:
> I said that you will have to branch from lp:ubuntu/empathy first, make the changes, and THEN push to lp:~ris/ubuntu/natty/empathy/whatever .
>
> If you have forwarded your patch already, then its okay. But if you want to request for sponsorship in Ubuntu as well, then you must do the above, else no one will look at this merge request.

I made two branches. First for upstream second for ubuntu/empathy. Is this correct?

[Bilal Akhtar (bilalakhtar)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 12/09/2010 02:23 PM, Robert Sajdok wrote:
> On 12/09/10 at 09:39am, Bilal Akhtar wrote:
>> I said that you will have to branch from lp:ubuntu/empathy first, make the changes, and THEN push to lp:~ris/ubuntu/natty/empathy/whatever .
>>
>> If you have forwarded your patch already, then its okay. But if you want to request for sponsorship in Ubuntu as well, then you must do the above, else no one will look at this merge request.
>
> I made two branches. First for upstream second for ubuntu/empathy. Is this correct?

Perfect. Just wait for one side (either Ubuntu or upstream) to accept
the patch and then close the other merge proposal :).

(Just telling in case you don't know) Upstream takes patches on their
bugzilla (bugs.gnome.org). Find the respective bug there and attach the
below diff there. Upstream guys aren't likely to come here and check any
merge proposals on lp:empathy.

Good luck!

- --
Bilal Akhtar - Ubuntu Developer, yet still 14 years old.
More information about him can be found on
https://edge.launchpad.net/~bilalakhtar
IRC nick: bilalakhtar
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJNAMu/AAoJENsMxwzgYeH2394H/02NAPjxl/3Yag2BF6vNCk/p
g+NNa0WZJqRI0F9W4J2k6+Ga6ok2XTsH/onX4QZ61nzHpVAEk53K2+9VYYJKRq+N
aD/IAhCLEHQQ2cRUBoUJPJs9/bVjHAc1auwvESWiBPbT1yfu7mp2zs9nVhRpIoL2
XNOdIZUMleHf6PmI6CIdzQ/vuz52cWcQytKFCFO10omVeJQwtMy8O8m6V1UldYpe
YSigJBpw6TDhCy0AQYEosRSdDTXodVpXsHr4lW9cF/yWSSEt3yCqw9i4yC08wo+o
NSXi6r2PIXFE+76cp058YnDOTF7nlm+rBPAvc454qmxkgAYuZ+km/J2qj9TNDmY=
=JAwJ
-----END PGP SIGNATURE-----

[Robert Sajdok (ris)]

On 12/09/10 at 12:31pm, Bilal Akhtar wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 12/09/2010 02:23 PM, Robert Sajdok wrote:
> > On 12/09/10 at 09:39am, Bilal Akhtar wrote:
> >> I said that you will have to branch from lp:ubuntu/empathy first, make the changes, and THEN push to lp:~ris/ubuntu/natty/empathy/whatever .
> >>
> >> If you have forwarded your patch already, then its okay. But if you want to request for sponsorship in Ubuntu as well, then you must do the above, else no one will look at this merge request.
> >
> > I made two branches. First for upstream second for ubuntu/empathy. Is this correct?
>
> Perfect. Just wait for one side (either Ubuntu or upstream) to accept
> the patch and then close the other merge proposal :).
Yes. I clicked "Proposal to merge branch"
>
> (Just telling in case you don't know) Upstream takes patches on their
> bugzilla (bugs.gnome.org). Find the respective bug there and attach the
> below diff there. Upstream guys aren't likely to come here and check any
> merge proposals on lp:empathy.
Yes. I sent patch to upstream:
https://bugzilla.gnome.org/show_bug.cgi?id=626507#c6

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

6257. By Robert Sajdok on 2010-12-09

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

Unmerged revisions

6257. By Robert Sajdok on 2010-12-09

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

6256. By Robert Sajdok on 2010-12-08

Bug:
https://bugs.launchpad.net/hundredpapercuts/+bug/681413

=== modified file 'src/empathy-main-window.c'
--- src/empathy-main-window.c	2010-08-27 09:57:14 +0000
+++ src/empathy-main-window.c	2010-12-09 18:55:10 +0000
@@ -588,6 +588,7 @@
 			  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);