← Back to branch summary

~ubuntu-branches/ubuntu/saucy/compiz/saucy-proposed

« back to all changes in this revision

Viewing changes to compizconfig/integration/gnome/src/ccs_gnome_integration.c

  • Committer: Package Import Robot
  • Author(s): Automatic PS uploader, Brandon Schaefer, Sam Spilsbury, Automatic PS uploader
  • Date: 2013-01-21 04:01:41 UTC
  • mfrom: (3248.176.3)
  • Revision ID: package-import@ubuntu.com-20130121040141-4gvyct89sywzgsqq
Tags: 1:0.9.9~daily13.01.21-0ubuntu1
https://launchpad.net/bugs/689792
https://launchpad.net/bugs/1100539
https://launchpad.net/bugs/1096455
[ Brandon Schaefer ]
* Window Management - Implement maximize and semi-maximise transitions
  (LP: #689792)

[ Sam Spilsbury ]
* Several memory leaks in ccsIntegratedSettingListAppend() from
  ccsIntegratedSettingsStorageDefaultFindMatchingSettingsByPredicate()
  from
  ccsIntegratedSettingsStorageDefaultFindMatchingSettingsByPluginAndSe
  ttingName() (LP: #1100539)
* Several leaks in g_settings_new() [g_object_new()] from
  ccsGSettingsNewNoPath() [ccs_gsettings_interface_wrapper.c:184] (LP:
  #1097649)
* Compiz reports incorrect _NET_DESKTOP_GEOMETRY until first viewport
  switch (LP: #1096455)

[ Automatic PS uploader ]
* Automatic snapshot from revision 3569

Show diffs side-by-side

added added

removed removed

Lines of Context:
compizconfig/integration/gnome/src/ccs_gnome_integration.c
325
325
                memset (&button, 0, sizeof (CCSSettingButtonValue));
326
326
                ccsGetButton (setting, &button);
327
327
 
328
 
                CCSIntegratedSettingList integratedSettingsMBM = ccsIntegratedSettingsStorageFindMatchingSettingsByPluginAndSettingName (priv->storage,
329
 
                                                                                                                ccsGNOMEIntegratedPluginNames.SPECIAL,
330
 
                                                                                                                ccsGNOMEIntegratedSettingNames.NULL_MOUSE_BUTTON_MODIFIER.compizName);
331
 
 
332
 
                button.buttonModMask = getGnomeMouseButtonModifier (integratedSettingsMBM->data);
333
 
 
334
 
                CCSIntegratedSettingList integratedSettings = ccsIntegratedSettingsStorageFindMatchingSettingsByPluginAndSettingName (priv->storage,
335
 
                                                                                                                ccsGNOMEIntegratedPluginNames.SPECIAL,
336
 
                                                                                                                ccsGNOMEIntegratedSettingNames.NULL_RESIZE_WITH_RIGHT_BUTTON.compizName);
 
328
                CCSIntegratedSettingList mouseModifierSetting =
 
329
                    ccsIntegratedSettingsStorageFindMatchingSettingsByPluginAndSettingName (priv->storage,
 
330
                                                                                            ccsGNOMEIntegratedPluginNames.SPECIAL,
 
331
                                                                                            ccsGNOMEIntegratedSettingNames.NULL_MOUSE_BUTTON_MODIFIER.compizName);
 
332
 
 
333
                button.buttonModMask = getGnomeMouseButtonModifier (mouseModifierSetting->data);
 
334
 
 
335
                CCSIntegratedSettingList resizeButtonSetting =
 
336
                    ccsIntegratedSettingsStorageFindMatchingSettingsByPluginAndSettingName (priv->storage,
 
337
                                                                                            ccsGNOMEIntegratedPluginNames.SPECIAL,
 
338
                                                                                            ccsGNOMEIntegratedSettingNames.NULL_RESIZE_WITH_RIGHT_BUTTON.compizName);
337
339
 
338
340
                type = TypeBool;
339
 
                v = ccsIntegratedSettingReadValue (integratedSettings->data, type);
 
341
                v = ccsIntegratedSettingReadValue (resizeButtonSetting->data, type);
340
342
 
341
343
                resizeWithRightButton =
342
344
                   v->value.asBool;
350
352
 
351
353
                ccsSetButton (setting, button, TRUE);
352
354
                ret = TRUE;
 
355
 
 
356
                /* Free the returned lists */
 
357
                ccsIntegratedSettingListFree (mouseModifierSetting, FALSE);
 
358
                ccsIntegratedSettingListFree (resizeButtonSetting, FALSE);
353
359
            }
354
360
 
355
361
        }
562
568
                     resizeWithRightButton = TRUE;
563
569
                }
564
570
 
565
 
                CCSIntegratedSettingList integratedSettings = ccsIntegratedSettingsStorageFindMatchingSettingsByPluginAndSettingName (priv->storage,
566
 
                                                                                                                ccsGNOMEIntegratedPluginNames.SPECIAL,
567
 
                                                                                                                ccsGNOMEIntegratedSettingNames.NULL_RESIZE_WITH_RIGHT_BUTTON.compizName);
 
571
                CCSIntegratedSettingList resizeButtonSetting =
 
572
                    ccsIntegratedSettingsStorageFindMatchingSettingsByPluginAndSettingName (priv->storage,
 
573
                                                                                            ccsGNOMEIntegratedPluginNames.SPECIAL,
 
574
                                                                                            ccsGNOMEIntegratedSettingNames.NULL_RESIZE_WITH_RIGHT_BUTTON.compizName);
568
575
 
569
576
                newValue->value.asBool = resizeWithRightButton;
570
577
                type = TypeBool;
571
578
 
572
 
                ccsIntegratedSettingWriteValue (integratedSettings->data, newValue, type);
 
579
                ccsIntegratedSettingWriteValue (resizeButtonSetting->data, newValue, type);
573
580
 
574
 
                CCSIntegratedSettingList integratedSettingsMBM = ccsIntegratedSettingsStorageFindMatchingSettingsByPluginAndSettingName (priv->storage,
575
 
                                                                                                                ccsGNOMEIntegratedPluginNames.SPECIAL,
576
 
                                                                                                                ccsGNOMEIntegratedSettingNames.NULL_MOUSE_BUTTON_MODIFIER.compizName);
 
581
                CCSIntegratedSettingList mouseModifierSetting =
 
582
                    ccsIntegratedSettingsStorageFindMatchingSettingsByPluginAndSettingName (priv->storage,
 
583
                                                                                            ccsGNOMEIntegratedPluginNames.SPECIAL,
 
584
                                                                                            ccsGNOMEIntegratedSettingNames.NULL_MOUSE_BUTTON_MODIFIER.compizName);
577
585
 
578
586
                modMask = v->value.asButton.buttonModMask;
579
 
                if (setGnomeMouseButtonModifier (integratedSettingsMBM->data, modMask))
 
587
                if (setGnomeMouseButtonModifier (mouseModifierSetting->data, modMask))
580
588
                {
581
589
                    setButtonBindingForSetting (priv->context, "move",
582
590
                                                "initiate_button", 1, modMask);
589
597
                                                resizeWithRightButton ? 2 : 3,
590
598
                                                modMask);
591
599
                }
 
600
 
 
601
                /* We own the returned lists, so free them */
 
602
                ccsIntegratedSettingListFree (resizeButtonSetting, FALSE);
 
603
                ccsIntegratedSettingListFree (mouseModifierSetting, FALSE);
592
604
            }
593
605
 
594
606
            if (newValue)