diff options
| author | Jiri Moskovcak <jmoskovc@redhat.com> | 2011-05-06 23:22:48 +0200 |
|---|---|---|
| committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2011-05-06 23:22:48 +0200 |
| commit | 02da0eb3bbd288cb2d51d91709a9e0b08b05634c (patch) | |
| tree | 062490a1f2ab3f3f4db34474bfa50ba1c09513ca /src | |
| parent | f7c174b5244a94159f41b664482b5ab91c8db3e7 (diff) | |
| parent | e4200116d227ac159d45d84bfbdbaf85d188c4bb (diff) | |
| download | abrt-02da0eb3bbd288cb2d51d91709a9e0b08b05634c.tar.gz abrt-02da0eb3bbd288cb2d51d91709a9e0b08b05634c.tar.xz abrt-02da0eb3bbd288cb2d51d91709a9e0b08b05634c.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
Diffstat (limited to 'src')
| -rw-r--r-- | src/applet/applet.c | 2 | ||||
| -rw-r--r-- | src/gui-gtk/main.c | 2 | ||||
| -rw-r--r-- | src/gui-wizard-gtk/main.c | 6 | ||||
| -rw-r--r-- | src/retrace/retrace.py | 2 |
4 files changed, 10 insertions, 2 deletions
diff --git a/src/applet/applet.c b/src/applet/applet.c index e965a3ba..aff82841 100644 --- a/src/applet/applet.c +++ b/src/applet/applet.c @@ -221,7 +221,7 @@ int main(int argc, char** argv) /* Parse options */ int opt; - while ((opt = getopt(argc, argv, "dv")) != -1) + while ((opt = getopt(argc, argv, "v")) != -1) { switch (opt) { diff --git a/src/gui-gtk/main.c b/src/gui-gtk/main.c index e9b175aa..39d9f7ec 100644 --- a/src/gui-gtk/main.c +++ b/src/gui-gtk/main.c @@ -204,6 +204,8 @@ int main(int argc, char **argv) * desktops which uses the name to find the corresponding .desktop file * trac#180 */ + g_set_prgname("abrt"); + gtk_init(&argc, &argv); /* Can't keep these strings/structs static: _() doesn't support that */ diff --git a/src/gui-wizard-gtk/main.c b/src/gui-wizard-gtk/main.c index d1341b4b..cdcf9e43 100644 --- a/src/gui-wizard-gtk/main.c +++ b/src/gui-wizard-gtk/main.c @@ -69,6 +69,12 @@ int main(int argc, char **argv) textdomain(PACKAGE); #endif + /* without this the name is set to argv[0] which confuses + * desktops which uses the name to find the corresponding .desktop file + * trac#180 + */ + g_set_prgname("abrt"); + gtk_init(&argc, &argv); /* Can't keep these strings/structs static: _() doesn't support that */ diff --git a/src/retrace/retrace.py b/src/retrace/retrace.py index b1568891..56bfd46e 100644 --- a/src/retrace/retrace.py +++ b/src/retrace/retrace.py @@ -21,7 +21,7 @@ PACKAGE_PARSER = re.compile("^(.+)-([0-9]+(\.[0-9]+)*-[0-9]+)\.([^-]+)$") DF_OUTPUT_PARSER = re.compile("^([^ ^\t]*)[ \t]+([0-9]+)[ \t]+([0-9]+)[ \t]+([0-9]+)[ \t]+([0-9]+%)[ \t]+(.*)$") DU_OUTPUT_PARSER = re.compile("^([0-9]+)") URL_PARSER = re.compile("^/([0-9]+)/?") -WORKER_RUNNING_PARSER = re.compile("^([0-9]+)[ \t]+[0-9]+[ \t]+([^ ^\t]+)[ \t]+.*abrt-retrace-worker ([0-9]+)$") +WORKER_RUNNING_PARSER = re.compile("^[ \t]*([0-9]+)[ \t]+[0-9]+[ \t]+([^ ^\t]+)[ \t]+.*abrt-retrace-worker ([0-9]+)$") HANDLE_ARCHIVE = { "application/x-xz-compressed-tar": { |