Merge lp://qastaging/~bratsche/appmenu-gtk/ubuntu-no-proxy-support into lp://qastaging/appmenu-gtk/0.4
Proposed by
Cody Russell
| Status: | Merged |
|---|---|
| Merged at revision: | 23 |
| Proposed branch: | lp://qastaging/~bratsche/appmenu-gtk/ubuntu-no-proxy-support |
| Merge into: | lp://qastaging/appmenu-gtk/0.4 |
| Diff against target: |
23 lines (+13/-0) 1 file modified
src/bridge.c (+13/-0) |
| To merge this branch: | bzr merge lp://qastaging/~bratsche/appmenu-gtk/ubuntu-no-proxy-support |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ted Gould (community) | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks fine to me.
review approve
On Wed, 2010-06-16 at 21:13 +0000, Cody Russell wrote:
> Cody Russell has proposed merging lp:~bratsche/appmenu-gtk/ubuntu-no-proxy-support into lp:appmenu-gtk.
>
> Requested reviews:
> Canonical Desktop Experience Team (canonical-dx-team)
>
> differences between files attachment (review-diff.txt)
> === modified file 'src/bridge.c'
> --- src/bridge.c 2010-06-15 14:56:13 +0000
> +++ src/bridge.c 2010-06-16 21:13:25 +0000
> @@ -524,6 +524,19 @@
>
> return;
> }
> + else
> + {
> + gboolean no_proxy;
> +
> + g_object_get (G_OBJECT (toplevel),
> + "ubuntu-no-proxy", &no_proxy,
> + NULL);
> +
> + if (no_proxy)
> + {
> + return;
> + }
> + }
>
> if (!gtk_widget_
> {
>