diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2007-01-26 12:58:53 +0000 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@src.gnome.org> | 2007-01-26 12:58:53 +0000 |
| commit | c9cd656a2f1f216781ca4609c132f4b6e423729b (patch) | |
| tree | 4fd8ca9f451bcb7fd73957103dfa0b37f8b59965 /shell | |
| parent | 159e23217e37bdccd252c11230ae8cea768b4e89 (diff) | |
| download | gnome-control-center-c9cd656a2f1f216781ca4609c132f4b6e423729b.tar.gz | |
changed GConf prefix to /apps/... (handle_static_action_clicked): prevent
2007-01-26 Rodrigo Moya <rodrigo@gnome-db.org>
* control-center.c: changed GConf prefix to /apps/...
(handle_static_action_clicked): prevent capplets from being launched
twice.
svn path=/trunk/; revision=7182
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 6 | ||||
| -rw-r--r-- | shell/control-center.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 3b9598a3c..261d64656 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2007-01-26 Rodrigo Moya <rodrigo@gnome-db.org> + + * control-center.c: changed GConf prefix to /apps/... + (handle_static_action_clicked): prevent capplets from being launched + twice. + 2007-01-19 Rodrigo Moya <rodrigo@gnome-db.org> * control-center.c (main): program name is gnome-control-center. diff --git a/shell/control-center.c b/shell/control-center.c index 9c897dae9..0dddba253 100644 --- a/shell/control-center.c +++ b/shell/control-center.c @@ -43,7 +43,7 @@ void handle_static_action_clicked (Tile * tile, TileEvent * event, gpointer data); static GSList *get_actions_list (); -#define CONTROL_CENTER_PREFIX "/desktop/gnome/applications/main-menu/cc_" +#define CONTROL_CENTER_PREFIX "/apps/control-center/cc_" #define CONTROL_CENTER_ACTIONS_LIST_KEY (CONTROL_CENTER_PREFIX "actions_list") #define CONTROL_CENTER_ACTIONS_SEPARATOR ";" #define EXIT_SHELL_ON_STATIC_ACTION "exit_shell_on_static_action" @@ -92,10 +92,12 @@ void handle_static_action_clicked (Tile * tile, TileEvent * event, gpointer data) { gchar *temp; - AppShellData *app_data = (AppShellData *) data; GnomeDesktopItem *item = (GnomeDesktopItem *) g_object_get_data (G_OBJECT (tile), APP_ACTION_KEY); + + if (event->type == TILE_EVENT_ACTIVATED_DOUBLE_CLICK) + return; open_desktop_item_exec (item); temp = g_strdup_printf("%s%s", app_data->gconf_prefix, EXIT_SHELL_ON_STATIC_ACTION); |