diff options
Diffstat (limited to 'cpufreq/src/cpufreq-applet.c')
| -rw-r--r-- | cpufreq/src/cpufreq-applet.c | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/cpufreq/src/cpufreq-applet.c b/cpufreq/src/cpufreq-applet.c index 87fbc7af..b1509eaa 100644 --- a/cpufreq/src/cpufreq-applet.c +++ b/cpufreq/src/cpufreq-applet.c @@ -376,7 +376,7 @@ cpufreq_applet_key_press (GtkWidget *widget, break; } - return FALSE; + return GTK_WIDGET_CLASS (cpufreq_applet_parent_class)->key_press_event (widget, event); } static void @@ -478,7 +478,7 @@ cpufreq_applet_about_cb (GtkAction *action, "title", _("About CPU Frequency Scaling Monitor"), "version", VERSION, "copyright", _("Copyright \xC2\xA9 2004 Carlos Garcia Campos\n" - "Copyright \xc2\xa9 2012-2020 MATE developers"), + "Copyright \xc2\xa9 2012-2021 MATE developers"), "comments", _("This utility shows the current CPU " "Frequency Scaling."), "authors", authors, @@ -720,7 +720,6 @@ cpufreq_applet_refresh (CPUFreqApplet *applet) horizontal = ((applet->orient == MATE_PANEL_APPLET_ORIENT_UP) || (applet->orient == MATE_PANEL_APPLET_ORIENT_DOWN)); - /* We want a fixed label size, the biggest */ gtk_widget_get_preferred_width (GTK_WIDGET (applet->label), &label_size, NULL); @@ -788,7 +787,9 @@ cpufreq_applet_setup (CPUFreqApplet *applet) AtkObject *atk_obj; GSettings *settings; +#ifndef ENABLE_IN_PROCESS g_set_application_name (_("CPU Frequency Scaling Monitor")); +#endif gtk_window_set_default_icon_name ("mate-cpu-frequency-applet"); @@ -799,27 +800,27 @@ cpufreq_applet_setup (CPUFreqApplet *applet) settings = mate_panel_applet_settings_new (MATE_PANEL_APPLET (applet), "org.mate.panel.applet.cpufreq"); applet->prefs = cpufreq_prefs_new (settings); - g_signal_connect (G_OBJECT (applet->prefs), - "notify::cpu", + g_signal_connect (applet->prefs, "notify::cpu", G_CALLBACK (cpufreq_applet_prefs_cpu_changed), - (gpointer) applet); - g_signal_connect (G_OBJECT (applet->prefs), - "notify::show-mode", + applet); + + g_signal_connect (applet->prefs, "notify::show-mode", G_CALLBACK (cpufreq_applet_prefs_show_mode_changed), - (gpointer) applet); - g_signal_connect (G_OBJECT (applet->prefs), - "notify::show-text-mode", + applet); + + g_signal_connect (applet->prefs, "notify::show-text-mode", G_CALLBACK (cpufreq_applet_prefs_show_mode_changed), - (gpointer) applet); + applet); /* Monitor */ applet->monitor = cpufreq_monitor_factory_create_monitor (cpufreq_prefs_get_cpu (applet->prefs)); cpufreq_monitor_run (applet->monitor); - g_signal_connect_swapped (G_OBJECT (applet->monitor), "changed", + + g_signal_connect_swapped (applet->monitor, "changed", G_CALLBACK (cpufreq_applet_update), - (gpointer) applet); + applet); /* Setup the menus */ action_group = gtk_action_group_new ("CPUFreq Applet Actions"); @@ -868,8 +869,8 @@ cpufreq_applet_factory (CPUFreqApplet *applet, return retval; } -MATE_PANEL_APPLET_OUT_PROCESS_FACTORY ("CPUFreqAppletFactory", - CPUFREQ_TYPE_APPLET, - "cpufreq-applet", - (MatePanelAppletFactoryCallback) cpufreq_applet_factory, - NULL) +PANEL_APPLET_FACTORY ("CPUFreqAppletFactory", + CPUFREQ_TYPE_APPLET, + "cpufreq-applet", + (MatePanelAppletFactoryCallback) cpufreq_applet_factory, + NULL) |