diff options
| author | Arvind Samptur <arvind.samptur@wipro.com> | 2003-02-14 07:03:46 +0000 |
|---|---|---|
| committer | Arvind Samptur <arvind@src.gnome.org> | 2003-02-14 07:03:46 +0000 |
| commit | 00d6f549f9744c87382838b82b0e6ea8292bbe83 (patch) | |
| tree | 6ed2ea12a02ec8e315c1f98c277a08e50279f186 | |
| parent | 02a491c1bce0eab09e5bd4dee2152a4da3df50d5 (diff) | |
| download | metacity-00d6f549f9744c87382838b82b0e6ea8292bbe83.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-13 Havoc Pennington <hp@redhat.com> * configure.in: require GTK+ 2.2.0 diff --git a/src/screen.c b/src/screen.c index 70549cef..25fc8313 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); @@ -569,7 +569,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; @@ -588,6 +587,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); @@ -755,7 +756,7 @@ prefs_changed_callback (MetaPreference pref, } else if (pref == META_PREF_WORKSPACE_NAMES) { - update_workspace_names (screen); + set_workspace_names (screen); } } @@ -1473,7 +1474,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 |