diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | applets/mb-applet-clock.c | 8 | ||||
-rw-r--r-- | applets/mb-applet-launcher.c | 2 | ||||
-rw-r--r-- | applets/mb-applet-menu-launcher.c | 4 | ||||
-rw-r--r-- | src/panel_menu.c | 3 |
5 files changed, 17 insertions, 9 deletions
@@ -1,3 +1,12 @@ +2004-12-01 Ross Burton <ross@burtonini.com> + + * applets/mb-applet-launcher.c: + * applets/mb-applet-menu-launcher.c: + * applets/mb-applet-clock.c: + * src/panel_menu.c: + Use mb_dotdesktop_get_exec(). Also move config.h includes so that + AC_GNU_SOURCE works, and fix a bad fprintf. + 2004-12-01 Ross Burton <ross@openedhand.com> * configure.ac: diff --git a/applets/mb-applet-clock.c b/applets/mb-applet-clock.c index 0569fb0..acd0cba 100644 --- a/applets/mb-applet-clock.c +++ b/applets/mb-applet-clock.c @@ -24,6 +24,10 @@ freely, subject to the following restrictions: distribution. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xatom.h> @@ -39,10 +43,6 @@ freely, subject to the following restrictions: #include <libmb/mb.h> -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #ifdef ENABLE_NLS # include <libintl.h> # define _(text) gettext(text) diff --git a/applets/mb-applet-launcher.c b/applets/mb-applet-launcher.c index a0627a2..08a6a10 100644 --- a/applets/mb-applet-launcher.c +++ b/applets/mb-applet-launcher.c @@ -552,7 +552,7 @@ main(int argc, char **argv) img_file = strdup(png_path); } - cmd_str = mb_dotdesktop_get(dd, "Exec"); + cmd_str = mb_dotdesktop_get_exec(dd); if (!win_panel_title) win_panel_title = mb_dotdesktop_get(dd, "Name"); #ifdef USE_LIBSN diff --git a/applets/mb-applet-menu-launcher.c b/applets/mb-applet-menu-launcher.c index d66a458..e01d9d2 100644 --- a/applets/mb-applet-menu-launcher.c +++ b/applets/mb-applet-menu-launcher.c @@ -204,7 +204,7 @@ static void fork_exec(char *cmd) case 0: mb_exec(cmd); /* execlp("/bin/sh", "sh", "-c", cmd, NULL); */ - fprintf(stderr, "mb-applet-menu-launcher: exec of '%s' failed, cleaning up child\n, cmd"); + fprintf(stderr, "mb-applet-menu-launcher: exec of '%s' failed, cleaning up child\n", cmd); exit(1); case -1: fprintf(stderr, "mb-applet-menu-launcher: can't fork '%s'\n", cmd); break; @@ -616,7 +616,7 @@ build_menu(void) mb_menu_add_item_to_menu(app_data->mbmenu, m, mb_dotdesktop_get(dd, "Name"), png_path, - mb_dotdesktop_get(dd, "Exec"), + mb_dotdesktop_get_exec(dd), activate_callback, (void *)app_data, flags); /* mb_menu_add_seperator_to_menu(app_data-> mbmenu, m); */ diff --git a/src/panel_menu.c b/src/panel_menu.c index 9c7fb1b..470030c 100644 --- a/src/panel_menu.c +++ b/src/panel_menu.c @@ -223,8 +223,7 @@ panel_menu_init(MBPanel *panel) mb_dotdesktop_get(ddentry, "Name"), png_path, - mb_dotdesktop_get(ddentry, - "Exec"), + mb_dotdesktop_get_exec(ddentry), panel_menu_exec_cb, (void *)panel, 0); } else { |