Merge lp:~darkxst/ubuntu/saucy/nautilus/lp1184812ud into lp:~ubuntu-desktop/nautilus/ubuntu

Proposed by Tim Lunn
Status: Merged
Merged at revision: 380
Proposed branch: lp:~darkxst/ubuntu/saucy/nautilus/lp1184812ud
Merge into: lp:~ubuntu-desktop/nautilus/ubuntu
Diff against target: 215 lines (+184/-0)
4 files modified
debian/changelog (+7/-0)
debian/control (+1/-0)
debian/patches/git_eel_needs_terminal.patch (+175/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~darkxst/ubuntu/saucy/nautilus/lp1184812ud
Reviewer Review Type Date Requested Status
Jeremy Bicha Approve
Review via email: mp+166013@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jeremy Bicha (jbicha) wrote :

Thanks! Uploaded.

review: Approve

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 2013-04-16 10:17:23 +0000
3+++ debian/changelog 2013-05-28 10:53:29 +0000
4@@ -1,3 +1,10 @@
5+nautilus (1:3.6.3-0ubuntu17) saucy; urgency=low
6+
7+ * Rebuild for gnome-desktop 3.8 transition (LP: #1184812)
8+ - debian/patches/git_eel_needs_terminal.patch
9+
10+ -- Tim Lunn <tim@feathertop.org> Tue, 28 May 2013 10:59:40 +1000
11+
12 nautilus (1:3.6.3-0ubuntu16) raring; urgency=low
13
14 * debian/patches/git_rank_exact_matches_higher.patch,
15
16=== modified file 'debian/control'
17--- debian/control 2012-10-29 14:49:08 +0000
18+++ debian/control 2013-05-28 10:53:29 +0000
19@@ -10,6 +10,7 @@
20 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Jeremy Bicha <jbicha@ubuntu.com>
21 Build-Depends: debhelper (>= 8),
22 dh-autoreconf,
23+ dh-migrations,
24 cdbs (>= 0.4.90),
25 gnome-pkg-tools (>= 0.13),
26 libglib2.0-dev (>= 2.33.13),
27
28=== added file 'debian/patches/git_eel_needs_terminal.patch'
29--- debian/patches/git_eel_needs_terminal.patch 1970-01-01 00:00:00 +0000
30+++ debian/patches/git_eel_needs_terminal.patch 2013-05-28 10:53:29 +0000
31@@ -0,0 +1,175 @@
32+From 447d2ad6944afd94434a774b28f8c6e8274955fe Mon Sep 17 00:00:00 2001
33+From: William Jon McCann <jmccann@redhat.com>
34+Date: Fri, 15 Feb 2013 18:30:39 +0000
35+Subject: eel: use G_APP_INFO_CREATE_NEEDS_TERMINAL to run command in terminal
36+
37+---
38+diff --git a/eel/eel-gnome-extensions.c b/eel/eel-gnome-extensions.c
39+index eaddfe5..e7b8ecb 100644
40+--- a/eel/eel-gnome-extensions.c
41++++ b/eel/eel-gnome-extensions.c
42+@@ -31,153 +31,19 @@
43+ #include "eel-gnome-extensions.h"
44+
45+ #include <gtk/gtk.h>
46+-#include <libgnome-desktop/gnome-desktop-utils.h>
47+
48+ /* Return a command string containing the path to a terminal on this system. */
49+
50+-static char *
51+-try_terminal_command (const char *program,
52+- const char *args)
53+-{
54+- char *program_in_path, *quoted, *result;
55+-
56+- if (program == NULL) {
57+- return NULL;
58+- }
59+-
60+- program_in_path = g_find_program_in_path (program);
61+- if (program_in_path == NULL) {
62+- return NULL;
63+- }
64+-
65+- quoted = g_shell_quote (program_in_path);
66+- g_free (program_in_path);
67+- if (args == NULL || args[0] == '\0') {
68+- return quoted;
69+- }
70+- result = g_strconcat (quoted, " ", args, NULL);
71+- g_free (quoted);
72+- return result;
73+-}
74+-
75+-static char *
76+-try_terminal_command_argv (int argc,
77+- char **argv)
78+-{
79+- GString *string;
80+- int i;
81+- char *quoted, *result;
82+-
83+- if (argc == 0) {
84+- return NULL;
85+- }
86+-
87+- if (argc == 1) {
88+- return try_terminal_command (argv[0], NULL);
89+- }
90+-
91+- string = g_string_new (argv[1]);
92+- for (i = 2; i < argc; i++) {
93+- quoted = g_shell_quote (argv[i]);
94+- g_string_append_c (string, ' ');
95+- g_string_append (string, quoted);
96+- g_free (quoted);
97+- }
98+- result = try_terminal_command (argv[0], string->str);
99+- g_string_free (string, TRUE);
100+-
101+- return result;
102+-}
103+-
104+-static char *
105+-get_terminal_command_prefix (gboolean for_command)
106+-{
107+- int argc;
108+- char **argv;
109+- char *command;
110+- guint i;
111+- static const char *const commands[][3] = {
112+- { "gnome-terminal", "-x", "" },
113+- { "dtterm", "-e", "-ls" },
114+- { "nxterm", "-e", "-ls" },
115+- { "color-xterm", "-e", "-ls" },
116+- { "rxvt", "-e", "-ls" },
117+- { "xterm", "-e", "-ls" },
118+- };
119+-
120+- /* Try the terminal from preferences. Use without any
121+- * arguments if we are just doing a standalone terminal.
122+- */
123+- argc = 0;
124+- argv = g_new0 (char *, 1);
125+- gnome_desktop_prepend_terminal_to_vector (&argc, &argv);
126+-
127+- command = NULL;
128+- if (argc != 0) {
129+- if (for_command) {
130+- command = try_terminal_command_argv (argc, argv);
131+- } else {
132+- /* Strip off the arguments in a lame attempt
133+- * to make it be an interactive shell.
134+- */
135+- command = try_terminal_command (argv[0], NULL);
136+- }
137+- }
138+-
139+- while (argc != 0) {
140+- g_free (argv[--argc]);
141+- }
142+- g_free (argv);
143+-
144+- if (command != NULL) {
145+- return command;
146+- }
147+-
148+- /* Try well-known terminal applications in same order that gmc did. */
149+- for (i = 0; i < G_N_ELEMENTS (commands); i++) {
150+- command = try_terminal_command (commands[i][0],
151+- commands[i][for_command ? 1 : 2]);
152+- if (command != NULL) {
153+- break;
154+- }
155+- }
156+-
157+- return command;
158+-}
159+-
160+-static char *
161+-eel_gnome_make_terminal_command (const char *command)
162+-{
163+- char *prefix, *quoted, *terminal_command;
164+-
165+- if (command == NULL) {
166+- return get_terminal_command_prefix (FALSE);
167+- }
168+- prefix = get_terminal_command_prefix (TRUE);
169+- quoted = g_shell_quote (command);
170+- terminal_command = g_strconcat (prefix, " /bin/sh -c ", quoted, NULL);
171+- g_free (prefix);
172+- g_free (quoted);
173+- return terminal_command;
174+-}
175+-
176+ void
177+ eel_gnome_open_terminal_on_screen (const char *command,
178+ GdkScreen *screen)
179+ {
180+- char *command_line;
181+ GAppInfo *app;
182+ GdkAppLaunchContext *ctx;
183+ GError *error = NULL;
184+ GdkDisplay *display;
185+
186+- command_line = eel_gnome_make_terminal_command (command);
187+- if (command_line == NULL) {
188+- g_message ("Could not start a terminal");
189+- return;
190+- }
191+-
192+- app = g_app_info_create_from_commandline (command_line, NULL, 0, &error);
193++ app = g_app_info_create_from_commandline (command, NULL, G_APP_INFO_CREATE_NEEDS_TERMINAL, &error);
194+
195+ if (app != NULL && screen != NULL) {
196+ display = gdk_screen_get_display (screen);
197+@@ -195,6 +61,4 @@ eel_gnome_open_terminal_on_screen (const char *command,
198+
199+ g_error_free (error);
200+ }
201+-
202+- g_free (command_line);
203+ }
204+--
205+cgit v0.9.1
206+
207
208=== modified file 'debian/patches/series'
209--- debian/patches/series 2013-04-16 10:17:12 +0000
210+++ debian/patches/series 2013-05-28 10:53:29 +0000
211@@ -34,3 +34,4 @@
212 git_rank_exact_matches_higher.patch
213 git_rank_reversed.patch
214 git_search_dont_follow_symlinks.patch
215+git_eel_needs_terminal.patch

Subscribers

People subscribed via source and target branches

to all changes: