diff options
author | Arvind Samptur <arvind.samptur@wipro.com> | 2003-02-14 07:06:09 +0000 |
---|---|---|
committer | Arvind Samptur <arvind@src.gnome.org> | 2003-02-14 07:06:09 +0000 |
commit | 8f62e995ac6fb320acb260e598713c886fe91f02 (patch) | |
tree | 5c575bc35695ca72866fa3a405e15b79ac4b9dcd | |
parent | 2cace5e9fa92c628019f1b1dd5010bc2d5e514ba (diff) | |
download | metacity-8f62e995ac6fb320acb260e598713c886fe91f02.tar.gz |
: Update the workspace names from gconf and set the NET_DESKTOP_NAMES
2003-02-14 Arvind Samptur <arvind.samptur@wipro.com>
* src/screen.c: (meta_screen_new) : Update the workspace
names from gconf and set the NET_DESKTOP_NAMES atom.
Renamed update_workspace_names() to set_workspace_names().
Fixes #105498
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | src/screen.c | 9 |
2 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2003-02-14 Arvind Samptur <arvind.samptur@wipro.com> + * src/screen.c: (meta_screen_new) : Update the workspace + names from gconf and set the NET_DESKTOP_NAMES atom. + Renamed update_workspace_names() to set_workspace_names(). + Fixes #105498 + 2003-02-04 Havoc Pennington <hp@redhat.com> * NEWS: updated diff --git a/src/screen.c b/src/screen.c index 2f65aa90..799c9fe0 100644 --- a/src/screen.c +++ b/src/screen.c @@ -51,7 +51,7 @@ static char* get_screen_name (MetaDisplay *display, static void update_num_workspaces (MetaScreen *screen); static void update_focus_mode (MetaScreen *screen); -static void update_workspace_names (MetaScreen *screen); +static void set_workspace_names (MetaScreen *screen); static void prefs_changed_callback (MetaPreference pref, gpointer data); @@ -568,7 +568,6 @@ meta_screen_new (MetaDisplay *display, set_wm_check_hint (screen); meta_screen_update_workspace_layout (screen); - meta_screen_update_workspace_names (screen); /* Get current workspace */ current_workspace = 0; @@ -587,6 +586,8 @@ meta_screen_new (MetaDisplay *display, meta_workspace_activate (meta_workspace_new (screen)); update_num_workspaces (screen); + set_workspace_names (screen); + screen->all_keys_grabbed = FALSE; screen->keys_grabbed = FALSE; meta_screen_grab_keys (screen); @@ -754,7 +755,7 @@ prefs_changed_callback (MetaPreference pref, } else if (pref == META_PREF_WORKSPACE_NAMES) { - update_workspace_names (screen); + set_workspace_names (screen); } } @@ -1472,7 +1473,7 @@ meta_screen_update_workspace_layout (MetaScreen *screen) } static void -update_workspace_names (MetaScreen *screen) +set_workspace_names (MetaScreen *screen) { /* This updates names on root window when the pref changes, * note we only get prefs change notify if things have |