← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gnome-panel/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/16_compiz_workspace_switcher.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher, Sebastien Bacher, Jeremy Bicha
  • Date: 2011-05-30 11:04:49 UTC
  • mfrom: (1.13.10 upstream) (2.2.5 experimental)
  • Revision ID: james.westby@ubuntu.com-20110530110449-hinl17kxkcefjw6x
Tags: 1:3.0.2-0ubuntu1
[ Sebastien Bacher ]
* New upstream version
* debian/control.in:
  - the new libgweather version is in oneiric, use it
  - drop the python and python-gconf depends, 
    they were added for gnome-panel-add which is still using gconf and buggy
* debian/gnome-panel-data.install:
  - don't install the apport hook, it's only getting gconf datas which 
    doesn't work since gnome-panel uses gsettings
* debian/patches/90_build_fixes.patch:
  - restore build fix from git not applied in the new serie
* debian/patches/01_panel_submenus.patch:
  - don't take that Debian diff, the .menus use the upstream naming in Ubuntu
* debian/patches/06_no_resize_grip.patch:
  - dropped, the issue is fixed in the new version
* debian/patches/50_fix-potfiles.patch:
  - dropped, the issue is fixed in the new version
* debian/watch:
  - track unstable series as well

Drop those delta, since gnome-panel is not the default Ubuntu session now we
can go back to an experience closer to the upstream one: 
* debian/control.in:
  - drop the indicators recommends, unity-2d is the ubuntu fallback session
    so we can get back to use an upstream config for gnome-panel and reduce
    the delta we carry
* debian/patches/04_default_panel_config.patch:
  - don't modify the upstream layout
* debian/patches/05_no_session_delay.patch:
  - no need to tweak the upstream session to optimize it
* debian/patches/16_compiz_workspace_switcher.patch:
  - go back to the upstream switcher behaviour    
* debian/patches/25_dynamic_fusa_detection.patch:
  - not needed since we use the upstream layout, could be ported if someone
    is wanting to do the work though
* debian/patches/30_disable-initial-animation.patch, debian/rules:
  - drop the --disable-initial-animation, that was some login optimization
    but since it's not the default desktop you should go back to the 
    upstream behaviour

[ Jeremy Bicha ]   
* New upstream version
* Merge from Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Recommends gnome-settings-daemon which has the timezone polkit service
* debian/rules:
  - Update translations template.
* debian/gnome-panel-data.install:
  - Install apport hook
  - Install the "About Ubuntu" menu item.
* debian/patches/01_layout.patch:
  - Disabled, Help & About Ubuntu don't fit as well in Gnome Panel 3
* debian/patches/01_panel_submenus.patch.
  - Dropped
* debian/patches/03_dnd_places_link.patch:
  - Disabled, when using Drag'n'Drop from Places menu, install a link launcher
    (.desktop file) instead of copying the entire directory.
* debian/patches/17_about-ubuntu-translation.patch:
  - List ubuntu-about.desktop for translation.
* debian/patches/40_unset_menuproxy.patch:
  - Make sure gnome-panel and the applets don't pick up menu proxies.
* debian/patches/50_fix-potfiles.patch
  - Fix i18n
* debian/patches/85_disable_shutdown_on_ltsp.patch:
  - Suppress the shutdown option in the panel if LTSP_CLIENT is set.
* debian/patches/71_change_bookmark_submenu_limit_value.patch
  - Dropped, picked up by Debian
* debian/patches/18_lockdown_lock_editor.patch:
* debian/patches/90_git_wnck_show_realize.patch:
* debian/patches/90_fix_linking_DSO_link.patch:
* debian/patches/91_gir_annotations.patch
* debian/patches/92_git_calendar_day.patch
* debian/patches/92_git_fix_applets_in_multiscreen.patch:
  - Dropped, applied upstream
* debian/watch:
  - watch unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/16_compiz_workspace_switcher.patch
1
 
Description: Allow the workspace switcher to change the desktop layout when using compiz
2
 
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=496830
3
 
 
4
 
Index: gnome-panel-2.32.0/applets/wncklet/workspace-switcher.c
5
 
===================================================================
6
 
--- gnome-panel-2.32.0.orig/applets/wncklet/workspace-switcher.c        2010-07-01 20:15:31.000000000 +0200
7
 
+++ gnome-panel-2.32.0/applets/wncklet/workspace-switcher.c     2010-10-15 18:43:16.624592197 +0200
8
 
@@ -34,6 +34,10 @@
9
 
 #define MAX_REASONABLE_ROWS 16
10
 
 #define DEFAULT_ROWS 1
11
 
 
12
 
+#define COMPIZ_OPTIONS "/apps/compiz-1/general/screen0/options"
13
 
+#define COMPIZ_HSIZE "/apps/compiz-1/general/screen0/options/hsize"
14
 
+#define COMPIZ_VSIZE "/apps/compiz-1/general/screen0/options/vsize"
15
 
+
16
 
 #define NEVER_SENSITIVE "never_sensitive"
17
 
 #define NUM_WORKSPACES "/apps/metacity/general/num_workspaces"
18
 
 #define WORKSPACE_NAME "/apps/metacity/workspace_names/name_1"
19
 
@@ -56,6 +60,7 @@
20
 
 
21
 
        /* Properties: */
22
 
        GtkWidget *properties_dialog;
23
 
+       GtkWidget *switcher_frame;
24
 
        GtkWidget *workspaces_frame;
25
 
        GtkWidget *workspace_names_label;
26
 
        GtkWidget *workspace_names_scroll;
27
 
@@ -67,6 +72,9 @@
28
 
        GtkWidget *num_workspaces_spin;
29
 
        GtkWidget *workspaces_tree;
30
 
        GtkListStore *workspaces_store;
31
 
+       GtkWidget *viewports_frame;
32
 
+       GtkWidget *hsize_spin;
33
 
+       GtkWidget *vsize_spin;
34
 
 
35
 
        GtkWidget *about;
36
 
        
37
 
@@ -93,8 +101,13 @@
38
 
                                    pager->orientation);
39
 
        wnck_pager_set_n_rows (WNCK_PAGER (pager->pager),
40
 
                               pager->n_rows);
41
 
-       wnck_pager_set_show_all (WNCK_PAGER (pager->pager),
42
 
-                                pager->display_all);
43
 
+
44
 
+       if (pager->wm == PAGER_WM_COMPIZ)
45
 
+               wnck_pager_set_show_all (WNCK_PAGER (pager->pager),
46
 
+                                        FALSE);
47
 
+       else
48
 
+               wnck_pager_set_show_all (WNCK_PAGER (pager->pager),
49
 
+                                        pager->display_all);
50
 
 
51
 
        if (pager->wm == PAGER_WM_METACITY)
52
 
                wnck_pager_set_display_mode (WNCK_PAGER (pager->pager),
53
 
@@ -117,20 +130,28 @@
54
 
                        gtk_widget_show (pager->workspace_names_scroll);
55
 
                if (pager->display_workspaces_toggle)
56
 
                        gtk_widget_show (pager->display_workspaces_toggle);
57
 
+               if (pager->viewports_frame)
58
 
+                       gtk_widget_hide (pager->viewports_frame);
59
 
                break;
60
 
        case PAGER_WM_COMPIZ:
61
 
+               if (pager->switcher_frame)
62
 
+                       gtk_widget_hide (pager->switcher_frame);
63
 
                if (pager->workspaces_frame)
64
 
-                       gtk_widget_show (pager->workspaces_frame);
65
 
+                       gtk_widget_hide (pager->workspaces_frame);
66
 
                if (pager->workspace_names_label)
67
 
                        gtk_widget_hide (pager->workspace_names_label);
68
 
                if (pager->workspace_names_scroll)
69
 
                        gtk_widget_hide (pager->workspace_names_scroll);
70
 
                if (pager->display_workspaces_toggle)
71
 
                        gtk_widget_hide (pager->display_workspaces_toggle);
72
 
+               if (pager->viewports_frame)
73
 
+                       gtk_widget_show (pager->viewports_frame);
74
 
                break;
75
 
        case PAGER_WM_UNKNOWN:
76
 
                if (pager->workspaces_frame)
77
 
                        gtk_widget_hide (pager->workspaces_frame);
78
 
+               if (pager->viewports_frame)
79
 
+                       gtk_widget_hide (pager->viewports_frame);
80
 
                break;
81
 
        default:
82
 
                g_assert_not_reached ();
83
 
@@ -208,7 +229,8 @@
84
 
        pager->orientation = new_orient;
85
 
        pager_update (pager);
86
 
        if (pager->label_row_col) 
87
 
-               gtk_label_set_text (GTK_LABEL (pager->label_row_col), pager->orientation == GTK_ORIENTATION_HORIZONTAL ? _("rows") : _("columns"));     
88
 
+               gtk_label_set_text (GTK_LABEL (pager->label_row_col),
89
 
+                                    pager->orientation == GTK_ORIENTATION_HORIZONTAL ? _("rows") : _("columns"));
90
 
 }
91
 
 
92
 
 static void
93
 
@@ -661,6 +683,34 @@
94
 
                                    NULL);
95
 
 }
96
 
 
97
 
+/* compiz' "columns" */
98
 
+static void
99
 
+hsize_value_changed (GtkSpinButton *button,
100
 
+                     gpointer      data)
101
 
+{
102
 
+       GConfClient* client = gconf_client_get_default ();
103
 
+
104
 
+        gconf_client_set_int (client,
105
 
+                              COMPIZ_HSIZE,
106
 
+                              gtk_spin_button_get_value_as_int (button),
107
 
+                              NULL);
108
 
+       g_object_unref (client);
109
 
+}
110
 
+
111
 
+/* compiz' "rows" */
112
 
+static void
113
 
+vsize_value_changed (GtkSpinButton *button,
114
 
+                     gpointer      data)
115
 
+{
116
 
+       GConfClient* client = gconf_client_get_default ();
117
 
+
118
 
+        gconf_client_set_int (client,
119
 
+                              COMPIZ_VSIZE,
120
 
+                              gtk_spin_button_get_value_as_int (button),
121
 
+                              NULL);
122
 
+       g_object_unref (client);
123
 
+}
124
 
+
125
 
 static void
126
 
 update_workspaces_model (PagerData *pager)
127
 
 {
128
 
@@ -785,6 +835,7 @@
129
 
                             PagerData *pager)
130
 
 {
131
 
        pager->properties_dialog = NULL;
132
 
+       pager->switcher_frame = NULL;
133
 
        pager->workspaces_frame = NULL;
134
 
        pager->workspace_names_label = NULL;
135
 
        pager->workspace_names_scroll = NULL;
136
 
@@ -796,6 +847,9 @@
137
 
        pager->num_workspaces_spin = NULL;
138
 
        pager->workspaces_tree = NULL;
139
 
        pager->workspaces_store = NULL;
140
 
+       pager->viewports_frame = NULL;
141
 
+       pager->hsize_spin = NULL;
142
 
+       pager->vsize_spin = NULL;
143
 
 }
144
 
 
145
 
 static gboolean
146
 
@@ -898,13 +952,49 @@
147
 
        GtkTreeViewColumn *column;
148
 
        GtkCellRenderer *cell;
149
 
        int nr_ws, i;
150
 
-       
151
 
+       GConfClient* client = NULL;
152
 
+       gint hsize;
153
 
+       gint vsize;
154
 
+
155
 
+       pager->switcher_frame = WID ("switcher_frame");
156
 
        pager->workspaces_frame = WID ("workspaces_frame");
157
 
        pager->workspace_names_label = WID ("workspace_names_label");
158
 
        pager->workspace_names_scroll = WID ("workspace_names_scroll");
159
 
 
160
 
+       if (pager->wm == PAGER_WM_COMPIZ)
161
 
+       {
162
 
+               client = gconf_client_get_default ();
163
 
+
164
 
+               pager->viewports_frame = WID ("viewports_frame");
165
 
+               pager->hsize_spin = WID ("hsize_spin");
166
 
+               pager->vsize_spin = WID ("vsize_spin");
167
 
+
168
 
+               g_signal_connect (G_OBJECT (pager->hsize_spin),
169
 
+                                 "value-changed",
170
 
+                                 (GCallback) hsize_value_changed,
171
 
+                                 NULL);
172
 
+
173
 
+               g_signal_connect (G_OBJECT (pager->vsize_spin),
174
 
+                                 "value-changed",
175
 
+                                 (GCallback) vsize_value_changed,
176
 
+                                 NULL);
177
 
+
178
 
+               /* set value for hsize (compiz's "columns") */
179
 
+               hsize = gconf_client_get_int (client, COMPIZ_HSIZE, NULL);
180
 
+               gtk_spin_button_set_value (GTK_SPIN_BUTTON (pager->hsize_spin),
181
 
+                                          hsize);
182
 
+
183
 
+               /* set value for vsize (compiz's "rows") */
184
 
+               vsize = gconf_client_get_int (client, COMPIZ_VSIZE, NULL);
185
 
+               gtk_spin_button_set_value (GTK_SPIN_BUTTON (pager->vsize_spin),
186
 
+                                          vsize);
187
 
+
188
 
+               g_object_unref (client);
189
 
+       }
190
 
+       
191
 
        pager->display_workspaces_toggle = WID ("workspace_name_toggle");
192
 
-       setup_sensitivity (pager, builder,
193
 
+       setup_sensitivity (pager,
194
 
+                          builder,
195
 
                           "workspace_name_toggle",
196
 
                           NULL,
197
 
                           NULL,
198
 
@@ -912,7 +1002,8 @@
199
 
 
200
 
        pager->all_workspaces_radio = WID ("all_workspaces_radio");
201
 
        pager->current_only_radio = WID ("current_only_radio");
202
 
-       setup_sensitivity (pager, builder,
203
 
+       setup_sensitivity (pager,
204
 
+                          builder,
205
 
                           "all_workspaces_radio",
206
 
                           "current_only_radio",
207
 
                           "label_row_col",
208
 
@@ -920,14 +1011,16 @@
209
 
 
210
 
        pager->num_rows_spin = WID ("num_rows_spin");
211
 
        pager->label_row_col = WID("label_row_col");
212
 
-       setup_sensitivity (pager, builder,
213
 
+       setup_sensitivity (pager,
214
 
+                          builder,
215
 
                           "num_rows_spin",
216
 
                           NULL,
217
 
                           NULL,
218
 
                           "num_rows" /* key */);
219
 
 
220
 
        pager->num_workspaces_spin = WID ("num_workspaces_spin");
221
 
-       setup_sensitivity (pager, builder,
222
 
+       setup_sensitivity (pager,
223
 
+                          builder,
224
 
                           "num_workspaces_spin",
225
 
                           NULL,
226
 
                           NULL,
227
 
@@ -941,92 +1034,130 @@
228
 
                           WORKSPACE_NAME /* key */);
229
 
 
230
 
        /* Display workspace names: */
231
 
-       
232
 
-       g_signal_connect (G_OBJECT (pager->display_workspaces_toggle), "toggled",
233
 
-                         (GCallback) display_workspace_names_toggled, pager);
234
 
+       g_signal_connect (G_OBJECT (pager->display_workspaces_toggle),
235
 
+                         "toggled",
236
 
+                         (GCallback) display_workspace_names_toggled,
237
 
+                         pager);
238
 
 
239
 
-       if (pager->display_mode == WNCK_PAGER_DISPLAY_NAME) {
240
 
+       if (pager->display_mode == WNCK_PAGER_DISPLAY_NAME)
241
 
                value = TRUE;
242
 
-       } else {
243
 
+       else
244
 
                value = FALSE;
245
 
-       }
246
 
+
247
 
        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pager->display_workspaces_toggle),
248
 
                                      value);
249
 
 
250
 
        /* Display all workspaces: */
251
 
-       g_signal_connect (G_OBJECT (pager->all_workspaces_radio), "toggled",
252
 
-                         (GCallback) all_workspaces_toggled, pager);
253
 
+       g_signal_connect (G_OBJECT (pager->all_workspaces_radio),
254
 
+                         "toggled",
255
 
+                         (GCallback) all_workspaces_toggled,
256
 
+                         pager);
257
 
 
258
 
-       if (pager->display_all) {
259
 
-               gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pager->all_workspaces_radio), TRUE);
260
 
-               if ( ! g_object_get_data (G_OBJECT (pager->num_rows_spin), NEVER_SENSITIVE))
261
 
-                       gtk_widget_set_sensitive (pager->num_rows_spin, TRUE);
262
 
-       } else {
263
 
-               gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pager->current_only_radio), TRUE);
264
 
-               gtk_widget_set_sensitive (pager->num_rows_spin, FALSE);
265
 
+       if (pager->display_all)
266
 
+       {
267
 
+               gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pager->all_workspaces_radio),
268
 
+                                             TRUE);
269
 
+
270
 
+               if (!g_object_get_data (G_OBJECT (pager->num_rows_spin),
271
 
+                                       NEVER_SENSITIVE))
272
 
+                       gtk_widget_set_sensitive (pager->num_rows_spin,
273
 
+                                                 TRUE);
274
 
        }
275
 
-               
276
 
+       else
277
 
+       {
278
 
+               gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pager->current_only_radio),
279
 
+                                             TRUE);
280
 
+               gtk_widget_set_sensitive (pager->num_rows_spin,
281
 
+                                         FALSE);
282
 
+       }
283
 
+
284
 
        /* Num rows: */
285
 
-       g_signal_connect (G_OBJECT (pager->num_rows_spin), "value_changed",
286
 
-                         (GCallback) num_rows_value_changed, pager);
287
 
+       g_signal_connect (G_OBJECT (pager->num_rows_spin),
288
 
+                         "value_changed",
289
 
+                         (GCallback) num_rows_value_changed,
290
 
+                         pager);
291
 
 
292
 
-       gtk_spin_button_set_value (GTK_SPIN_BUTTON (pager->num_rows_spin), pager->n_rows);
293
 
-       gtk_label_set_text (GTK_LABEL (pager->label_row_col), pager->orientation == GTK_ORIENTATION_HORIZONTAL ? _("rows") : _("columns"));
294
 
+       gtk_spin_button_set_value (GTK_SPIN_BUTTON (pager->num_rows_spin),
295
 
+                                  pager->n_rows);
296
 
+       gtk_label_set_text (GTK_LABEL (pager->label_row_col),
297
 
+                           pager->orientation == GTK_ORIENTATION_HORIZONTAL ? _("rows") : _("columns"));
298
 
 
299
 
-       g_signal_connect (pager->properties_dialog, "destroy",
300
 
+       g_signal_connect (pager->properties_dialog,
301
 
+                         "destroy",
302
 
                          G_CALLBACK (properties_dialog_destroyed),
303
 
                          pager);
304
 
-       g_signal_connect (pager->properties_dialog, "delete_event",
305
 
+       g_signal_connect (pager->properties_dialog,
306
 
+                         "delete_event",
307
 
                          G_CALLBACK (delete_event),
308
 
                          pager);
309
 
-       g_signal_connect (pager->properties_dialog, "response",
310
 
+       g_signal_connect (pager->properties_dialog,
311
 
+                         "response",
312
 
                          G_CALLBACK (response_cb),
313
 
                          pager);
314
 
-       
315
 
-       g_signal_connect (WID ("done_button"), "clicked",
316
 
-                         (GCallback) close_dialog, pager);
317
 
+
318
 
+       g_signal_connect (WID ("done_button"),
319
 
+                         "clicked",
320
 
+                         (GCallback) close_dialog,
321
 
+                         pager);
322
 
 
323
 
        gtk_spin_button_set_value (GTK_SPIN_BUTTON (pager->num_workspaces_spin),
324
 
                                   wnck_screen_get_workspace_count (pager->screen));
325
 
-       g_signal_connect (G_OBJECT (pager->num_workspaces_spin), "value_changed",
326
 
-                         (GCallback) num_workspaces_value_changed, pager);
327
 
-       
328
 
-       wncklet_connect_while_alive (pager->screen, "workspace_created",
329
 
-                                    G_CALLBACK(workspace_created),
330
 
+       g_signal_connect (G_OBJECT (pager->num_workspaces_spin),
331
 
+                         "value_changed",
332
 
+                         (GCallback) num_workspaces_value_changed,
333
 
+                         pager);
334
 
+
335
 
+       wncklet_connect_while_alive (pager->screen,
336
 
+                                    "workspace_created",
337
 
+                                    G_CALLBACK (workspace_created),
338
 
                                     pager,
339
 
                                     pager->properties_dialog);
340
 
 
341
 
-       wncklet_connect_while_alive (pager->screen, "workspace_destroyed",
342
 
-                                    G_CALLBACK(workspace_destroyed),
343
 
+       wncklet_connect_while_alive (pager->screen,
344
 
+                                    "workspace_destroyed",
345
 
+                                    G_CALLBACK (workspace_destroyed),
346
 
                                     pager,
347
 
                                     pager->properties_dialog);
348
 
 
349
 
-       g_signal_connect (G_OBJECT (pager->workspaces_tree), "focus_out_event",
350
 
-                         (GCallback) workspaces_tree_focused_out, pager);
351
 
+       g_signal_connect (G_OBJECT (pager->workspaces_tree),
352
 
+                         "focus_out_event",
353
 
+                         (GCallback) workspaces_tree_focused_out,
354
 
+                         pager);
355
 
 
356
 
-       pager->workspaces_store = gtk_list_store_new (1, G_TYPE_STRING, NULL);
357
 
+       pager->workspaces_store = gtk_list_store_new (1,
358
 
+                                                     G_TYPE_STRING,
359
 
+                                                     NULL);
360
 
        update_workspaces_model (pager);
361
 
-       gtk_tree_view_set_model (GTK_TREE_VIEW (pager->workspaces_tree), GTK_TREE_MODEL (pager->workspaces_store));
362
 
+       gtk_tree_view_set_model (GTK_TREE_VIEW (pager->workspaces_tree),
363
 
+                                GTK_TREE_MODEL (pager->workspaces_store));
364
 
 
365
 
        g_object_unref (pager->workspaces_store);
366
 
 
367
 
-       cell = g_object_new (GTK_TYPE_CELL_RENDERER_TEXT, "editable", TRUE, NULL);
368
 
+       cell = g_object_new (GTK_TYPE_CELL_RENDERER_TEXT,
369
 
+                            "editable",
370
 
+                            TRUE,
371
 
+                            NULL);
372
 
        column = gtk_tree_view_column_new_with_attributes ("workspace",
373
 
                                                           cell,
374
 
-                                                          "text", 0,
375
 
+                                                          "text",
376
 
+                                                          0,
377
 
                                                           NULL);
378
 
-       gtk_tree_view_append_column (GTK_TREE_VIEW (pager->workspaces_tree), column);
379
 
-       g_signal_connect (cell, "edited",
380
 
-                         (GCallback) workspace_name_edited, pager);
381
 
-       
382
 
+       gtk_tree_view_append_column (GTK_TREE_VIEW (pager->workspaces_tree),
383
 
+                                    column);
384
 
+       g_signal_connect (cell,
385
 
+                         "edited",
386
 
+                         (GCallback) workspace_name_edited,
387
 
+                         pager);
388
 
+
389
 
        nr_ws = wnck_screen_get_workspace_count (pager->screen);
390
 
-       for (i = 0; i < nr_ws; i++) {
391
 
-               wncklet_connect_while_alive (
392
 
-                               G_OBJECT (wnck_screen_get_workspace (pager->screen, i)),
393
 
-                               "name_changed",
394
 
-                               G_CALLBACK(workspace_renamed),
395
 
-                               pager,
396
 
-                               pager->properties_dialog);
397
 
+       for (i = 0; i < nr_ws; i++)
398
 
+       {
399
 
+               wncklet_connect_while_alive (G_OBJECT (wnck_screen_get_workspace (pager->screen,
400
 
+                                                                                 i)),
401
 
+                                            "name_changed",
402
 
+                                            G_CALLBACK (workspace_renamed),
403
 
+                                            pager,
404
 
+                                            pager->properties_dialog);
405
 
        }
406
 
 
407
 
        update_properties_for_wm (pager);
408
 
Index: gnome-panel-2.32.0/applets/wncklet/workspace-switcher.ui
409
 
===================================================================
410
 
--- gnome-panel-2.32.0.orig/applets/wncklet/workspace-switcher.ui       2010-02-09 13:32:08.000000000 +0100
411
 
+++ gnome-panel-2.32.0/applets/wncklet/workspace-switcher.ui    2010-10-15 18:43:16.624592197 +0200
412
 
@@ -20,7 +20,7 @@
413
 
             <property name="orientation">vertical</property>
414
 
             <property name="spacing">12</property>
415
 
             <child>
416
 
-              <object class="GtkFrame" id="frame1">
417
 
+              <object class="GtkFrame" id="switcher_frame">
418
 
                 <property name="visible">True</property>
419
 
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
420
 
                 <property name="label_xalign">0</property>
421
 
@@ -253,6 +253,114 @@
422
 
                 <property name="position">1</property>
423
 
               </packing>
424
 
             </child>
425
 
+            <child>
426
 
+              <object class="GtkFrame" id="viewports_frame">
427
 
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
428
 
+                <property name="no_show_all">True</property>
429
 
+                <property name="label_xalign">0</property>
430
 
+                <property name="shadow_type">none</property>
431
 
+                <child>
432
 
+                  <object class="GtkAlignment" id="viewports_alignment">
433
 
+                    <property name="visible">True</property>
434
 
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
435
 
+                    <property name="left_padding">12</property>
436
 
+                    <child>
437
 
+                      <object class="GtkVBox" id="viewports_vbox">
438
 
+                        <property name="visible">True</property>
439
 
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
440
 
+                        <property name="spacing">6</property>
441
 
+                        <child>
442
 
+                          <object class="GtkTable" id="viewports_table">
443
 
+                            <property name="visible">True</property>
444
 
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
445
 
+                            <property name="n_rows">2</property>
446
 
+                            <property name="n_columns">2</property>
447
 
+                            <property name="column_spacing">6</property>
448
 
+                            <property name="row_spacing">6</property>
449
 
+                            <child>
450
 
+                              <object class="GtkLabel" id="hsize_label">
451
 
+                                <property name="visible">True</property>
452
 
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
453
 
+                                <property name="label" translatable="yes">Co_lumns:</property>
454
 
+                                <property name="use_underline">True</property>
455
 
+                                <property name="mnemonic_widget">hsize_spin</property>
456
 
+                              </object>
457
 
+                              <packing>
458
 
+                                <property name="x_options"></property>
459
 
+                                <property name="y_options"></property>
460
 
+                              </packing>
461
 
+                            </child>
462
 
+                            <child>
463
 
+                              <object class="GtkSpinButton" id="hsize_spin">
464
 
+                                <property name="visible">True</property>
465
 
+                                <property name="can_focus">True</property>
466
 
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
467
 
+                                <property name="adjustment">hsize_spin_adjustment</property>
468
 
+                                <property name="climb_rate">1</property>
469
 
+                              </object>
470
 
+                              <packing>
471
 
+                                <property name="left_attach">1</property>
472
 
+                                <property name="right_attach">2</property>
473
 
+                                <property name="x_options"></property>
474
 
+                                <property name="y_options"></property>
475
 
+                              </packing>
476
 
+                            </child>
477
 
+                            <child>
478
 
+                              <object class="GtkLabel" id="vsize_label">
479
 
+                                <property name="visible">True</property>
480
 
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
481
 
+                                <property name="label" translatable="yes">_Rows:</property>
482
 
+                                <property name="use_underline">True</property>
483
 
+                                <property name="mnemonic_widget">vsize_spin</property>
484
 
+                              </object>
485
 
+                              <packing>
486
 
+                                <property name="top_attach">1</property>
487
 
+                                <property name="bottom_attach">2</property>
488
 
+                                <property name="x_options"></property>
489
 
+                                <property name="y_options"></property>
490
 
+                              </packing>
491
 
+                            </child>
492
 
+                            <child>
493
 
+                              <object class="GtkSpinButton" id="vsize_spin">
494
 
+                                <property name="visible">True</property>
495
 
+                                <property name="can_focus">True</property>
496
 
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
497
 
+                                <property name="adjustment">vsize_spin_adjustment</property>
498
 
+                                <property name="climb_rate">1</property>
499
 
+                              </object>
500
 
+                              <packing>
501
 
+                                <property name="left_attach">1</property>
502
 
+                                <property name="right_attach">2</property>
503
 
+                                <property name="top_attach">1</property>
504
 
+                                <property name="bottom_attach">2</property>
505
 
+                                <property name="x_options"></property>
506
 
+                                <property name="y_options"></property>
507
 
+                              </packing>
508
 
+                            </child>
509
 
+                          </object>
510
 
+                          <packing>
511
 
+                            <property name="expand">False</property>
512
 
+                            <property name="fill">False</property>
513
 
+                            <property name="position">0</property>
514
 
+                          </packing>
515
 
+                        </child>
516
 
+                      </object>
517
 
+                    </child>
518
 
+                  </object>
519
 
+                </child>
520
 
+                <child type="label">
521
 
+                  <object class="GtkLabel" id="label_viewports">
522
 
+                    <property name="visible">True</property>
523
 
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
524
 
+                    <property name="label" translatable="yes">&lt;b&gt;Workspaces&lt;/b&gt;</property>
525
 
+                    <property name="use_markup">True</property>
526
 
+                  </object>
527
 
+                </child>
528
 
+              </object>
529
 
+              <packing>
530
 
+                <property name="position">2</property>
531
 
+              </packing>
532
 
+            </child>
533
 
           </object>
534
 
           <packing>
535
 
             <property name="position">1</property>
536
 
@@ -317,6 +425,20 @@
537
 
     <property name="value">1</property>
538
 
     <property name="lower">1</property>
539
 
     <property name="upper">16</property>
540
 
+    <property name="step_increment">1</property>
541
 
+    <property name="page_increment">10</property>
542
 
+  </object>
543
 
+  <object class="GtkAdjustment" id="hsize_spin_adjustment">
544
 
+    <property name="value">1</property>
545
 
+    <property name="lower">1</property>
546
 
+    <property name="upper">16</property>
547
 
+    <property name="step_increment">1</property>
548
 
+    <property name="page_increment">10</property>
549
 
+  </object>
550
 
+  <object class="GtkAdjustment" id="vsize_spin_adjustment">
551
 
+    <property name="value">1</property>
552
 
+    <property name="lower">1</property>
553
 
+    <property name="upper">16</property>
554
 
     <property name="step_increment">1</property>
555
 
     <property name="page_increment">10</property>
556
 
   </object>
557
 
Index: gnome-panel-2.32.0/gnome-panel/main.c
558
 
===================================================================
559
 
--- gnome-panel-2.32.0.orig/gnome-panel/main.c  2010-06-23 01:00:28.000000000 +0200
560
 
+++ gnome-panel-2.32.0/gnome-panel/main.c       2010-10-15 18:43:16.624592197 +0200
561
 
@@ -108,6 +108,11 @@
562
 
                              GCONF_CLIENT_PRELOAD_NONE,
563
 
                              NULL);
564
 
 
565
 
+       gconf_client_add_dir (panel_gconf_get_client (),
566
 
+                             "/apps/compiz-1/general/screen0/options",
567
 
+                             GCONF_CLIENT_PRELOAD_NONE,
568
 
+                             NULL);
569
 
+
570
 
        panel_global_config_load ();
571
 
        panel_lockdown_init ();
572
 
        panel_profile_load ();
573
 
@@ -132,6 +137,10 @@
574
 
        panel_lockdown_finalize ();
575
 
 
576
 
        gconf_client_remove_dir (panel_gconf_get_client (),
577
 
+                                "/apps/compiz-1/general/screen0/options",
578
 
+                                NULL);
579
 
+
580
 
+       gconf_client_remove_dir (panel_gconf_get_client (),
581
 
                                 "/desktop/gnome/interface",
582
 
                                 NULL);
583