summaryrefslogtreecommitdiff
path: root/libmatemixer/matemixer.c
diff options
context:
space:
mode:
authorMichal Ratajsky <[email protected]>2014-06-07 01:07:02 +0200
committerMichal Ratajsky <[email protected]>2014-06-07 01:07:02 +0200
commitd2c3a4be634018a2b63f4c80a26f9024a0d3de47 (patch)
treef0f8128aa2e914de6c1449bf5ef999dfebbc9767 /libmatemixer/matemixer.c
parent9b4cafb0b47c6ec453d301bd812ae7001955dc2a (diff)
downloadlibmatemixer-d2c3a4be634018a2b63f4c80a26f9024a0d3de47.tar.bz2
libmatemixer-d2c3a4be634018a2b63f4c80a26f9024a0d3de47.tar.xz
Weekly update
Diffstat (limited to 'libmatemixer/matemixer.c')
-rw-r--r--libmatemixer/matemixer.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/libmatemixer/matemixer.c b/libmatemixer/matemixer.c
index cc4b5f1..3c8f643 100644
--- a/libmatemixer/matemixer.c
+++ b/libmatemixer/matemixer.c
@@ -55,11 +55,8 @@ mate_mixer_init (void)
}
if (mixer_modules) {
- /* Sort the usable modules by the priority */
- mixer_modules = g_list_sort (
- mixer_modules,
- mixer_compare_modules);
-
+ /* Sort the usable modules by their priority */
+ mixer_modules = g_list_sort (mixer_modules, mixer_compare_modules);
mixer_initialized = TRUE;
} else
g_critical ("No usable backend modules have been found");
@@ -85,11 +82,11 @@ mate_mixer_deinit (void)
mixer_initialized = FALSE;
}
-/* Internal function: return a shared list of loaded backend modules */
-GList *
+/* Internal function: return a list of loaded backend modules */
+const GList *
mate_mixer_get_modules (void)
{
- return mixer_modules;
+ return (const GList *) mixer_modules;
}
/* Internal function: return TRUE if the library has been initialized */
@@ -124,10 +121,8 @@ mixer_load_modules (void)
continue;
file = g_build_filename (LIBMATEMIXER_BACKEND_DIR, name, NULL);
- mixer_modules = g_list_prepend (
- mixer_modules,
- mate_mixer_backend_module_new (file));
-
+ mixer_modules = g_list_prepend (mixer_modules,
+ mate_mixer_backend_module_new (file));
g_free (file);
}
@@ -151,7 +146,7 @@ mixer_load_modules (void)
static gint
mixer_compare_modules (gconstpointer a, gconstpointer b)
{
- const MateMixerBackendModuleInfo *info1, *info2;
+ const MateMixerBackendInfo *info1, *info2;
info1 = mate_mixer_backend_module_get_info (MATE_MIXER_BACKEND_MODULE (a));
info2 = mate_mixer_backend_module_get_info (MATE_MIXER_BACKEND_MODULE (b));