Compiz

Merge lp:~muktupavels/compiz/gwd-remove-unused-setting into lp:compiz/0.9.12

  1. gwd-remove-unused-setting
  2. Merge into 0.9.12
Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Stephen M. Webb
Approved revision: 3939
Merged at revision: 3950
Proposed branch: lp:~muktupavels/compiz/gwd-remove-unused-setting
Merge into: lp:compiz/0.9.12
Diff against target: 504 lines (+14/-176)
14 files modified
gtk/window-decorator/gwd-settings-interface.c (+0/-7)
gtk/window-decorator/gwd-settings-storage-gsettings.c (+0/-18)
gtk/window-decorator/gwd-settings-storage-gsettings.h (+0/-1)
gtk/window-decorator/gwd-settings-storage-interface.c (+0/-6)
gtk/window-decorator/gwd-settings-storage-interface.h (+0/-2)
gtk/window-decorator/gwd-settings-writable-interface.c (+0/-8)
gtk/window-decorator/gwd-settings-writable-interface.h (+0/-6)
gtk/window-decorator/gwd-settings.c (+14/-42)
gtk/window-decorator/settings.c (+0/-1)
gtk/window-decorator/tests/compiz_gwd_mock_settings_storage.cpp (+0/-8)
gtk/window-decorator/tests/compiz_gwd_mock_settings_writable.cpp (+0/-9)
gtk/window-decorator/tests/compiz_gwd_mock_settings_writable.h (+0/-2)
gtk/window-decorator/tests/org.gnome.mutter.gschema.xml (+0/-7)
gtk/window-decorator/tests/test_gwd_settings.cpp (+0/-59)
To merge this branch: bzr merge lp:~muktupavels/compiz/gwd-remove-unused-setting
Reviewer Review Type Date Requested Status
Stephen M. Webb Approve
Review via email: mp+255243@code.launchpad.net

Commit message

Remove unused setting from gtk-window-decorator.

Description of the change

Remove unused setting from gtk-window-decorator.

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) wrote :

Builds OK, and since all the related code is nothing but oodles of infrastructure (no meat, all veg) I can't see how this could hurt anything.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gtk/window-decorator/gwd-settings-interface.c'
2--- gtk/window-decorator/gwd-settings-interface.c 2012-09-06 10:08:25 +0000
3+++ gtk/window-decorator/gwd-settings-interface.c 2015-04-05 17:36:16 +0000
4@@ -34,7 +34,6 @@
5 const gchar *INACTIVE_SHADOW_COLOR_DEFAULT = "#00000000";
6
7 const guint DRAGGABLE_BORDER_WIDTH_DEFAULT = 7;
8-const gboolean ATTACH_MODAL_DIALOGS_DEFAULT = FALSE;
9 const gint BLUR_TYPE_DEFAULT = BLUR_TYPE_NONE;
10
11 const gchar *METACITY_THEME_DEFAULT = "Adwaita";
12@@ -83,12 +82,6 @@
13 DRAGGABLE_BORDER_WIDTH_DEFAULT,
14 G_PARAM_READABLE));
15 g_object_interface_install_property (settings_interface,
16- g_param_spec_boolean ("attach-modal-dialogs",
17- "Attach modal dialogs",
18- "Attach modal dialogs setting",
19- ATTACH_MODAL_DIALOGS_DEFAULT,
20- G_PARAM_READABLE));
21- g_object_interface_install_property (settings_interface,
22 g_param_spec_int ("blur",
23 "Blur Type",
24 "Blur type property",
25
26=== modified file 'gtk/window-decorator/gwd-settings-storage-gsettings.c'
27--- gtk/window-decorator/gwd-settings-storage-gsettings.c 2014-09-18 09:40:08 +0000
28+++ gtk/window-decorator/gwd-settings-storage-gsettings.c 2015-04-05 17:36:16 +0000
29@@ -46,7 +46,6 @@
30 const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_USES_SYSTEM_FONT = "titlebar-uses-system-font";
31 const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_FONT = "titlebar-font";
32 const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES_BUTTON_LAYOUT = "button-layout";
33-const gchar * ORG_GNOME_MUTTER_ATTACH_MODAL_DIALOGS = "attach-modal-dialogs";
34 const gchar * ORG_GNOME_MUTTER_DRAGGABLE_BORDER_WIDTH = "draggable-border-width";
35
36 #define GWD_SETTINGS_STORAGE_GSETTINGS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GWD_TYPE_SETTINGS_STORAGE_GSETTINGS, GWDSettingsStorageGSettings));
37@@ -120,20 +119,6 @@
38 }
39
40 static gboolean
41-gwd_settings_storage_gsettings_update_attach_modal_dialogs (GWDSettingsStorage *settings)
42-{
43- GWDSettingsStorageGSettings *storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
44- GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (storage);
45-
46- if (!priv->mutter)
47- return FALSE;
48-
49- return gwd_settings_writable_attach_modal_dialogs_changed (priv->writable,
50- g_settings_get_boolean (priv->mutter,
51- ORG_GNOME_MUTTER_ATTACH_MODAL_DIALOGS));
52-}
53-
54-static gboolean
55 gwd_settings_storage_gsettings_update_blur (GWDSettingsStorage *settings)
56 {
57 GWDSettingsStorageGSettings *storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
58@@ -275,7 +260,6 @@
59 {
60 interface->update_use_tooltips = gwd_settings_storage_gsettings_update_use_tooltips;
61 interface->update_draggable_border_width = gwd_settings_storage_gsettings_update_draggable_border_width;
62- interface->update_attach_modal_dialogs = gwd_settings_storage_gsettings_update_attach_modal_dialogs;
63 interface->update_blur = gwd_settings_storage_gsettings_update_blur;
64 interface->update_metacity_theme = gwd_settings_storage_gsettings_update_metacity_theme;
65 interface->update_opacity = gwd_settings_storage_gsettings_update_opacity;
66@@ -496,8 +480,6 @@
67
68 if (strcmp (key, ORG_GNOME_MUTTER_DRAGGABLE_BORDER_WIDTH) == 0)
69 gwd_settings_storage_update_draggable_border_width (storage);
70- else if (strcmp (key, ORG_GNOME_MUTTER_ATTACH_MODAL_DIALOGS) == 0)
71- gwd_settings_storage_update_attach_modal_dialogs (storage);
72 }
73
74 void
75
76=== modified file 'gtk/window-decorator/gwd-settings-storage-gsettings.h'
77--- gtk/window-decorator/gwd-settings-storage-gsettings.h 2012-10-06 16:11:05 +0000
78+++ gtk/window-decorator/gwd-settings-storage-gsettings.h 2015-04-05 17:36:16 +0000
79@@ -74,7 +74,6 @@
80 extern const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_USES_SYSTEM_FONT;
81 extern const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_FONT;
82 extern const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES_BUTTON_LAYOUT;
83-extern const gchar * ORG_GNOME_MUTTER_ATTACH_MODAL_DIALOGS;
84 extern const gchar * ORG_GNOME_MUTTER_DRAGGABLE_BORDER_WIDTH;
85
86 G_END_DECLS
87
88=== modified file 'gtk/window-decorator/gwd-settings-storage-interface.c'
89--- gtk/window-decorator/gwd-settings-storage-interface.c 2012-09-06 10:08:25 +0000
90+++ gtk/window-decorator/gwd-settings-storage-interface.c 2015-04-05 17:36:16 +0000
91@@ -39,12 +39,6 @@
92 return (*interface->update_draggable_border_width) (settings);
93 }
94
95-gboolean gwd_settings_storage_update_attach_modal_dialogs (GWDSettingsStorage *settings)
96-{
97- GWDSettingsStorageInterface *interface = GWD_SETTINGS_STORAGE_GET_INTERFACE (settings);
98- return (*interface->update_attach_modal_dialogs) (settings);
99-}
100-
101 gboolean gwd_settings_storage_update_blur (GWDSettingsStorage *settings)
102 {
103 GWDSettingsStorageInterface *interface = GWD_SETTINGS_STORAGE_GET_INTERFACE (settings);
104
105=== modified file 'gtk/window-decorator/gwd-settings-storage-interface.h'
106--- gtk/window-decorator/gwd-settings-storage-interface.h 2012-10-06 16:11:05 +0000
107+++ gtk/window-decorator/gwd-settings-storage-interface.h 2015-04-05 17:36:16 +0000
108@@ -41,7 +41,6 @@
109
110 gboolean (*update_use_tooltips) (GWDSettingsStorage *settings);
111 gboolean (*update_draggable_border_width) (GWDSettingsStorage *settings);
112- gboolean (*update_attach_modal_dialogs) (GWDSettingsStorage *settings);
113 gboolean (*update_blur) (GWDSettingsStorage *settings);
114 gboolean (*update_metacity_theme) (GWDSettingsStorage *settings);
115 gboolean (*update_opacity) (GWDSettingsStorage *settings);
116@@ -52,7 +51,6 @@
117
118 gboolean gwd_settings_storage_update_use_tooltips (GWDSettingsStorage *settings);
119 gboolean gwd_settings_storage_update_draggable_border_width (GWDSettingsStorage *settings);
120-gboolean gwd_settings_storage_update_attach_modal_dialogs (GWDSettingsStorage *settings);
121 gboolean gwd_settings_storage_update_blur (GWDSettingsStorage *settings);
122 gboolean gwd_settings_storage_update_metacity_theme (GWDSettingsStorage *settings);
123 gboolean gwd_settings_storage_update_opacity (GWDSettingsStorage *settings);
124
125=== modified file 'gtk/window-decorator/gwd-settings-writable-interface.c'
126--- gtk/window-decorator/gwd-settings-writable-interface.c 2012-09-06 10:08:25 +0000
127+++ gtk/window-decorator/gwd-settings-writable-interface.c 2015-04-05 17:36:16 +0000
128@@ -85,14 +85,6 @@
129 }
130
131 gboolean
132-gwd_settings_writable_attach_modal_dialogs_changed (GWDSettingsWritable *settings,
133- gboolean attach_modal_dialogs)
134-{
135- GWDSettingsWritableInterface *iface = GWD_SETTINGS_WRITABLE_GET_INTERFACE (settings);
136- return (*iface->attach_modal_dialogs_changed) (settings, attach_modal_dialogs);
137-}
138-
139-gboolean
140 gwd_settings_writable_blur_changed (GWDSettingsWritable *settings,
141 const gchar *blur_type)
142 {
143
144=== modified file 'gtk/window-decorator/gwd-settings-writable-interface.h'
145--- gtk/window-decorator/gwd-settings-writable-interface.h 2012-10-06 16:11:05 +0000
146+++ gtk/window-decorator/gwd-settings-writable-interface.h 2015-04-05 17:36:16 +0000
147@@ -56,8 +56,6 @@
148 gboolean new_value);
149 gboolean (*draggable_border_width_changed) (GWDSettingsWritable *settings,
150 gint new_value);
151- gboolean (*attach_modal_dialogs_changed) (GWDSettingsWritable *settings,
152- gboolean new_value);
153 gboolean (*blur_changed) (GWDSettingsWritable *settings,
154 const gchar *type);
155 gboolean (*metacity_theme_changed) (GWDSettingsWritable *settings,
156@@ -108,10 +106,6 @@
157 gint draggable_border_width);
158
159 gboolean
160-gwd_settings_writable_attach_modal_dialogs_changed (GWDSettingsWritable *settings,
161- gboolean attach_modal_dialogs);
162-
163-gboolean
164 gwd_settings_writable_blur_changed (GWDSettingsWritable *settings,
165 const gchar *blur_type);
166
167
168=== modified file 'gtk/window-decorator/gwd-settings.c'
169--- gtk/window-decorator/gwd-settings.c 2013-05-13 15:39:25 +0000
170+++ gtk/window-decorator/gwd-settings.c 2015-04-05 17:36:16 +0000
171@@ -61,21 +61,20 @@
172 GWD_SETTINGS_IMPL_PROPERTY_INACTIVE_SHADOW = 2,
173 GWD_SETTINGS_IMPL_PROPERTY_USE_TOOLTIPS = 3,
174 GWD_SETTINGS_IMPL_PROPERTY_DRAGGABLE_BORDER_WIDTH = 4,
175- GWD_SETTINGS_IMPL_PROPERTY_ATTACH_MODAL_DIALOGS = 5,
176- GWD_SETTINGS_IMPL_PROPERTY_BLUR_CHANGED = 6,
177- GWD_SETTINGS_IMPL_PROPERTY_METACITY_THEME = 7,
178- GWD_SETTINGS_IMPL_PROPERTY_ACTIVE_OPACITY = 8,
179- GWD_SETTINGS_IMPL_PROPERTY_INACTIVE_OPACITY = 9,
180- GWD_SETTINGS_IMPL_PROPERTY_ACTIVE_SHADE_OPACITY = 10,
181- GWD_SETTINGS_IMPL_PROPERTY_INACTIVE_SHADE_OPACITY = 11,
182- GWD_SETTINGS_IMPL_PROPERTY_BUTTON_LAYOUT = 12,
183- GWD_SETTINGS_IMPL_PROPERTY_TITLEBAR_ACTION_DOUBLE_CLICK = 13,
184- GWD_SETTINGS_IMPL_PROPERTY_TITLEBAR_ACTION_MIDDLE_CLICK = 14,
185- GWD_SETTINGS_IMPL_PROPERTY_TITLEBAR_ACTION_RIGHT_CLICK = 15,
186- GWD_SETTINGS_IMPL_PROPERTY_MOUSE_WHEEL_ACTION = 16,
187- GWD_SETTINGS_IMPL_PROPERTY_TITLEBAR_FONT = 17,
188- GWD_SETTINGS_IMPL_PROPERTY_CMDLINE_OPTIONS = 18,
189- GWD_SETTINGS_IMPL_PROPERTY_SETTINGS_NOTIFIED = 19
190+ GWD_SETTINGS_IMPL_PROPERTY_BLUR_CHANGED = 5,
191+ GWD_SETTINGS_IMPL_PROPERTY_METACITY_THEME = 6,
192+ GWD_SETTINGS_IMPL_PROPERTY_ACTIVE_OPACITY = 7,
193+ GWD_SETTINGS_IMPL_PROPERTY_INACTIVE_OPACITY = 8,
194+ GWD_SETTINGS_IMPL_PROPERTY_ACTIVE_SHADE_OPACITY = 9,
195+ GWD_SETTINGS_IMPL_PROPERTY_INACTIVE_SHADE_OPACITY = 10,
196+ GWD_SETTINGS_IMPL_PROPERTY_BUTTON_LAYOUT = 11,
197+ GWD_SETTINGS_IMPL_PROPERTY_TITLEBAR_ACTION_DOUBLE_CLICK = 12,
198+ GWD_SETTINGS_IMPL_PROPERTY_TITLEBAR_ACTION_MIDDLE_CLICK = 13,
199+ GWD_SETTINGS_IMPL_PROPERTY_TITLEBAR_ACTION_RIGHT_CLICK = 14,
200+ GWD_SETTINGS_IMPL_PROPERTY_MOUSE_WHEEL_ACTION = 15,
201+ GWD_SETTINGS_IMPL_PROPERTY_TITLEBAR_FONT = 16,
202+ GWD_SETTINGS_IMPL_PROPERTY_CMDLINE_OPTIONS = 17,
203+ GWD_SETTINGS_IMPL_PROPERTY_SETTINGS_NOTIFIED = 18
204 };
205
206 enum
207@@ -92,7 +91,6 @@
208 decor_shadow_options_t inactive_shadow;
209 gboolean use_tooltips;
210 gint draggable_border_width;
211- gboolean attach_modal_dialogs;
212 gint blur_type;
213 gchar *metacity_theme;
214 gdouble metacity_active_opacity;
215@@ -261,24 +259,6 @@
216 }
217
218 static gboolean
219-gwd_settings_attach_modal_dialogs_changed (GWDSettingsWritable *settings,
220- gboolean attach_modal_dialogs)
221-{
222- GWDSettingsImpl *settings_impl = GWD_SETTINGS_IMPL (settings);
223- GWDSettingsImplPrivate *priv = GET_PRIVATE (settings_impl);
224-
225- if (priv->attach_modal_dialogs != attach_modal_dialogs)
226- {
227- priv->attach_modal_dialogs = attach_modal_dialogs;
228- append_to_notify_funcs (settings_impl, gwd_settings_notified_update_decorations);
229- release_notify_funcs (settings_impl);
230- return TRUE;
231- }
232- else
233- return FALSE;
234-}
235-
236-static gboolean
237 gwd_settings_blur_changed (GWDSettingsWritable *settings,
238 const gchar *type)
239
240@@ -554,7 +534,6 @@
241 interface->shadow_property_changed = gwd_settings_shadow_property_changed;
242 interface->use_tooltips_changed = gwd_settings_use_tooltips_changed;
243 interface->draggable_border_width_changed = gwd_settings_draggable_border_width_changed;
244- interface->attach_modal_dialogs_changed = gwd_settings_attach_modal_dialogs_changed;
245 interface->blur_changed = gwd_settings_blur_changed;
246 interface->metacity_theme_changed = gwd_settings_metacity_theme_changed;
247 interface->opacity_changed = gwd_settings_opacity_changed;
248@@ -659,9 +638,6 @@
249 case GWD_SETTINGS_IMPL_PROPERTY_DRAGGABLE_BORDER_WIDTH:
250 g_value_set_int (value, priv->draggable_border_width);
251 break;
252- case GWD_SETTINGS_IMPL_PROPERTY_ATTACH_MODAL_DIALOGS:
253- g_value_set_boolean (value, priv->attach_modal_dialogs);
254- break;
255 case GWD_SETTINGS_IMPL_PROPERTY_BLUR_CHANGED:
256 g_value_set_int (value, priv->blur_type);
257 break;
258@@ -729,9 +705,6 @@
259 GWD_SETTINGS_IMPL_PROPERTY_DRAGGABLE_BORDER_WIDTH,
260 "draggable-border-width");
261 g_object_class_override_property (object_class,
262- GWD_SETTINGS_IMPL_PROPERTY_ATTACH_MODAL_DIALOGS,
263- "attach-modal-dialogs");
264- g_object_class_override_property (object_class,
265 GWD_SETTINGS_IMPL_PROPERTY_BLUR_CHANGED,
266 "blur");
267 g_object_class_override_property (object_class,
268@@ -807,7 +780,6 @@
269 priv->inactive_shadow.shadow_color[1] = 0;
270 priv->inactive_shadow.shadow_color[2] = 0;
271 priv->draggable_border_width = DRAGGABLE_BORDER_WIDTH_DEFAULT;
272- priv->attach_modal_dialogs = ATTACH_MODAL_DIALOGS_DEFAULT;
273 priv->blur_type = BLUR_TYPE_DEFAULT;
274 priv->metacity_theme = g_strdup (METACITY_THEME_DEFAULT);
275 priv->metacity_active_opacity = METACITY_ACTIVE_OPACITY_DEFAULT;
276
277=== modified file 'gtk/window-decorator/settings.c'
278--- gtk/window-decorator/settings.c 2014-06-12 22:19:35 +0000
279+++ gtk/window-decorator/settings.c 2015-04-05 17:36:16 +0000
280@@ -70,7 +70,6 @@
281 gwd_settings_storage_update_titlebar_actions (storage);
282 gwd_settings_storage_update_blur (storage);
283 gwd_settings_storage_update_draggable_border_width (storage);
284- gwd_settings_storage_update_attach_modal_dialogs (storage);
285 gwd_settings_storage_update_use_tooltips (storage);
286 gwd_process_decor_shadow_property_update ();
287 #else
288
289=== modified file 'gtk/window-decorator/tests/compiz_gwd_mock_settings_storage.cpp'
290--- gtk/window-decorator/tests/compiz_gwd_mock_settings_storage.cpp 2012-09-06 10:08:25 +0000
291+++ gtk/window-decorator/tests/compiz_gwd_mock_settings_storage.cpp 2015-04-05 17:36:16 +0000
292@@ -73,13 +73,6 @@
293 return settingsGMock->updateDraggableBorderWidth ();
294 }
295
296-gboolean gwd_mock_settings_storage_update_attach_modal_dialogs (GWDSettingsStorage *settings)
297-{
298- GWDMockSettingsStorage *settingsStorageMock = GWD_MOCK_SETTINGS_STORAGE (settings)
299- GWDMockSettingsStorageGMockInterface *settingsGMock = GET_PRIVATE (settingsStorageMock)->mock;
300- return settingsGMock->updateAttachModalDialogs ();
301-}
302-
303 gboolean gwd_mock_settings_storage_update_blur (GWDSettingsStorage *settings)
304 {
305 GWDMockSettingsStorage *settingsStorageMock = GWD_MOCK_SETTINGS_STORAGE (settings);
306@@ -126,7 +119,6 @@
307 {
308 interface->update_use_tooltips = gwd_mock_settings_storage_update_use_tooltips;
309 interface->update_draggable_border_width = gwd_mock_settings_storage_update_draggable_border_width;
310- interface->update_attach_modal_dialogs = gwd_mock_settings_storage_update_attach_modal_dialogs;
311 interface->update_blur = gwd_mock_settings_storage_update_blur;
312 interface->update_metacity_theme = gwd_mock_settings_storage_update_metacity_theme;
313 interface->update_opacity = gwd_mock_settings_storage_update_opacity;
314
315=== modified file 'gtk/window-decorator/tests/compiz_gwd_mock_settings_writable.cpp'
316--- gtk/window-decorator/tests/compiz_gwd_mock_settings_writable.cpp 2012-09-06 10:08:25 +0000
317+++ gtk/window-decorator/tests/compiz_gwd_mock_settings_writable.cpp 2015-04-05 17:36:16 +0000
318@@ -116,14 +116,6 @@
319 }
320
321 gboolean
322-gwd_mock_settings_writable_attach_modal_dialogs_changed (GWDSettingsWritable *settings,
323- gboolean attach_modal_dialogs)
324-{
325- GWDMockSettingsWritableGMockInterface *gmockSettingsWritable = GET_PRIVATE (settings)->mock;
326- return gmockSettingsWritable->attachModalDialogsChanged (attach_modal_dialogs);
327-}
328-
329-gboolean
330 gwd_mock_settings_writable_blur_changed (GWDSettingsWritable *settings,
331 const gchar *blur_type)
332 {
333@@ -187,7 +179,6 @@
334 interface->shadow_property_changed = gwd_mock_settings_writable_shadow_property_changed;
335 interface->use_tooltips_changed = gwd_mock_settings_writable_use_tooltips_changed;
336 interface->draggable_border_width_changed = gwd_mock_settings_writable_draggable_border_width_changed;
337- interface->attach_modal_dialogs_changed = gwd_mock_settings_writable_attach_modal_dialogs_changed;
338 interface->blur_changed = gwd_mock_settings_writable_blur_changed;
339 interface->metacity_theme_changed = gwd_mock_settings_writable_metacity_theme_changed;
340 interface->opacity_changed = gwd_mock_settings_writable_opacity_changed;
341
342=== modified file 'gtk/window-decorator/tests/compiz_gwd_mock_settings_writable.h'
343--- gtk/window-decorator/tests/compiz_gwd_mock_settings_writable.h 2012-09-06 10:08:25 +0000
344+++ gtk/window-decorator/tests/compiz_gwd_mock_settings_writable.h 2015-04-05 17:36:16 +0000
345@@ -59,7 +59,6 @@
346 const gchar *inactive_shadow_color) = 0;
347 virtual gboolean useTooltipsChanged (gboolean newValue) = 0;
348 virtual gboolean draggableBorderWidthChanged (gint newValue) = 0;
349- virtual gboolean attachModalDialogsChanged (gboolean newValue) = 0;
350 virtual gboolean blurChanged (const gchar *type) = 0;
351 virtual gboolean metacityThemeChanged (gboolean useMetacityTheme, const gchar *metacityTheme) = 0;
352 virtual gboolean opacityChanged (gdouble inactiveOpacity,
353@@ -90,7 +89,6 @@
354 gdouble, gdouble, gdouble, gdouble, const gchar *));
355 MOCK_METHOD1 (useTooltipsChanged, gboolean (gboolean));
356 MOCK_METHOD1 (draggableBorderWidthChanged, gboolean (gint));
357- MOCK_METHOD1 (attachModalDialogsChanged, gboolean (gboolean));
358 MOCK_METHOD1 (blurChanged, gboolean (const gchar *));
359 MOCK_METHOD2 (metacityThemeChanged, gboolean (gboolean, const gchar *));
360 MOCK_METHOD4 (opacityChanged, gboolean (gdouble, gdouble, gboolean, gboolean));
361
362=== modified file 'gtk/window-decorator/tests/org.gnome.mutter.gschema.xml'
363--- gtk/window-decorator/tests/org.gnome.mutter.gschema.xml 2012-09-05 15:28:59 +0000
364+++ gtk/window-decorator/tests/org.gnome.mutter.gschema.xml 2015-04-05 17:36:16 +0000
365@@ -1,13 +1,6 @@
366 <?xml version="1.0" encoding="UTF-8"?>
367 <schemalist>
368 <schema path="/org/gnome/mutter/" id="org.gnome.mutter" gettext-domain="@GETTEXT_DOMAIN">
369-
370- <key type="b" name="attach-modal-dialogs">
371- <default>false</default>
372- <summary>Attach modal dialogs</summary>
373- <description>When true, instead of having independent titlebars, modal dialogs appear attached to the titlebar of the parent window and are moved together with the parent window.</description>
374- </key>
375-
376 <key type="i" name="draggable-border-width">
377 <default>10</default>
378 <range min="0" max="64"/>
379
380=== modified file 'gtk/window-decorator/tests/test_gwd_settings.cpp'
381--- gtk/window-decorator/tests/test_gwd_settings.cpp 2014-08-27 20:12:15 +0000
382+++ gtk/window-decorator/tests/test_gwd_settings.cpp 2015-04-05 17:36:16 +0000
383@@ -198,7 +198,6 @@
384 const gushort INACTIVE_SHADOW_COLOR_VALUE[] = { 0, 0, 0 };
385 const gboolean USE_TOOLTIPS_VALUE = !USE_TOOLTIPS_DEFAULT;
386 const guint DRAGGABLE_BORDER_WIDTH_VALUE = 1;
387- const gboolean ATTACH_MODAL_DIALOGS_VALUE = TRUE;
388 const std::string BLUR_TYPE_TITLEBAR_VALUE ("titlebar");
389 const gint BLUR_TYPE_TITLEBAR_INT_VALUE = BLUR_TYPE_TITLEBAR;
390 const std::string BLUR_TYPE_ALL_VALUE ("all");
391@@ -330,7 +329,6 @@
392 Eq (testing_values::INACTIVE_SHADOW_COLOR_STR_VALUE))).WillOnce (Return (TRUE));
393 EXPECT_CALL (writableGMock, useTooltipsChanged (testing_values::USE_TOOLTIPS_VALUE)).WillOnce (Return (TRUE));
394 EXPECT_CALL (writableGMock, draggableBorderWidthChanged (testing_values::DRAGGABLE_BORDER_WIDTH_VALUE)).WillOnce (Return (TRUE));
395- EXPECT_CALL (writableGMock, attachModalDialogsChanged (testing_values::ATTACH_MODAL_DIALOGS_VALUE)).WillOnce (Return (TRUE));
396 EXPECT_CALL (writableGMock, blurChanged (Eq (testing_values::BLUR_TYPE_TITLEBAR_VALUE))).WillOnce (Return (TRUE));
397 EXPECT_CALL (writableGMock, metacityThemeChanged (TRUE, Eq (testing_values::METACITY_THEME_VALUE))).WillOnce (Return (TRUE));
398 EXPECT_CALL (writableGMock, opacityChanged (testing_values::ACTIVE_OPACITY_VALUE,
399@@ -364,7 +362,6 @@
400 testing_values::INACTIVE_SHADOW_COLOR_STR_VALUE.c_str ()), IsTrue ());
401 EXPECT_THAT (gwd_settings_writable_use_tooltips_changed (writableMock.get (), testing_values::USE_TOOLTIPS_VALUE), IsTrue ());
402 EXPECT_THAT (gwd_settings_writable_draggable_border_width_changed (writableMock.get (), testing_values::DRAGGABLE_BORDER_WIDTH_VALUE), IsTrue ());
403- EXPECT_THAT (gwd_settings_writable_attach_modal_dialogs_changed (writableMock.get (), testing_values::ATTACH_MODAL_DIALOGS_VALUE), IsTrue ());
404 EXPECT_THAT (gwd_settings_writable_blur_changed (writableMock.get (), testing_values::BLUR_TYPE_TITLEBAR_VALUE.c_str ()), IsTrue ());
405 EXPECT_THAT (gwd_settings_writable_metacity_theme_changed (writableMock.get (),
406 testing_values::USE_METACITY_THEME_VALUE,
407@@ -472,14 +469,6 @@
408 "draggable-border-width",
409 &integerGValue);
410
411- EXPECT_CALL (settingsGMock, getProperty (GWD_MOCK_SETTINGS_PROPERTY_ATTACH_MODAL_DIALOGS,
412- GValueMatch <gboolean> (FALSE, g_value_get_boolean),
413- _));
414-
415- g_object_get_property (G_OBJECT (settingsMock.get ()),
416- "attach-modal-dialogs",
417- &booleanGValue);
418-
419 EXPECT_CALL (settingsGMock, getProperty (GWD_MOCK_SETTINGS_PROPERTY_BLUR_CHANGED,
420 GValueMatch <gint> (0, g_value_get_int),
421 _));
422@@ -783,29 +772,6 @@
423 DRAGGABLE_BORDER_WIDTH_DEFAULT), IsFalse ());
424 }
425
426-TEST_F(GWDSettingsTest, TestAttachModalDialogsChanged)
427-{
428- EXPECT_CALL (*mGMockNotified, updateDecorations ());
429- EXPECT_THAT (gwd_settings_writable_attach_modal_dialogs_changed (GWD_SETTINGS_WRITABLE_INTERFACE (mSettings.get ()),
430- testing_values::ATTACH_MODAL_DIALOGS_VALUE), IsTrue ());
431-
432- AutoUnsetGValue attachModalDialogsValue (G_TYPE_BOOLEAN);
433- GValue &attachModalDialogsGValue = attachModalDialogsValue;
434-
435- g_object_get_property (G_OBJECT (mSettings.get ()),
436- "attach-modal-dialogs",
437- &attachModalDialogsGValue);
438-
439- EXPECT_THAT (&attachModalDialogsGValue, GValueMatch <gboolean> (testing_values::ATTACH_MODAL_DIALOGS_VALUE,
440- g_value_get_boolean));
441-}
442-
443-TEST_F(GWDSettingsTest, TestAttachModalDialogsChangedIsDefault)
444-{
445- EXPECT_THAT (gwd_settings_writable_attach_modal_dialogs_changed (GWD_SETTINGS_WRITABLE_INTERFACE (mSettings.get ()),
446- ATTACH_MODAL_DIALOGS_DEFAULT), IsFalse ());
447-}
448-
449 TEST_F(GWDSettingsTest, TestBlurChangedTitlebar)
450 {
451 EXPECT_CALL (*mGMockNotified, updateDecorations ());
452@@ -1218,7 +1184,6 @@
453 virtual GWDSettingsStorage * GetStorage () = 0;
454 virtual void SetUseTooltips (gboolean useTooltips) = 0;
455 virtual void SetDraggableBorderWidth (gint draggableBorderWidth) = 0;
456- virtual void SetAttachModalDialogs (gboolean attachModalDialogs) = 0;
457 virtual void SetBlur (const std::string &blurType) = 0;
458 virtual void SetOpacity (gdouble activeOpacity,
459 gdouble inactiveOpacity,
460@@ -1292,16 +1257,6 @@
461 gwd_settings_storage_update_draggable_border_width (storage);
462 }
463
464-TEST_P (GWDSettingsTestStorageUpdates, TestSetAttachModalDialogs)
465-{
466- GWDSettingsStorage *storage = GetParam ()->GetStorage ();
467- GetParam ()->SetAttachModalDialogs (testing_values::ATTACH_MODAL_DIALOGS_VALUE);
468-
469- EXPECT_CALL (*mSettingsMock, attachModalDialogsChanged (testing_values::ATTACH_MODAL_DIALOGS_VALUE));
470-
471- gwd_settings_storage_update_attach_modal_dialogs (storage);
472-}
473-
474 TEST_P (GWDSettingsTestStorageUpdates, TestSetBlur)
475 {
476 GWDSettingsStorage *storage = GetParam ()->GetStorage ();
477@@ -1414,15 +1369,6 @@
478 gwd_settings_writable_draggable_border_width_changed, mWritable, draggableBorderWidth)));
479 }
480
481- virtual void SetAttachModalDialogs (gboolean attachModalDialogs)
482- {
483- EXPECT_CALL (*mStorageMock, updateAttachModalDialogs ())
484- .WillOnce (
485- InvokeFunctor (
486- boost::bind (
487- gwd_settings_writable_attach_modal_dialogs_changed, mWritable, attachModalDialogs)));
488- }
489-
490 virtual void SetBlur (const std::string &blurType)
491 {
492 EXPECT_CALL (*mStorageMock, updateBlur ())
493@@ -1579,11 +1525,6 @@
494 g_settings_set_int (mMutterSettings, ORG_GNOME_MUTTER_DRAGGABLE_BORDER_WIDTH, draggableBorderWidth);
495 }
496
497- virtual void SetAttachModalDialogs (gboolean attachModalDialogs)
498- {
499- g_settings_set_boolean (mMutterSettings, ORG_GNOME_MUTTER_ATTACH_MODAL_DIALOGS, attachModalDialogs);
500- }
501-
502 virtual void SetBlur (const std::string &blurType)
503 {
504 g_settings_set_string (mGWDSettings, ORG_COMPIZ_GWD_KEY_BLUR_TYPE, blurType.c_str ());

Subscribers

People subscribed via source and target branches