Compiz Configuration Library - GSettings Backend

Merge lp:~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.fix_874815 into lp:compiz-compizconfig-gsettings

  1. compiz-compizconfig-gsettings.fix_874815
  2. Merge into trunk
Proposed by Sam Spilsbury
Status: Work in progress
Proposed branch: lp:~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.fix_874815
Merge into: lp:compiz-compizconfig-gsettings
Prerequisite: lp:~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.fix_872976
Diff against target: 160 lines (+17/-17)
2 files modified
src/gconf-integration.c (+7/-7)
src/gsettings.c (+10/-10)
To merge this branch: bzr merge lp:~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.fix_874815
Reviewer Review Type Date Requested Status
Sam Spilsbury Pending
Review via email: mp+80517@code.launchpad.net

This proposal supersedes a proposal from 2011-10-15.

Description of the change

Bug 874815

To post a comment you must log in.
lp:~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.fix_874815 updated
160. By Sam Spilsbury

Merge in changes from truncation branch

161. By Sam Spilsbury

More descriptive names

Unmerged revisions

161. By Sam Spilsbury

More descriptive names

160. By Sam Spilsbury

Merge in changes from truncation branch

159. By Sam Spilsbury

Fix conflicts

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/gconf-integration.c'
--- src/gconf-integration.c 2011-07-24 14:28:26 +0000
+++ src/gconf-integration.c 2012-01-21 21:23:24 +0000
@@ -577,7 +577,7 @@
577 gboolean value;577 gboolean value;
578578
579 value = gconf_value_get_bool (gconfValue);579 value = gconf_value_get_bool (gconfValue);
580 ccsSetBool (setting, value ? TRUE : FALSE, TRUE);580 ccsSetBool (setting, value ? TRUE : FALSE, FALSE);
581 ret = TRUE;581 ret = TRUE;
582 }582 }
583 break;583 break;
@@ -589,7 +589,7 @@
589 value = gconf_value_get_string (gconfValue);589 value = gconf_value_get_string (gconfValue);
590 if (value)590 if (value)
591 {591 {
592 ccsSetString (setting, value, TRUE);592 ccsSetString (setting, value, FALSE);
593 ret = TRUE;593 ret = TRUE;
594 }594 }
595 }595 }
@@ -626,7 +626,7 @@
626 gboolean showAll;626 gboolean showAll;
627627
628 showAll = gconf_value_get_bool (gconfValue);628 showAll = gconf_value_get_bool (gconfValue);
629 ccsSetBool (setting, !showAll, TRUE);629 ccsSetBool (setting, !showAll, FALSE);
630 ret = TRUE;630 ret = TRUE;
631 }631 }
632 }632 }
@@ -642,7 +642,7 @@
642 Bool fullscreen;642 Bool fullscreen;
643643
644 fullscreen = strcmp (value, "fullscreen") == 0;644 fullscreen = strcmp (value, "fullscreen") == 0;
645 ccsSetBool (setting, fullscreen, TRUE);645 ccsSetBool (setting, fullscreen, FALSE);
646 ret = TRUE;646 ret = TRUE;
647 }647 }
648 }648 }
@@ -658,7 +658,7 @@
658 if (focusMode)658 if (focusMode)
659 {659 {
660 Bool clickToFocus = (strcmp (focusMode, "click") == 0);660 Bool clickToFocus = (strcmp (focusMode, "click") == 0);
661 ccsSetBool (setting, clickToFocus, TRUE);661 ccsSetBool (setting, clickToFocus, FALSE);
662 ret = TRUE;662 ret = TRUE;
663 }663 }
664 }664 }
@@ -689,7 +689,7 @@
689 else689 else
690 button.button = 1;690 button.button = 1;
691691
692 ccsSetButton (setting, button, TRUE);692 ccsSetButton (setting, button, FALSE);
693 ret = TRUE;693 ret = TRUE;
694 }694 }
695 }695 }
@@ -760,7 +760,7 @@
760 value.button = button;760 value.button = button;
761 value.buttonModMask = buttonModMask;761 value.buttonModMask = buttonModMask;
762762
763 ccsSetButton (s, value, TRUE);763 ccsSetButton (s, value, FALSE);
764 }764 }
765}765}
766766
767767
=== modified file 'src/gsettings.c'
--- src/gsettings.c 2012-01-21 21:23:24 +0000
+++ src/gsettings.c 2012-01-21 21:23:24 +0000
@@ -557,7 +557,7 @@
557 value = g_variant_get_string (gsettingsValue, NULL);557 value = g_variant_get_string (gsettingsValue, NULL);
558 if (value)558 if (value)
559 {559 {
560 ccsSetString (setting, value, TRUE);560 ccsSetString (setting, value, SetTemporary);
561 ret = TRUE;561 ret = TRUE;
562 }562 }
563 }563 }
@@ -568,7 +568,7 @@
568 value = g_variant_get_string (gsettingsValue, NULL);568 value = g_variant_get_string (gsettingsValue, NULL);
569 if (value)569 if (value)
570 {570 {
571 ccsSetMatch (setting, value, TRUE);571 ccsSetMatch (setting, value, SetTemporary);
572 ret = TRUE;572 ret = TRUE;
573 }573 }
574 }574 }
@@ -578,7 +578,7 @@
578 int value;578 int value;
579 value = g_variant_get_int32 (gsettingsValue);579 value = g_variant_get_int32 (gsettingsValue);
580580
581 ccsSetInt (setting, value, TRUE);581 ccsSetInt (setting, value, SetTemporary);
582 ret = TRUE;582 ret = TRUE;
583 }583 }
584 break;584 break;
@@ -587,7 +587,7 @@
587 gboolean value;587 gboolean value;
588 value = g_variant_get_boolean (gsettingsValue);588 value = g_variant_get_boolean (gsettingsValue);
589589
590 ccsSetBool (setting, value ? TRUE : FALSE, TRUE);590 ccsSetBool (setting, value ? TRUE : FALSE, SetTemporary);
591 ret = TRUE;591 ret = TRUE;
592 }592 }
593 break;593 break;
@@ -596,7 +596,7 @@
596 double value;596 double value;
597 value = g_variant_get_double (gsettingsValue);597 value = g_variant_get_double (gsettingsValue);
598598
599 ccsSetFloat (setting, (float)value, TRUE);599 ccsSetFloat (setting, (float)value, SetTemporary);
600 ret = TRUE;600 ret = TRUE;
601 }601 }
602 break;602 break;
@@ -608,7 +608,7 @@
608608
609 if (value && ccsStringToColor (value, &color))609 if (value && ccsStringToColor (value, &color))
610 {610 {
611 ccsSetColor (setting, color, TRUE);611 ccsSetColor (setting, color, SetTemporary);
612 ret = TRUE;612 ret = TRUE;
613 }613 }
614 }614 }
@@ -621,7 +621,7 @@
621621
622 if (value && ccsStringToKeyBinding (value, &key))622 if (value && ccsStringToKeyBinding (value, &key))
623 {623 {
624 ccsSetKey (setting, key, TRUE);624 ccsSetKey (setting, key, SetTemporary);
625 ret = TRUE;625 ret = TRUE;
626 }626 }
627 }627 }
@@ -634,7 +634,7 @@
634634
635 if (value && ccsStringToButtonBinding (value, &button))635 if (value && ccsStringToButtonBinding (value, &button))
636 {636 {
637 ccsSetButton (setting, button, TRUE);637 ccsSetButton (setting, button, SetTemporary);
638 ret = TRUE;638 ret = TRUE;
639 }639 }
640 }640 }
@@ -648,7 +648,7 @@
648 {648 {
649 unsigned int edges;649 unsigned int edges;
650 edges = ccsStringToEdges (value);650 edges = ccsStringToEdges (value);
651 ccsSetEdge (setting, edges, TRUE);651 ccsSetEdge (setting, edges, SetTemporary);
652 ret = TRUE;652 ret = TRUE;
653 }653 }
654 }654 }
@@ -658,7 +658,7 @@
658 gboolean value;658 gboolean value;
659 value = g_variant_get_boolean (gsettingsValue);659 value = g_variant_get_boolean (gsettingsValue);
660660
661 ccsSetBell (setting, value ? TRUE : FALSE, TRUE);661 ccsSetBell (setting, value ? TRUE : FALSE, SetTemporary);
662 ret = TRUE;662 ret = TRUE;
663 }663 }
664 break;664 break;

Subscribers

People subscribed via source and target branches