summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--battstat/power-management.c3
-rw-r--r--cpufreq/src/cpufreq-applet.c3
-rw-r--r--cpufreq/src/cpufreq-monitor-cpuinfo.c2
-rw-r--r--cpufreq/src/cpufreq-monitor-libcpufreq.c2
-rw-r--r--cpufreq/src/cpufreq-monitor-procfs.c2
-rw-r--r--cpufreq/src/cpufreq-monitor-sysfs.c2
-rw-r--r--cpufreq/src/cpufreq-monitor.c2
-rw-r--r--cpufreq/src/cpufreq-popup.c2
-rw-r--r--cpufreq/src/cpufreq-prefs.c2
-rw-r--r--cpufreq/src/cpufreq-selector/cpufreq-selector-libcpufreq.c3
-rw-r--r--cpufreq/src/cpufreq-selector/cpufreq-selector-procfs.c3
-rw-r--r--cpufreq/src/cpufreq-selector/cpufreq-selector-sysfs.c2
-rw-r--r--cpufreq/src/cpufreq-selector/cpufreq-selector.c3
-rw-r--r--drivemount/drive-button.c3
-rw-r--r--drivemount/drive-button.h2
15 files changed, 4 insertions, 32 deletions
diff --git a/battstat/power-management.c b/battstat/power-management.c
index 2b6d35a0..de3ffe09 100644
--- a/battstat/power-management.c
+++ b/battstat/power-management.c
@@ -292,9 +292,6 @@ static int acpi_count;
static int acpiwatch;
static struct apm_info apminfo;
-/* Declared in acpi-linux.c */
-gboolean acpi_linux_read(struct apm_info *apminfo, struct acpi_info *acpiinfo);
-
static gboolean acpi_callback (GIOChannel * chan, GIOCondition cond, gpointer data)
{
if (cond & (G_IO_ERR | G_IO_HUP)) {
diff --git a/cpufreq/src/cpufreq-applet.c b/cpufreq/src/cpufreq-applet.c
index 7dc93efe..8ae208c3 100644
--- a/cpufreq/src/cpufreq-applet.c
+++ b/cpufreq/src/cpufreq-applet.c
@@ -74,9 +74,6 @@ struct _CPUFreqAppletClass {
MatePanelAppletClass parent_class;
};
-static void cpufreq_applet_init (CPUFreqApplet *applet);
-static void cpufreq_applet_class_init (CPUFreqAppletClass *klass);
-
static void cpufreq_applet_preferences_cb (GtkAction *action,
CPUFreqApplet *applet);
static void cpufreq_applet_help_cb (GtkAction *action,
diff --git a/cpufreq/src/cpufreq-monitor-cpuinfo.c b/cpufreq/src/cpufreq-monitor-cpuinfo.c
index 6f1f9535..b1891072 100644
--- a/cpufreq/src/cpufreq-monitor-cpuinfo.c
+++ b/cpufreq/src/cpufreq-monitor-cpuinfo.c
@@ -32,8 +32,6 @@
#include "cpufreq-monitor-cpuinfo.h"
#include "cpufreq-utils.h"
-static void cpufreq_monitor_cpuinfo_class_init (CPUFreqMonitorCPUInfoClass *klass);
-
static gboolean cpufreq_monitor_cpuinfo_run (CPUFreqMonitor *monitor);
G_DEFINE_TYPE (CPUFreqMonitorCPUInfo, cpufreq_monitor_cpuinfo, CPUFREQ_TYPE_MONITOR)
diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
index dd2722ba..28de798c 100644
--- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
+++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
@@ -31,8 +31,6 @@
#include "cpufreq-monitor-libcpufreq.h"
#include "cpufreq-utils.h"
-static void cpufreq_monitor_libcpufreq_class_init (CPUFreqMonitorLibcpufreqClass *klass);
-
static gboolean cpufreq_monitor_libcpufreq_run (CPUFreqMonitor *monitor);
static GList *cpufreq_monitor_libcpufreq_get_available_frequencies (CPUFreqMonitor *monitor);
static GList *cpufreq_monitor_libcpufreq_get_available_governors (CPUFreqMonitor *monitor);
diff --git a/cpufreq/src/cpufreq-monitor-procfs.c b/cpufreq/src/cpufreq-monitor-procfs.c
index ab2e3426..f43da9dc 100644
--- a/cpufreq/src/cpufreq-monitor-procfs.c
+++ b/cpufreq/src/cpufreq-monitor-procfs.c
@@ -29,8 +29,6 @@
#include "cpufreq-monitor-procfs.h"
#include "cpufreq-utils.h"
-static void cpufreq_monitor_procfs_class_init (CPUFreqMonitorProcfsClass *klass);
-
static gboolean cpufreq_monitor_procfs_run (CPUFreqMonitor *monitor);
static GList *cpufreq_monitor_procfs_get_available_frequencies (CPUFreqMonitor *monitor);
diff --git a/cpufreq/src/cpufreq-monitor-sysfs.c b/cpufreq/src/cpufreq-monitor-sysfs.c
index 19a29474..7893745c 100644
--- a/cpufreq/src/cpufreq-monitor-sysfs.c
+++ b/cpufreq/src/cpufreq-monitor-sysfs.c
@@ -38,8 +38,6 @@ enum {
N_FILES
};
-static void cpufreq_monitor_sysfs_class_init (CPUFreqMonitorSysfsClass *klass);
-
static gboolean cpufreq_monitor_sysfs_run (CPUFreqMonitor *monitor);
static GList *cpufreq_monitor_sysfs_get_available_frequencies (CPUFreqMonitor *monitor);
static GList *cpufreq_monitor_sysfs_get_available_governors (CPUFreqMonitor *monitor);
diff --git a/cpufreq/src/cpufreq-monitor.c b/cpufreq/src/cpufreq-monitor.c
index 0f5f116d..451ffd9f 100644
--- a/cpufreq/src/cpufreq-monitor.c
+++ b/cpufreq/src/cpufreq-monitor.c
@@ -52,8 +52,6 @@ struct _CPUFreqMonitorPrivate {
gboolean changed;
};
-static void cpufreq_monitor_init (CPUFreqMonitor *monitor);
-static void cpufreq_monitor_class_init (CPUFreqMonitorClass *klass);
static void cpufreq_monitor_finalize (GObject *object);
static void cpufreq_monitor_set_property (GObject *object,
diff --git a/cpufreq/src/cpufreq-popup.c b/cpufreq/src/cpufreq-popup.c
index 805cbd4e..4a0d6025 100644
--- a/cpufreq/src/cpufreq-popup.c
+++ b/cpufreq/src/cpufreq-popup.c
@@ -48,8 +48,6 @@ struct _CPUFreqPopupPrivate {
GtkWidget *parent;
};
-static void cpufreq_popup_init (CPUFreqPopup *popup);
-static void cpufreq_popup_class_init (CPUFreqPopupClass *klass);
static void cpufreq_popup_finalize (GObject *object);
G_DEFINE_TYPE_WITH_PRIVATE (CPUFreqPopup, cpufreq_popup, G_TYPE_OBJECT)
diff --git a/cpufreq/src/cpufreq-prefs.c b/cpufreq/src/cpufreq-prefs.c
index 8ccaa17f..dfa6128a 100644
--- a/cpufreq/src/cpufreq-prefs.c
+++ b/cpufreq/src/cpufreq-prefs.c
@@ -54,8 +54,6 @@ struct _CPUFreqPrefsPrivate {
GtkWidget *show_mode_combo;
};
-static void cpufreq_prefs_init (CPUFreqPrefs *prefs);
-static void cpufreq_prefs_class_init (CPUFreqPrefsClass *klass);
static void cpufreq_prefs_finalize (GObject *object);
static void cpufreq_prefs_set_property (GObject *object,
diff --git a/cpufreq/src/cpufreq-selector/cpufreq-selector-libcpufreq.c b/cpufreq/src/cpufreq-selector/cpufreq-selector-libcpufreq.c
index d56364b5..36ab100f 100644
--- a/cpufreq/src/cpufreq-selector/cpufreq-selector-libcpufreq.c
+++ b/cpufreq/src/cpufreq-selector/cpufreq-selector-libcpufreq.c
@@ -31,9 +31,6 @@
#include "cpufreq-selector-libcpufreq.h"
-static void cpufreq_selector_libcpufreq_init (CPUFreqSelectorLibcpufreq *selector);
-static void cpufreq_selector_libcpufreq_class_init (CPUFreqSelectorLibcpufreqClass *klass);
-
static gboolean cpufreq_selector_libcpufreq_set_frequency (CPUFreqSelector *selector,
guint frequency,
GError **error);
diff --git a/cpufreq/src/cpufreq-selector/cpufreq-selector-procfs.c b/cpufreq/src/cpufreq-selector/cpufreq-selector-procfs.c
index 69ecaf77..4a2c36f0 100644
--- a/cpufreq/src/cpufreq-selector/cpufreq-selector-procfs.c
+++ b/cpufreq/src/cpufreq-selector/cpufreq-selector-procfs.c
@@ -27,9 +27,6 @@
#include "cpufreq-selector-procfs.h"
-static void cpufreq_selector_procfs_init (CPUFreqSelectorProcfs *selector);
-static void cpufreq_selector_procfs_class_init (CPUFreqSelectorProcfsClass *klass);
-
static gboolean cpufreq_selector_procfs_set_frequency (CPUFreqSelector *selector,
guint frequency,
GError **error);
diff --git a/cpufreq/src/cpufreq-selector/cpufreq-selector-sysfs.c b/cpufreq/src/cpufreq-selector/cpufreq-selector-sysfs.c
index c1b0850c..0ddb5334 100644
--- a/cpufreq/src/cpufreq-selector/cpufreq-selector-sysfs.c
+++ b/cpufreq/src/cpufreq-selector/cpufreq-selector-sysfs.c
@@ -31,8 +31,6 @@ struct _CPUFreqSelectorSysfsPrivate {
GList *available_govs;
};
-static void cpufreq_selector_sysfs_init (CPUFreqSelectorSysfs *selector);
-static void cpufreq_selector_sysfs_class_init (CPUFreqSelectorSysfsClass *klass);
static void cpufreq_selector_sysfs_finalize (GObject *object);
static gboolean cpufreq_selector_sysfs_set_frequency (CPUFreqSelector *selector,
diff --git a/cpufreq/src/cpufreq-selector/cpufreq-selector.c b/cpufreq/src/cpufreq-selector/cpufreq-selector.c
index 7f10c773..1e9ea8ad 100644
--- a/cpufreq/src/cpufreq-selector/cpufreq-selector.c
+++ b/cpufreq/src/cpufreq-selector/cpufreq-selector.c
@@ -31,9 +31,6 @@ struct _CPUFreqSelectorPrivate {
guint cpu;
};
-static void cpufreq_selector_init (CPUFreqSelector *selector);
-static void cpufreq_selector_class_init (CPUFreqSelectorClass *klass);
-
static void cpufreq_selector_set_property (GObject *object,
guint prop_id,
const GValue *value,
diff --git a/drivemount/drive-button.c b/drivemount/drive-button.c
index 2d91c4de..dd135384 100644
--- a/drivemount/drive-button.c
+++ b/drivemount/drive-button.c
@@ -400,11 +400,14 @@ drive_button_update (gpointer user_data)
pixels = cairo_image_surface_get_data (tmp_surface);
GdkRGBA color;
+ GSettings *settings;
+ settings = g_settings_new ("org.mate.drivemount");
gchar *color_string = g_settings_get_string (settings, "drivemount-checkmark-color");
if (!color_string)
color_string = g_strdup ("#00ff00");
gdk_rgba_parse (&color, color_string);
g_free (color_string);
+ g_object_unref (settings);
guchar red = color.red*255;
guchar green = color.green*255;
diff --git a/drivemount/drive-button.h b/drivemount/drive-button.h
index 8974f7bf..010e65a0 100644
--- a/drivemount/drive-button.h
+++ b/drivemount/drive-button.h
@@ -63,7 +63,7 @@ void drive_button_set_size (DriveButton *button,
int drive_button_compare (DriveButton *button,
DriveButton *other_button);
-GSettings *settings;
+
void drive_button_redraw (gpointer key, gpointer value, gpointer user_data);
G_END_DECLS
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-22 08:43:49 +0000