Ubuntu
nautilus package

Merge lp:~ted/ubuntu/maverick/nautilus/desktop-menu into lp:ubuntu/maverick/nautilus

  1. Maverick (10.10)
  2. desktop-menu
  3. Merge into maverick
Proposed by Ted Gould
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~ted/ubuntu/maverick/nautilus/desktop-menu
Merge into: lp:ubuntu/maverick/nautilus
Diff against target: 29 lines (+11/-0)
2 files modified
debian/changelog (+6/-0)
src/nautilus-desktop-window.c (+5/-0)
To merge this branch: bzr merge lp:~ted/ubuntu/maverick/nautilus/desktop-menu
Reviewer Review Type Date Requested Status
Sebastien Bacher Pending
Review via email: mp+33785@code.launchpad.net
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
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-08-18 17:51:57 +0000
3+++ debian/changelog 2010-08-26 14:04:43 +0000
4@@ -1,3 +1,9 @@
5+nautilus (1:2.30.90-0ubuntu2~proxy1) maverick; urgency=low
6+
7+ * Add inserting to the proxy.
8+
9+ -- Ted Gould <ted@ubuntu.com> Tue, 24 Aug 2010 09:51:06 -0500
10+
11 nautilus (1:2.31.90-0ubuntu1) maverick; urgency=low
12
13 * New upstream version:
14
15=== modified file 'src/nautilus-desktop-window.c'
16--- src/nautilus-desktop-window.c 2010-08-12 16:41:04 +0000
17+++ src/nautilus-desktop-window.c 2010-08-26 14:04:43 +0000
18@@ -68,6 +68,11 @@
19 gtk_widget_hide (NAUTILUS_WINDOW (window)->details->statusbar);
20 gtk_widget_hide (NAUTILUS_WINDOW (window)->details->menubar);
21
22+ UbuntuMenuProxy * proxy = ubuntu_menu_proxy_get();
23+ if (proxy != NULL) {
24+ ubuntu_menu_proxy_insert(proxy, GTK_WIDGET(window), NAUTILUS_WINDOW(window)->details->menubar, 0);
25+ }
26+
27 /* Don't allow close action on desktop */
28 action = gtk_action_group_get_action (NAUTILUS_WINDOW (window)->details->main_action_group,
29 NAUTILUS_ACTION_CLOSE);

Subscribers

People subscribed via source and target branches