~noskcaj/file-roller/3.12.2

« back to all changes in this revision

Viewing changes to debian/patches/git_handle_command_line.patch

  • Committer: Jackson Doak
  • Date: 2014-06-01 23:15:07 UTC
  • Revision ID: noskcaj@ubuntu.com-20140601231507-qnfo6yrdt0r2f50t
* Merge from debian. Remaining changes:
  - Depend on zip and unzip instead of p7zip which is in universe
  - Suggest p7zip-full (LP: #918107)
  - Recommend sessioninstaller
  - Run dh-autoreconf
* Drop revert_remove_menubar.patch, git_handle_command_line.patch,
  git_user_extract_iso.patch. Fixed upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
From ead5ddd26ec18033fa677cdf253ce25d5a0324e8 Mon Sep 17 00:00:00 2001
2
 
From: Giovanni Campagna <gcampagna@src.gnome.org>
3
 
Date: Sat, 18 Jan 2014 13:14:23 +0000
4
 
Subject: Application: mark that we handle the command line
5
 
 
6
 
Otherwise activating the application a second time would fail.
7
 
 
8
 
https://bugzilla.gnome.org/show_bug.cgi?id=722492
9
 
---
10
 
diff --git a/src/fr-application.c b/src/fr-application.c
11
 
index 0109a3a..f751bcf 100644
12
 
--- a/src/fr-application.c
13
 
+++ b/src/fr-application.c
14
 
@@ -866,7 +866,7 @@ fr_application_new (void)
15
 
 {
16
 
         return g_object_new (fr_application_get_type (),
17
 
                              "application-id", "org.gnome.FileRoller",
18
 
-                             "flags", G_APPLICATION_FLAGS_NONE,
19
 
+                             "flags", G_APPLICATION_HANDLES_COMMAND_LINE,
20
 
                              NULL);
21
 
 }
22
 
 
23
 
--
24
 
cgit v0.9.2
25