← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/evince/oneiric-updates

« back to all changes in this revision

Viewing changes to shell/main.c

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Moya, Josselin Mouette, Rodrigo Moya
  • Date: 2011-05-19 12:12:42 UTC
  • mfrom: (1.1.65 upstream) (1.3.6 experimental)
  • Revision ID: james.westby@ubuntu.com-20110519121242-967hbn2nh2hunp4y
Tags: 3.0.0-4ubuntu1
http://bugs.debian.org/619564
http://bugs.debian.org/627027
http://bugs.debian.org/551734
http://bugs.debian.org/581441
[ Josselin Mouette ]
* bug-presubj: please document where to report rendering bugs.
* evince.mime: dropped. We have desktop files to handle MIME 
  associations, no need to maintain an alternate system by hand.
  Closes: #619564, #627027, #551734, #581441.

[ Rodrigo Moya ]
* Rebase from Debian and GNOME3 PPA (thanks to Rico Tzschichholz).
  Remaining Ubuntu changes:
* debian/apparmor-profile:
* debian/apparmor-profile.abstraction:
* debian/evince.apport:
* debian/evince-common.dirs:
* debian/evince-common.postinst:
* debian/evince-common.postrm:
  - Add apparmor profile
* debian/control:
  - Build-Depend on debhelper (>= 7.4.20ubuntu5), gnome-common,
    hardening-includes and liblaunchpad-integration-3.0-dev
  - Standards-Version is 3.9.1
  - Depend on apparmor
* debian/rules:
  - Include hardening.make
  - Add rule to install apparmor files
* debian/watch:
  - Watch unstable series
* debian/patches/01_lpi.patch:
  - Launchpad integration patch
* debian/patches/04_gold.patch:
  - Link against libz
* debian/patches/05_library-path.patch:
  - Fix library path for g-ir-scanner

Show diffs side-by-side

added added

removed removed

Lines of Context:
shell/main.c
92
92
{
93
93
        GString *cmd_str;
94
94
        gchar   *cmd;
95
 
        gint     argc;
96
 
        gchar  **argv;
97
95
        gboolean retval = FALSE;
98
96
        GError  *error = NULL;
99
97
 
123
121
        }
124
122
 
125
123
        cmd = g_string_free (cmd_str, FALSE);
126
 
        g_shell_parse_argv (cmd, &argc, &argv, &error);
127
 
        g_free (cmd);
128
 
        
 
124
 
129
125
        if (!error) {
130
 
                retval = gdk_spawn_on_screen (gdk_screen_get_default (),
131
 
                                              NULL, argv, NULL,
132
 
                                              G_SPAWN_SEARCH_PATH,
133
 
                                              NULL, NULL, NULL,
134
 
                                              &error);
135
 
                g_strfreev (argv);
 
126
                GAppInfo *app;
 
127
 
 
128
                app = g_app_info_create_from_commandline (cmd, NULL, 0, &error);
 
129
 
 
130
                if (app != NULL) {
 
131
                        retval = g_app_info_launch (app, NULL, NULL, &error);
 
132
                        g_object_unref (app);
 
133
                }
136
134
        }
137
135
 
138
136
        if (error) {
140
138
                g_error_free (error);
141
139
        }
142
140
 
 
141
        g_free (cmd);
 
142
 
143
143
        return retval;
144
144
}
145
145