← Back to branch summary

~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/3.0.0.0rc1

« back to all changes in this revision

Viewing changes to alsaMixer/src/applet-config.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:
alsaMixer/src/applet-config.c
22
22
#include <cairo-dock.h>
23
23
 
24
24
#include "applet-struct.h"
25
 
#include "applet-mixer.h"
 
25
#include "applet-backend-alsamixer.h"  // mixer_get_elements_list
26
26
#include "applet-notifications.h"
27
27
#include "applet-config.h"
28
28
 
77
77
        g_free (myConfig.cMixerElementName);
78
78
        g_free (myConfig.cMixerElementName2);
79
79
        g_free (myConfig.cShowAdvancedMixerCommand);
80
 
        if (myConfig.cShortcut)
81
 
                cd_keybinder_unbind(myConfig.cShortcut, (CDBindkeyHandler) mixer_on_keybinding_pull);
82
80
        g_free (myConfig.cShortcut);
83
81
        g_free (myConfig.cDefaultIcon);
84
82
        g_free (myConfig.cBrokenIcon);
93
91
                gtk_widget_destroy (myData.pScale);
94
92
                myData.pScale = NULL;
95
93
        }
96
 
        mixer_stop ();
97
94
        cairo_surface_destroy (myData.pSurface);
98
95
        if (myData.pMuteSurface)
99
96
                cairo_surface_destroy (myData.pMuteSurface);
100
97
        cairo_dock_dialog_unreference (myData.pDialog);
101
 
        g_free (myData.cErrorMessage);
102
 
        g_free (myData.mixer_card_name);
103
 
        g_free (myData.mixer_device_name);
104
98
CD_APPLET_RESET_DATA_END
105
99
 
106
100