~ubuntu-branches/ubuntu/maverick/xmms2/maverick

« back to all changes in this revision

Viewing changes to src/clients/nycli/alias.c

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2010-03-07 04:11:24 UTC
  • mfrom: (1.1.7 upstream) (6.1.13 sid)
  • Revision ID: james.westby@ubuntu.com-20100307041124-df7p8f9yejg1u1qn
Tags: 0.7DrNo-3ubuntu1
* Merge from Debian unstable (LP: #532278), remaining changes:
  - Use PulseAudio as default output plugin.

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
#include "configuration.h"
22
22
#include "alias.h"
23
23
 
24
 
static void alias_run (cli_infos_t *infos, gchar *alias)
25
 
{
26
 
        gint in_argc;
27
 
        gchar **in_argv;
28
 
 
29
 
        gchar *next;
30
 
 
31
 
        if (!alias || *alias == '\0') {
32
 
                return;
33
 
        }
34
 
 
35
 
        next = strchr (alias, ';');
36
 
        *next = '\0';
37
 
 
38
 
        g_shell_parse_argv (alias, &in_argc, &in_argv, NULL);
39
 
 
40
 
        /* run */
41
 
        command_dispatch (infos, in_argc, in_argv);
42
 
 
43
 
        alias_run (infos, next + 1);
44
 
 
45
 
        g_strfreev (in_argv);
46
 
}
47
 
 
48
24
static void
49
25
free_token (gpointer data, gpointer udata)
50
26
{
139
115
        }
140
116
 
141
117
        cli_infos_alias_begin (infos);
142
 
        alias_run (infos, runnable);
 
118
        command_run (infos, runnable);
143
119
        cli_infos_alias_end (infos);
144
120
 
145
121
        finish: