Compiz

Merge lp:~muktupavels/compiz/visual-bell-type into lp:compiz/0.9.13

  1. visual-bell-type
  2. Merge into 0.9.13
Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: no longer in the source branch.
Merged at revision: 4193
Proposed branch: lp:~muktupavels/compiz/visual-bell-type
Merge into: lp:compiz/0.9.13
Diff against target: 43 lines (+4/-4)
2 files modified
compizconfig/integration/gnome/src/ccs_gnome_integration.c (+2/-2)
compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp (+2/-2)
To merge this branch: bzr merge lp:~muktupavels/compiz/visual-bell-type
Reviewer Review Type Date Requested Status
Khurshid Alam (community) Approve
Dmitry Shachnev Approve
Review via email: mp+362455@code.launchpad.net

Commit message

Fix visual-bell-type GSettings values.

Description of the change

Fix visual-bell-type GSettings values.

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

LGTM.

I don't know why Launchpad doesn't show the diff, so here is a link in case someone needs it:
https://bazaar.launchpad.net/~muktupavels/compiz/visual-bell-type/revision/4192

review: Approve
Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

Now it is also tested, fix works. :)

Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

LGTM.

lp:~muktupavels/compiz/visual-bell-type updated
4192. By Alberts Muktupāvels

Fix visual-bell-type GSettings values.

Revision history for this message
Khurshid Alam (khurshid-alam) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compizconfig/integration/gnome/src/ccs_gnome_integration.c'
2--- compizconfig/integration/gnome/src/ccs_gnome_integration.c 2014-03-04 20:00:28 +0000
3+++ compizconfig/integration/gnome/src/ccs_gnome_integration.c 2019-02-04 20:33:43 +0000
4@@ -302,7 +302,7 @@
5 {
6 Bool fullscreen;
7
8- fullscreen = strcmp (value, "fullscreen") == 0;
9+ fullscreen = strcmp (value, "fullscreen-flash") == 0;
10 ccsSetBool (setting, fullscreen, TRUE);
11 ret = TRUE;
12 }
13@@ -549,7 +549,7 @@
14 }
15 else if (strcmp (settingName, "fullscreen_visual_bell") == 0)
16 {
17- const char *newValueString = v->value.asBool ? "fullscreen" : "frame_flash";
18+ const char *newValueString = v->value.asBool ? "fullscreen-flash" : "frame-flash";
19 newValue->value.asString = strdup (newValueString);
20 type = TypeString;
21
22
23=== modified file 'compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp'
24--- compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp 2014-03-04 20:00:28 +0000
25+++ compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp 2019-02-04 20:33:43 +0000
26@@ -390,7 +390,7 @@
27 {
28 const std::string settingName ("fullscreen_visual_bell");
29 CCSSettingValue *v = MakeSettingValue ();
30- v->value.asString = strdup ("fullscreen");
31+ v->value.asString = strdup ("fullscreen-flash");
32
33 mIntegratedSetting = createIntegratedSettingCompositionFromMock (MOCK_PLUGIN,
34 settingName,
35@@ -791,7 +791,7 @@
36 CCSSettingInfo info;
37
38 compizValue->value.asBool = TRUE;
39- gnomeValue->value.asString = strdup ("fullscreen");
40+ gnomeValue->value.asString = strdup ("fullscreen-flash");
41
42 mIntegratedSetting = createIntegratedSettingCompositionFromMock (MOCK_PLUGIN,
43 settingName,

Subscribers

People subscribed via source and target branches