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

Subscribers

People subscribed via source and target branches

to all changes: