[gnome-applets] cpufreq: use G_DECLARE_FINAL_TYPE
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-applets] cpufreq: use G_DECLARE_FINAL_TYPE
- Date: Fri, 3 Apr 2020 20:15:42 +0000 (UTC)
commit 058f395adc38c9e8821c92e18eb1a460bad07752
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Fri Apr 3 22:31:52 2020 +0300
cpufreq: use G_DECLARE_FINAL_TYPE
gnome-applets/cpufreq/cpufreq-popup.c | 182 +++++++++++++--------------------
gnome-applets/cpufreq/cpufreq-popup.h | 23 +----
gnome-applets/cpufreq/cpufreq-prefs.c | 184 ++++++++++++++++------------------
gnome-applets/cpufreq/cpufreq-prefs.h | 24 +----
4 files changed, 157 insertions(+), 256 deletions(-)
---
diff --git a/gnome-applets/cpufreq/cpufreq-popup.c b/gnome-applets/cpufreq/cpufreq-popup.c
index 440d39c18..f20bdbc70 100644
--- a/gnome-applets/cpufreq/cpufreq-popup.c
+++ b/gnome-applets/cpufreq/cpufreq-popup.c
@@ -31,7 +31,10 @@
#include "cpufreq-selector-gen.h"
#include "cpufreq-utils.h"
-struct _CPUFreqPopupPrivate {
+struct _CPUFreqPopup
+{
+ GObject parent;
+
CPUFreqSelectorGen *selector;
GtkUIManager *ui_manager;
@@ -50,9 +53,6 @@ struct _CPUFreqPopupPrivate {
CPUFreqMonitor *monitor;
};
-#define CPUFREQ_POPUP_GET_PRIVATE(object) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((object), CPUFREQ_TYPE_POPUP, CPUFreqPopupPrivate))
-
static void cpufreq_popup_finalize (GObject *object);
G_DEFINE_TYPE (CPUFreqPopup, cpufreq_popup, G_TYPE_OBJECT)
@@ -111,38 +111,24 @@ cpufreq_popup_init (CPUFreqPopup *popup)
{
GError *error;
- popup->priv = CPUFREQ_POPUP_GET_PRIVATE (popup);
-
error = NULL;
- popup->priv->selector = cpufreq_selector_gen_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
- G_DBUS_PROXY_FLAGS_NONE,
- "org.gnome.CPUFreqSelector",
-
"/org/gnome/cpufreq_selector/selector",
- NULL,
- &error);
+ popup->selector = cpufreq_selector_gen_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+ G_DBUS_PROXY_FLAGS_NONE,
+ "org.gnome.CPUFreqSelector",
+ "/org/gnome/cpufreq_selector/selector",
+ NULL,
+ &error);
if (error != NULL) {
g_warning ("%s", error->message);
g_error_free (error);
}
- popup->priv->ui_manager = gtk_ui_manager_new ();
- popup->priv->radio_group = NULL;
-
- popup->priv->freqs_group = NULL;
- popup->priv->freqs_actions = NULL;
-
- popup->priv->govs_group = NULL;
- popup->priv->govs_actions = NULL;
+ popup->ui_manager = gtk_ui_manager_new ();
+ popup->need_build = TRUE;
- popup->priv->merge_id = 0;
- popup->priv->need_build = TRUE;
- popup->priv->show_freqs = FALSE;
-
- gtk_ui_manager_add_ui_from_string (popup->priv->ui_manager,
+ gtk_ui_manager_add_ui_from_string (popup->ui_manager,
ui_popup, -1, NULL);
-
- popup->priv->monitor = NULL;
}
static void
@@ -150,8 +136,6 @@ cpufreq_popup_class_init (CPUFreqPopupClass *klass)
{
GObjectClass *g_object_class = G_OBJECT_CLASS (klass);
- g_type_class_add_private (g_object_class, sizeof (CPUFreqPopupPrivate));
-
g_object_class->finalize = cpufreq_popup_finalize;
}
@@ -160,38 +144,15 @@ cpufreq_popup_finalize (GObject *object)
{
CPUFreqPopup *popup = CPUFREQ_POPUP (object);
- g_clear_object (&popup->priv->selector);
-
- if (popup->priv->ui_manager) {
- g_object_unref (popup->priv->ui_manager);
- popup->priv->ui_manager = NULL;
- }
-
- if (popup->priv->freqs_group) {
- g_object_unref (popup->priv->freqs_group);
- popup->priv->freqs_group = NULL;
- }
-
- if (popup->priv->freqs_actions) {
- g_slist_free (popup->priv->freqs_actions);
- popup->priv->freqs_actions = NULL;
- }
+ g_clear_object (&popup->selector);
+ g_clear_object (&popup->ui_manager);
+ g_clear_object (&popup->freqs_group);
+ g_clear_object (&popup->govs_group);
+ g_clear_object (&popup->monitor);
- if (popup->priv->govs_group) {
- g_object_unref (popup->priv->govs_group);
- popup->priv->govs_group = NULL;
- }
+ g_clear_pointer (&popup->freqs_actions, g_slist_free);
+ g_clear_pointer (&popup->govs_actions, g_slist_free);
- if (popup->priv->govs_actions) {
- g_slist_free (popup->priv->govs_actions);
- popup->priv->govs_actions = NULL;
- }
-
- if (popup->priv->monitor) {
- g_object_unref (popup->priv->monitor);
- popup->priv->monitor = NULL;
- }
-
G_OBJECT_CLASS (cpufreq_popup_parent_class)->finalize (object);
}
@@ -214,12 +175,12 @@ cpufreq_popup_set_monitor (CPUFreqPopup *popup,
g_return_if_fail (CPUFREQ_IS_POPUP (popup));
g_return_if_fail (CPUFREQ_IS_MONITOR (monitor));
- if (popup->priv->monitor == monitor)
+ if (popup->monitor == monitor)
return;
- if (popup->priv->monitor)
- g_object_unref (popup->priv->monitor);
- popup->priv->monitor = g_object_ref (monitor);
+ if (popup->monitor)
+ g_object_unref (popup->monitor);
+ popup->monitor = g_object_ref (monitor);
}
static void
@@ -233,14 +194,14 @@ cpufreq_popup_frequencies_menu_activate (GtkAction *action,
if (!gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
return;
- if (popup->priv->selector == NULL)
+ if (popup->selector == NULL)
return;
- cpu = cpufreq_monitor_get_cpu (popup->priv->monitor);
+ cpu = cpufreq_monitor_get_cpu (popup->monitor);
name = gtk_action_get_name (action);
freq = (guint) atoi (name + strlen ("Frequency"));
- cpufreq_selector_gen_call_set_frequency (popup->priv->selector,
+ cpufreq_selector_gen_call_set_frequency (popup->selector,
cpu,
freq,
NULL,
@@ -259,14 +220,14 @@ cpufreq_popup_governors_menu_activate (GtkAction *action,
if (!gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
return;
- if (popup->priv->selector == NULL)
+ if (popup->selector == NULL)
return;
- cpu = cpufreq_monitor_get_cpu (popup->priv->monitor);
+ cpu = cpufreq_monitor_get_cpu (popup->monitor);
name = gtk_action_get_name (action);
governor = name + strlen ("Governor");
- cpufreq_selector_gen_call_set_governor (popup->priv->selector,
+ cpufreq_selector_gen_call_set_governor (popup->selector,
cpu,
governor,
NULL,
@@ -294,19 +255,19 @@ cpufreq_popup_menu_add_action (CPUFreqPopup *popup,
gtk_action_set_sensitive (GTK_ACTION (action), sensitive);
- gtk_radio_action_set_group (GTK_RADIO_ACTION (action), popup->priv->radio_group);
- popup->priv->radio_group = gtk_radio_action_get_group (GTK_RADIO_ACTION (action));
+ gtk_radio_action_set_group (GTK_RADIO_ACTION (action), popup->radio_group);
+ popup->radio_group = gtk_radio_action_get_group (GTK_RADIO_ACTION (action));
if (g_ascii_strcasecmp (menu, "Frequency") == 0) {
- popup->priv->freqs_actions = g_slist_prepend (popup->priv->freqs_actions,
- (gpointer) action);
+ popup->freqs_actions = g_slist_prepend (popup->freqs_actions,
+ (gpointer) action);
g_signal_connect (action, "activate",
G_CALLBACK (cpufreq_popup_frequencies_menu_activate),
(gpointer) popup);
} else if (g_ascii_strcasecmp (menu, "Governor") == 0) {
- popup->priv->govs_actions = g_slist_prepend (popup->priv->govs_actions,
- (gpointer) action);
+ popup->govs_actions = g_slist_prepend (popup->govs_actions,
+ (gpointer) action);
g_signal_connect (action, "activate",
G_CALLBACK (cpufreq_popup_governors_menu_activate),
@@ -324,7 +285,7 @@ frequencies_menu_create_actions (CPUFreqPopup *popup)
{
GList *available_freqs;
- available_freqs = cpufreq_monitor_get_available_frequencies (popup->priv->monitor);
+ available_freqs = cpufreq_monitor_get_available_frequencies (popup->monitor);
while (available_freqs) {
const gchar *text;
@@ -345,7 +306,7 @@ frequencies_menu_create_actions (CPUFreqPopup *popup)
cpufreq_popup_menu_add_action (popup,
"Frequency",
- popup->priv->freqs_group,
+ popup->freqs_group,
text, label, TRUE);
g_free (label);
@@ -358,7 +319,7 @@ governors_menu_create_actions (CPUFreqPopup *popup)
{
GList *available_govs;
- available_govs = cpufreq_monitor_get_available_governors (popup->priv->monitor);
+ available_govs = cpufreq_monitor_get_available_governors (popup->monitor);
available_govs = g_list_sort (available_govs, (GCompareFunc)g_ascii_strcasecmp);
while (available_govs) {
@@ -367,7 +328,7 @@ governors_menu_create_actions (CPUFreqPopup *popup)
governor = (const gchar *) available_govs->data;
if (g_ascii_strcasecmp (governor, "userspace") == 0) {
- popup->priv->show_freqs = TRUE;
+ popup->show_freqs = TRUE;
available_govs = g_list_next (available_govs);
continue;
}
@@ -377,7 +338,7 @@ governors_menu_create_actions (CPUFreqPopup *popup)
cpufreq_popup_menu_add_action (popup,
"Governor",
- popup->priv->govs_group,
+ popup->govs_group,
governor, label, TRUE);
g_free (label);
@@ -404,8 +365,8 @@ cpufreq_popup_build_ui (CPUFreqPopup *popup,
"label", &label,
NULL);
- gtk_ui_manager_add_ui (popup->priv->ui_manager,
- popup->priv->merge_id,
+ gtk_ui_manager_add_ui (popup->ui_manager,
+ popup->merge_id,
menu_path,
label, name,
GTK_UI_MANAGER_MENUITEM,
@@ -420,62 +381,55 @@ static void
cpufreq_popup_build_frequencies_menu (CPUFreqPopup *popup,
const gchar *path)
{
- if (!popup->priv->freqs_group) {
+ if (!popup->freqs_group) {
GtkActionGroup *action_group;
action_group = gtk_action_group_new ("FreqsActions");
- popup->priv->freqs_group = action_group;
+ popup->freqs_group = action_group;
gtk_action_group_set_translation_domain (action_group, NULL);
frequencies_menu_create_actions (popup);
- popup->priv->freqs_actions = g_slist_reverse (popup->priv->freqs_actions);
- gtk_ui_manager_insert_action_group (popup->priv->ui_manager,
+ popup->freqs_actions = g_slist_reverse (popup->freqs_actions);
+ gtk_ui_manager_insert_action_group (popup->ui_manager,
action_group, 0);
}
- cpufreq_popup_build_ui (popup,
- popup->priv->freqs_actions,
- path);
+ cpufreq_popup_build_ui (popup, popup->freqs_actions, path);
}
static void
cpufreq_popup_build_governors_menu (CPUFreqPopup *popup,
const gchar *path)
{
- if (!popup->priv->govs_group) {
+ if (!popup->govs_group) {
GtkActionGroup *action_group;
action_group = gtk_action_group_new ("GovsActions");
- popup->priv->govs_group = action_group;
+ popup->govs_group = action_group;
gtk_action_group_set_translation_domain (action_group, NULL);
governors_menu_create_actions (popup);
- popup->priv->govs_actions = g_slist_reverse (popup->priv->govs_actions);
- gtk_ui_manager_insert_action_group (popup->priv->ui_manager,
- action_group, 1);
+ popup->govs_actions = g_slist_reverse (popup->govs_actions);
+ gtk_ui_manager_insert_action_group (popup->ui_manager, action_group, 1);
}
- cpufreq_popup_build_ui (popup,
- popup->priv->govs_actions,
- path);
+ cpufreq_popup_build_ui (popup, popup->govs_actions, path);
}
static void
cpufreq_popup_build_menu (CPUFreqPopup *popup)
{
- if (popup->priv->merge_id > 0) {
- gtk_ui_manager_remove_ui (popup->priv->ui_manager,
- popup->priv->merge_id);
- gtk_ui_manager_ensure_update (popup->priv->ui_manager);
+ if (popup->merge_id > 0) {
+ gtk_ui_manager_remove_ui (popup->ui_manager, popup->merge_id);
+ gtk_ui_manager_ensure_update (popup->ui_manager);
}
- popup->priv->merge_id = gtk_ui_manager_new_merge_id (popup->priv->ui_manager);
+ popup->merge_id = gtk_ui_manager_new_merge_id (popup->ui_manager);
cpufreq_popup_build_frequencies_menu (popup, FREQS_PLACEHOLDER_PATH);
cpufreq_popup_build_governors_menu (popup, GOVS_PLACEHOLDER_PATH);
- gtk_action_group_set_visible (popup->priv->freqs_group,
- popup->priv->show_freqs);
+ gtk_action_group_set_visible (popup->freqs_group, popup->show_freqs);
}
static void
@@ -512,21 +466,21 @@ cpufreq_popup_menu_set_active (CPUFreqPopup *popup)
{
const gchar *governor;
- governor = cpufreq_monitor_get_governor (popup->priv->monitor);
+ governor = cpufreq_monitor_get_governor (popup->monitor);
if (g_ascii_strcasecmp (governor, "userspace") == 0) {
gchar *active;
guint freq;
- freq = cpufreq_monitor_get_frequency (popup->priv->monitor);
+ freq = cpufreq_monitor_get_frequency (popup->monitor);
active = g_strdup_printf ("%d", freq);
cpufreq_popup_menu_set_active_action (popup,
- popup->priv->freqs_group,
+ popup->freqs_group,
"Frequency", active);
g_free (active);
} else {
cpufreq_popup_menu_set_active_action (popup,
- popup->priv->govs_group,
+ popup->govs_group,
"Governor", governor);
}
}
@@ -537,20 +491,20 @@ cpufreq_popup_get_menu (CPUFreqPopup *popup)
GtkWidget *menu;
g_return_val_if_fail (CPUFREQ_IS_POPUP (popup), NULL);
- g_return_val_if_fail (CPUFREQ_IS_MONITOR (popup->priv->monitor), NULL);
+ g_return_val_if_fail (CPUFREQ_IS_MONITOR (popup->monitor), NULL);
if (!cpufreq_utils_selector_is_available ())
return NULL;
- if (popup->priv->need_build) {
+ if (popup->need_build) {
cpufreq_popup_build_menu (popup);
- popup->priv->need_build = FALSE;
+ popup->need_build = FALSE;
}
cpufreq_popup_menu_set_active (popup);
-
- menu = gtk_ui_manager_get_widget (popup->priv->ui_manager,
+
+ menu = gtk_ui_manager_get_widget (popup->ui_manager,
"/CPUFreqSelectorPopup");
-
+
return menu;
}
diff --git a/gnome-applets/cpufreq/cpufreq-popup.h b/gnome-applets/cpufreq/cpufreq-popup.h
index 4aa697439..34af707d6 100644
--- a/gnome-applets/cpufreq/cpufreq-popup.h
+++ b/gnome-applets/cpufreq/cpufreq-popup.h
@@ -28,28 +28,9 @@
G_BEGIN_DECLS
-#define CPUFREQ_TYPE_POPUP (cpufreq_popup_get_type ())
-#define CPUFREQ_POPUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CPUFREQ_TYPE_POPUP, CPUFreqPopup))
-#define CPUFREQ_POPUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), CPUFREQ_TYPE_POPUP,
CPUFreqPopupClass))
-#define CPUFREQ_IS_POPUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CPUFREQ_TYPE_POPUP))
-#define CPUFREQ_IS_POPUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CPUFREQ_TYPE_POPUP))
-#define CPUFREQ_POPUP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CPUFREQ_TYPE_POPUP,
CPUFreqPopupClass))
+#define CPUFREQ_TYPE_POPUP (cpufreq_popup_get_type ())
+G_DECLARE_FINAL_TYPE (CPUFreqPopup, cpufreq_popup, CPUFREQ, POPUP, GObject)
-typedef struct _CPUFreqPopup CPUFreqPopup;
-typedef struct _CPUFreqPopupClass CPUFreqPopupClass;
-typedef struct _CPUFreqPopupPrivate CPUFreqPopupPrivate;
-
-struct _CPUFreqPopup {
- GObject base;
-
- CPUFreqPopupPrivate *priv;
-};
-
-struct _CPUFreqPopupClass {
- GObjectClass parent_class;
-};
-
-GType cpufreq_popup_get_type (void) G_GNUC_CONST;
CPUFreqPopup *cpufreq_popup_new (void);
void cpufreq_popup_set_monitor (CPUFreqPopup *popup,
diff --git a/gnome-applets/cpufreq/cpufreq-prefs.c b/gnome-applets/cpufreq/cpufreq-prefs.c
index b3198703e..c21520814 100644
--- a/gnome-applets/cpufreq/cpufreq-prefs.c
+++ b/gnome-applets/cpufreq/cpufreq-prefs.c
@@ -33,7 +33,10 @@ enum {
PROP_SHOW_TEXT_MODE,
};
-struct _CPUFreqPrefsPrivate {
+struct _CPUFreqPrefs
+{
+ GObject parent;
+
guint cpu;
CPUFreqShowMode show_mode;
CPUFreqShowTextMode show_text_mode;
@@ -51,9 +54,6 @@ struct _CPUFreqPrefsPrivate {
GtkWidget *show_mode_combo;
};
-#define CPUFREQ_PREFS_GET_PRIVATE(object) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((object), CPUFREQ_TYPE_PREFS, CPUFreqPrefsPrivate))
-
static void cpufreq_prefs_finalize (GObject *object);
static void cpufreq_prefs_set_property (GObject *object,
@@ -67,16 +67,11 @@ static void cpufreq_prefs_get_property (GObject *object,
static void cpufreq_prefs_dialog_update_sensitivity (CPUFreqPrefs *prefs);
-
G_DEFINE_TYPE (CPUFreqPrefs, cpufreq_prefs, G_TYPE_OBJECT)
static void
cpufreq_prefs_init (CPUFreqPrefs *prefs)
{
- prefs->priv = CPUFREQ_PREFS_GET_PRIVATE (prefs);
-
- prefs->priv->settings = NULL;
- prefs->priv->cpu = 0;
}
static void
@@ -86,8 +81,6 @@ cpufreq_prefs_class_init (CPUFreqPrefsClass *klass)
g_object_class->set_property = cpufreq_prefs_set_property;
g_object_class->get_property = cpufreq_prefs_get_property;
-
- g_type_class_add_private (g_object_class, sizeof (CPUFreqPrefsPrivate));
/* Properties */
g_object_class_install_property (g_object_class,
@@ -124,15 +117,8 @@ cpufreq_prefs_finalize (GObject *object)
{
CPUFreqPrefs *prefs = CPUFREQ_PREFS (object);
- if (prefs->priv->settings) {
- g_object_unref (prefs->priv->settings);
- prefs->priv->settings = NULL;
- }
-
- if (prefs->priv->dialog) {
- gtk_widget_destroy (prefs->priv->dialog);
- prefs->priv->dialog = NULL;
- }
+ g_clear_object (&prefs->settings);
+ g_clear_pointer (&prefs->dialog, gtk_widget_destroy);
G_OBJECT_CLASS (cpufreq_prefs_parent_class)->finalize (object);
}
@@ -151,9 +137,10 @@ cpufreq_prefs_set_property (GObject *object,
guint cpu;
cpu = g_value_get_uint (value);
- if (prefs->priv->cpu != cpu) {
- prefs->priv->cpu = cpu;
- g_settings_set_int (prefs->priv->settings, "cpu", cpu);
+
+ if (prefs->cpu != cpu) {
+ prefs->cpu = cpu;
+ g_settings_set_int (prefs->settings, "cpu", cpu);
}
}
break;
@@ -161,10 +148,10 @@ cpufreq_prefs_set_property (GObject *object,
CPUFreqShowMode mode;
mode = g_value_get_enum (value);
- if (prefs->priv->show_mode != mode) {
+ if (prefs->show_mode != mode) {
update_sensitivity = TRUE;
- prefs->priv->show_mode = mode;
- g_settings_set_enum (prefs->priv->settings, "show-mode", mode);
+ prefs->show_mode = mode;
+ g_settings_set_enum (prefs->settings, "show-mode", mode);
}
}
break;
@@ -172,10 +159,10 @@ cpufreq_prefs_set_property (GObject *object,
CPUFreqShowTextMode mode;
mode = g_value_get_enum (value);
- if (prefs->priv->show_text_mode != mode) {
+ if (prefs->show_text_mode != mode) {
update_sensitivity = TRUE;
- prefs->priv->show_text_mode = mode;
- g_settings_set_enum (prefs->priv->settings, "show-text-mode", mode);
+ prefs->show_text_mode = mode;
+ g_settings_set_enum (prefs->settings, "show-text-mode", mode);
}
}
break;
@@ -183,7 +170,7 @@ cpufreq_prefs_set_property (GObject *object,
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
- if (prefs->priv->dialog && update_sensitivity)
+ if (prefs->dialog && update_sensitivity)
cpufreq_prefs_dialog_update_sensitivity (prefs);
}
@@ -197,13 +184,13 @@ cpufreq_prefs_get_property (GObject *object,
switch (prop_id) {
case PROP_CPU:
- g_value_set_uint (value, prefs->priv->cpu);
+ g_value_set_uint (value, prefs->cpu);
break;
case PROP_SHOW_MODE:
- g_value_set_enum (value, prefs->priv->show_mode);
+ g_value_set_enum (value, prefs->show_mode);
break;
case PROP_SHOW_TEXT_MODE:
- g_value_set_enum (value, prefs->priv->show_text_mode);
+ g_value_set_enum (value, prefs->show_text_mode);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -213,12 +200,11 @@ cpufreq_prefs_get_property (GObject *object,
static void
cpufreq_prefs_setup (CPUFreqPrefs *prefs)
{
- g_assert (G_IS_SETTINGS (prefs->priv->settings));
-
- prefs->priv->cpu = g_settings_get_int (prefs->priv->settings, "cpu");
- prefs->priv->show_mode = g_settings_get_enum (prefs->priv->settings, "show-mode");
- prefs->priv->show_text_mode = g_settings_get_enum (prefs->priv->settings, "show-text-mode");
+ g_assert (G_IS_SETTINGS (prefs->settings));
+ prefs->cpu = g_settings_get_int (prefs->settings, "cpu");
+ prefs->show_mode = g_settings_get_enum (prefs->settings, "show-mode");
+ prefs->show_text_mode = g_settings_get_enum (prefs->settings, "show-text-mode");
}
CPUFreqPrefs *
@@ -230,8 +216,8 @@ cpufreq_prefs_new (CPUFreqApplet *applet,
g_return_val_if_fail (settings != NULL, NULL);
prefs = CPUFREQ_PREFS (g_object_new (CPUFREQ_TYPE_PREFS, NULL));
- prefs->priv->applet = applet;
- prefs->priv->settings = g_object_ref (settings);
+ prefs->applet = applet;
+ prefs->settings = g_object_ref (settings);
cpufreq_prefs_setup (prefs);
@@ -244,7 +230,7 @@ cpufreq_prefs_get_cpu (CPUFreqPrefs *prefs)
{
g_return_val_if_fail (CPUFREQ_IS_PREFS (prefs), 0);
- return MIN (prefs->priv->cpu, cpufreq_utils_get_n_cpus () - 1);
+ return MIN (prefs->cpu, cpufreq_utils_get_n_cpus () - 1);
}
CPUFreqShowMode
@@ -253,7 +239,7 @@ cpufreq_prefs_get_show_mode (CPUFreqPrefs *prefs)
g_return_val_if_fail (CPUFREQ_IS_PREFS (prefs),
CPUFREQ_MODE_BOTH);
- return prefs->priv->show_mode;
+ return prefs->show_mode;
}
CPUFreqShowTextMode
@@ -262,7 +248,7 @@ cpufreq_prefs_get_show_text_mode (CPUFreqPrefs *prefs)
g_return_val_if_fail (CPUFREQ_IS_PREFS (prefs),
CPUFREQ_MODE_TEXT_FREQUENCY_UNIT);
- return prefs->priv->show_text_mode;
+ return prefs->show_text_mode;
}
/* Preferences Dialog */
@@ -270,9 +256,9 @@ static void
cpufreq_prefs_dialog_show_freq_toggled (GtkWidget *show_freq, CPUFreqPrefs *prefs)
{
CPUFreqShowTextMode show_text_mode;
-
+
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (show_freq))) {
- GtkWidget *show_unit = prefs->priv->show_unit;
+ GtkWidget *show_unit = prefs->show_unit;
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (show_unit)))
show_text_mode = CPUFREQ_MODE_TEXT_FREQUENCY_UNIT;
@@ -321,8 +307,8 @@ static void
cpufreq_prefs_dialog_cpu_number_changed (GtkWidget *cpu_combo, CPUFreqPrefs *prefs)
{
gint cpu;
-
- cpu = gtk_combo_box_get_active (GTK_COMBO_BOX (prefs->priv->cpu_combo));
+
+ cpu = gtk_combo_box_get_active (GTK_COMBO_BOX (prefs->cpu_combo));
if (cpu >= 0) {
g_object_set (G_OBJECT (prefs),
@@ -348,11 +334,11 @@ cpufreq_prefs_dialog_response_cb (CPUFreqPrefs *prefs,
GtkDialog *dialog)
{
if (response == GTK_RESPONSE_HELP) {
- gp_applet_show_help (GP_APPLET (prefs->priv->applet),
+ gp_applet_show_help (GP_APPLET (prefs->applet),
"cpufreq-applet-prefs");
} else {
- gtk_widget_destroy (prefs->priv->dialog);
- prefs->priv->dialog = NULL;
+ gtk_widget_destroy (prefs->dialog);
+ prefs->dialog = NULL;
}
}
@@ -360,37 +346,37 @@ static void
cpufreq_prefs_dialog_update_visibility (CPUFreqPrefs *prefs)
{
if (cpufreq_utils_get_n_cpus () > 1)
- gtk_widget_show (prefs->priv->monitor_settings_box);
+ gtk_widget_show (prefs->monitor_settings_box);
else
- gtk_widget_hide (prefs->priv->monitor_settings_box);
+ gtk_widget_hide (prefs->monitor_settings_box);
}
static void
cpufreq_prefs_dialog_update_sensitivity (CPUFreqPrefs *prefs)
{
- gtk_widget_set_sensitive (prefs->priv->show_mode_combo,
- g_settings_is_writable (prefs->priv->settings, "show-mode"));
+ gtk_widget_set_sensitive (prefs->show_mode_combo,
+ g_settings_is_writable (prefs->settings, "show-mode"));
- if (prefs->priv->show_mode != CPUFREQ_MODE_GRAPHIC) {
+ if (prefs->show_mode != CPUFREQ_MODE_GRAPHIC) {
gboolean key_writable;
- key_writable = g_settings_is_writable (prefs->priv->settings, "show-text-mode");
+ key_writable = g_settings_is_writable (prefs->settings, "show-text-mode");
- gtk_widget_set_sensitive (prefs->priv->show_freq,
+ gtk_widget_set_sensitive (prefs->show_freq,
(TRUE && key_writable));
- gtk_widget_set_sensitive (prefs->priv->show_perc,
+ gtk_widget_set_sensitive (prefs->show_perc,
(TRUE && key_writable));
- if (prefs->priv->show_text_mode == CPUFREQ_MODE_TEXT_PERCENTAGE)
- gtk_widget_set_sensitive (prefs->priv->show_unit,
+ if (prefs->show_text_mode == CPUFREQ_MODE_TEXT_PERCENTAGE)
+ gtk_widget_set_sensitive (prefs->show_unit,
FALSE);
else
- gtk_widget_set_sensitive (prefs->priv->show_unit,
+ gtk_widget_set_sensitive (prefs->show_unit,
(TRUE && key_writable));
} else {
- gtk_widget_set_sensitive (prefs->priv->show_freq, FALSE);
- gtk_widget_set_sensitive (prefs->priv->show_unit, FALSE);
- gtk_widget_set_sensitive (prefs->priv->show_perc, FALSE);
+ gtk_widget_set_sensitive (prefs->show_freq, FALSE);
+ gtk_widget_set_sensitive (prefs->show_unit, FALSE);
+ gtk_widget_set_sensitive (prefs->show_perc, FALSE);
}
}
@@ -398,30 +384,30 @@ static void
cpufreq_prefs_dialog_update (CPUFreqPrefs *prefs)
{
if (cpufreq_utils_get_n_cpus () > 1) {
- gtk_combo_box_set_active (GTK_COMBO_BOX (prefs->priv->cpu_combo),
- MIN (prefs->priv->cpu, cpufreq_utils_get_n_cpus () - 1));
+ gtk_combo_box_set_active (GTK_COMBO_BOX (prefs->cpu_combo),
+ MIN (prefs->cpu, cpufreq_utils_get_n_cpus () - 1));
}
- gtk_combo_box_set_active (GTK_COMBO_BOX (prefs->priv->show_mode_combo),
- prefs->priv->show_mode);
+ gtk_combo_box_set_active (GTK_COMBO_BOX (prefs->show_mode_combo),
+ prefs->show_mode);
- switch (prefs->priv->show_text_mode) {
+ switch (prefs->show_text_mode) {
case CPUFREQ_MODE_TEXT_FREQUENCY:
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs->priv->show_freq),
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs->show_freq),
TRUE);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs->priv->show_unit),
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs->show_unit),
FALSE);
break;
case CPUFREQ_MODE_TEXT_FREQUENCY_UNIT:
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs->priv->show_freq),
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs->show_freq),
TRUE);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs->priv->show_unit),
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs->show_unit),
TRUE);
break;
case CPUFREQ_MODE_TEXT_PERCENTAGE:
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs->priv->show_perc),
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs->show_perc),
TRUE);
break;
@@ -441,7 +427,7 @@ cpufreq_prefs_dialog_cpu_combo_setup (CPUFreqPrefs *prefs)
guint n_cpus;
model = gtk_list_store_new (1, G_TYPE_STRING);
- gtk_combo_box_set_model (GTK_COMBO_BOX (prefs->priv->cpu_combo),
+ gtk_combo_box_set_model (GTK_COMBO_BOX (prefs->cpu_combo),
GTK_TREE_MODEL (model));
n_cpus = cpufreq_utils_get_n_cpus ();
@@ -462,10 +448,10 @@ cpufreq_prefs_dialog_cpu_combo_setup (CPUFreqPrefs *prefs)
g_object_unref (model);
renderer = gtk_cell_renderer_text_new ();
- gtk_cell_layout_clear (GTK_CELL_LAYOUT (prefs->priv->cpu_combo));
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (prefs->priv->cpu_combo),
+ gtk_cell_layout_clear (GTK_CELL_LAYOUT (prefs->cpu_combo));
+ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (prefs->cpu_combo),
renderer, TRUE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (prefs->priv->cpu_combo),
+ gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (prefs->cpu_combo),
renderer,
"text", 0,
NULL);
@@ -479,7 +465,7 @@ cpufreq_prefs_dialog_show_mode_combo_setup (CPUFreqPrefs *prefs)
GtkCellRenderer *renderer;
model = gtk_list_store_new (1, G_TYPE_STRING);
- gtk_combo_box_set_model (GTK_COMBO_BOX (prefs->priv->show_mode_combo),
+ gtk_combo_box_set_model (GTK_COMBO_BOX (prefs->show_mode_combo),
GTK_TREE_MODEL (model));
gtk_list_store_append (model, &iter);
@@ -500,10 +486,10 @@ cpufreq_prefs_dialog_show_mode_combo_setup (CPUFreqPrefs *prefs)
g_object_unref (model);
renderer = gtk_cell_renderer_text_new ();
- gtk_cell_layout_clear (GTK_CELL_LAYOUT (prefs->priv->show_mode_combo));
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (prefs->priv->show_mode_combo),
+ gtk_cell_layout_clear (GTK_CELL_LAYOUT (prefs->show_mode_combo));
+ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (prefs->show_mode_combo),
renderer, TRUE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (prefs->priv->show_mode_combo),
+ gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (prefs->show_mode_combo),
renderer,
"text", 0,
NULL);
@@ -516,17 +502,17 @@ cpufreq_prefs_dialog_create (CPUFreqPrefs *prefs)
builder = gtk_builder_new_from_resource (GRESOURCE_PREFIX "/ui/cpufreq-preferences.ui");
- prefs->priv->dialog = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_dialog"));
+ prefs->dialog = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_dialog"));
- prefs->priv->cpu_combo = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_cpu_number"));
+ prefs->cpu_combo = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_cpu_number"));
- prefs->priv->show_mode_combo = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_show_mode"));
+ prefs->show_mode_combo = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_show_mode"));
- prefs->priv->show_freq = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_show_freq"));
- prefs->priv->show_unit = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_show_unit"));
- prefs->priv->show_perc = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_show_perc"));
+ prefs->show_freq = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_show_freq"));
+ prefs->show_unit = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_show_unit"));
+ prefs->show_perc = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_show_perc"));
- prefs->priv->monitor_settings_box = GTK_WIDGET (gtk_builder_get_object (builder,
"monitor_settings_box"));
+ prefs->monitor_settings_box = GTK_WIDGET (gtk_builder_get_object (builder, "monitor_settings_box"));
g_object_unref (builder);
@@ -535,23 +521,23 @@ cpufreq_prefs_dialog_create (CPUFreqPrefs *prefs)
if (cpufreq_utils_get_n_cpus () > 1)
cpufreq_prefs_dialog_cpu_combo_setup (prefs);
- g_signal_connect_swapped (G_OBJECT (prefs->priv->dialog), "response",
+ g_signal_connect_swapped (prefs->dialog, "response",
G_CALLBACK (cpufreq_prefs_dialog_response_cb),
(gpointer) prefs);
- g_signal_connect (G_OBJECT (prefs->priv->show_freq), "toggled",
+ g_signal_connect (prefs->show_freq, "toggled",
G_CALLBACK (cpufreq_prefs_dialog_show_freq_toggled),
(gpointer) prefs);
- g_signal_connect (G_OBJECT (prefs->priv->show_unit), "toggled",
+ g_signal_connect (prefs->show_unit, "toggled",
G_CALLBACK (cpufreq_prefs_dialog_show_unit_toggled),
(gpointer) prefs);
- g_signal_connect (G_OBJECT (prefs->priv->show_perc), "toggled",
+ g_signal_connect (prefs->show_perc, "toggled",
G_CALLBACK (cpufreq_prefs_dialog_show_perc_toggled),
(gpointer) prefs);
- g_signal_connect (G_OBJECT (prefs->priv->cpu_combo), "changed",
+ g_signal_connect (prefs->cpu_combo, "changed",
G_CALLBACK (cpufreq_prefs_dialog_cpu_number_changed),
(gpointer) prefs);
- g_signal_connect (G_OBJECT (prefs->priv->show_mode_combo), "changed",
+ g_signal_connect (prefs->show_mode_combo, "changed",
G_CALLBACK (cpufreq_prefs_dialog_show_mode_changed),
(gpointer) prefs);
}
@@ -561,18 +547,18 @@ cpufreq_preferences_dialog_run (CPUFreqPrefs *prefs, GdkScreen *screen)
{
g_return_if_fail (CPUFREQ_IS_PREFS (prefs));
- if (prefs->priv->dialog) {
+ if (prefs->dialog) {
/* Dialog already exist, only show it */
- gtk_window_present (GTK_WINDOW (prefs->priv->dialog));
+ gtk_window_present (GTK_WINDOW (prefs->dialog));
return;
}
cpufreq_prefs_dialog_create (prefs);
- gtk_window_set_screen (GTK_WINDOW (prefs->priv->dialog), screen);
+ gtk_window_set_screen (GTK_WINDOW (prefs->dialog), screen);
cpufreq_prefs_dialog_update_sensitivity (prefs);
cpufreq_prefs_dialog_update_visibility (prefs);
cpufreq_prefs_dialog_update (prefs);
- gtk_widget_show (prefs->priv->dialog);
+ gtk_widget_show (prefs->dialog);
}
diff --git a/gnome-applets/cpufreq/cpufreq-prefs.h b/gnome-applets/cpufreq/cpufreq-prefs.h
index 878a2328d..7a406d83c 100644
--- a/gnome-applets/cpufreq/cpufreq-prefs.h
+++ b/gnome-applets/cpufreq/cpufreq-prefs.h
@@ -27,28 +27,8 @@
G_BEGIN_DECLS
-#define CPUFREQ_TYPE_PREFS (cpufreq_prefs_get_type ())
-#define CPUFREQ_PREFS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CPUFREQ_TYPE_PREFS, CPUFreqPrefs))
-#define CPUFREQ_PREFS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), CPUFREQ_TYPE_PREFS,
CPUFreqPrefsClass))
-#define CPUFREQ_IS_PREFS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CPUFREQ_TYPE_PREFS))
-#define CPUFREQ_IS_PREFS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CPUFREQ_TYPE_PREFS))
-#define CPUFREQ_PREFS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CPUFREQ_TYPE_PREFS,
CPUFreqPrefsClass))
-
-typedef struct _CPUFreqPrefs CPUFreqPrefs;
-typedef struct _CPUFreqPrefsClass CPUFreqPrefsClass;
-typedef struct _CPUFreqPrefsPrivate CPUFreqPrefsPrivate;
-
-struct _CPUFreqPrefs {
- GObject base;
-
- CPUFreqPrefsPrivate *priv;
-};
-
-struct _CPUFreqPrefsClass {
- GObjectClass parent_class;
-};
-
-GType cpufreq_prefs_get_type (void) G_GNUC_CONST;
+#define CPUFREQ_TYPE_PREFS (cpufreq_prefs_get_type ())
+G_DECLARE_FINAL_TYPE (CPUFreqPrefs, cpufreq_prefs, CPUFREQ, PREFS, GObject)
CPUFreqPrefs *cpufreq_prefs_new (CPUFreqApplet *applet,
GSettings *settings);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
