← Back to branch summary

~cairo-dock-team/ubuntu/quantal/cairo-dock-plug-ins/3.1.0

« back to all changes in this revision

Viewing changes to Xgamma/src/applet-init.c

  • Committer: Package Import Robot
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2012-02-16 01:45:57 UTC
  • mfrom: (1.1.18)
  • Revision ID: package-import@ubuntu.com-20120216014557-iah0bv0lfwth6sxx
Tags: 3.0.0.0beta1-0ubuntu1
https://launchpad.net/bugs/932042
* New upstream release. (LP: #932042)
* Upstream (short) ChangeLog:
 - The Log out applet has been rewritten, now allows one to switch users.
 - Many shortkeys have been added in different applets
 - The Sound Menu from Ubuntu has been integrated into the
    Sound-Control applet.
 - The Sound Menu from Ubuntu has been integrated into the
    Sound-Control applet.
 - Cairo-Dock now uses GTK3, for a better integration in a Gnome desktop
 - Few additions to the DBus API.
 - (...)
* debian/patches:
 - Removed all previous patches (now in upstream)
* debian/rules and debian/control:
 - Added multiarch support
* debian/control:
 - Updated build-depends list (needed for MultiArch support and GTK3)
 - libgtkglext1-dev is no longer needed
    (replaced by libgl, libglu and libpango)
 - Removed old Gnome dependences: libgnomevfs2-dev, libgnomeui-dev
    and libgnome-keyring-dev
 - libfftw3-dev is no longer needed
 - Increased the version of Cairo-Dock packages
 - Separated DBus interfaces from cairo-dock-plug-ins package into
    cairo-dock-plug-ins-dbus-interface-* packages in order to add right
    dependences.
 - cairo-dock-plug-ins: cairo-dock-plug-ins-dbus-interface-python
    has been added.
* debian/rules:
 - Added -Denable-global-menu=yes (supported in Ubuntu)
* debian/cairo-dock-plug-ins.install
   and debian/cairo-dock-plug-ins-integration.install: MultiArch is
   now supported
* debian/cairo-dock-plug-ins.install,
   debian/cairo-dock-plug-ins-data.install,
   debian/cairo-dock-plug-ins-dbus-interface-vala.install,
   debian/cairo-dock-plug-ins-dbus-interface-ruby.install,
   debian/cairo-dock-plug-ins-dbus-interface-python.install and
   debian/cairo-dock-plug-ins-dbus-interface-mono.install:
    DBus interfaces from cairo-dock-plug-ins have been separated into
    cairo-dock-plug-ins-dbus-interface-* pacakges
* Updated debian/watch
* debian/compat
 - Debhelper 8 is now used

Show diffs side-by-side

added added

removed removed

Lines of Context:
Xgamma/src/applet-init.c
25
25
#include <X11/extensions/xf86vmode.h>
26
26
#include <ctype.h>
27
27
#include <stdlib.h>
 
28
#include <gdk/gdkx.h>
28
29
 
29
30
#include <cairo-dock.h>
30
31
 
58
59
        CD_APPLET_REGISTER_FOR_MIDDLE_CLICK_EVENT;
59
60
        CD_APPLET_REGISTER_FOR_SCROLL_EVENT;
60
61
        
 
62
        // shortkey
 
63
        myData.pKeyBinding = CD_APPLET_BIND_KEY (myConfig.cShortkey,
 
64
                D_("Increase the brightness"),
 
65
                "Configuration", "shortkey",
 
66
                (CDBindkeyHandler) cd_xgamma_on_keybinding_pull);
 
67
        myData.pKeyBinding2 = CD_APPLET_BIND_KEY (myConfig.cShortkey2,
 
68
                D_("Decrease the brightness"),
 
69
                "Configuration", "shortkey",
 
70
                (CDBindkeyHandler) cd_xgamma_on_keybinding_pull2);
 
71
        
61
72
        if (! s_bVideoExtensionChecked)
62
73
        {
63
74
                s_bVideoExtensionChecked = TRUE;
124
135
        CD_APPLET_UNREGISTER_FOR_MIDDLE_CLICK_EVENT;
125
136
        CD_APPLET_UNREGISTER_FOR_SCROLL_EVENT;
126
137
        
 
138
        cd_keybinder_unbind (myData.pKeyBinding);
 
139
        cd_keybinder_unbind (myData.pKeyBinding2);
 
140
        
127
141
        if (myData.iSidScrollAction != 0)
128
142
                g_source_remove (myData.iSidScrollAction);
129
143
CD_APPLET_STOP_END
162
176
                        double fGamma = xgamma_get_gamma (&myData.Xgamma);
163
177
                        cd_gamma_display_gamma_on_label (fGamma);
164
178
                }
 
179
                
 
180
                cd_keybinder_rebind (myData.pKeyBinding, myConfig.cShortkey, NULL);
 
181
                cd_keybinder_rebind (myData.pKeyBinding2, myConfig.cShortkey2, NULL);
165
182
        }
166
183
        
167
184
        if (myDock)