summaryrefslogtreecommitdiff
path: root/battstat
diff options
context:
space:
mode:
Diffstat (limited to 'battstat')
-rw-r--r--battstat/battstat-upower.c2
-rw-r--r--battstat/battstat_applet.c19
-rw-r--r--battstat/power-management.c10
3 files changed, 13 insertions, 18 deletions
diff --git a/battstat/battstat-upower.c b/battstat/battstat-upower.c
index 788adfd4..da830c2b 100644
--- a/battstat/battstat-upower.c
+++ b/battstat/battstat-upower.c
@@ -318,7 +318,7 @@ error_dialog (const char *fmt , ...)
dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK, "%s", str);
- g_signal_connect_swapped (G_OBJECT (dialog), "response",
+ g_signal_connect_swapped (dialog, "response",
G_CALLBACK (gtk_widget_destroy),
G_OBJECT (dialog));
diff --git a/battstat/battstat_applet.c b/battstat/battstat_applet.c
index d2d29134..ce1598dc 100644
--- a/battstat/battstat_applet.c
+++ b/battstat/battstat_applet.c
@@ -153,7 +153,7 @@ battstat_error_dialog (GtkWidget *applet,
gtk_window_set_screen (GTK_WINDOW (dialog),
gtk_widget_get_screen (GTK_WIDGET (applet)));
- g_signal_connect_swapped (G_OBJECT (dialog), "response",
+ g_signal_connect_swapped (dialog, "response",
G_CALLBACK (gtk_widget_destroy),
G_OBJECT (dialog));
@@ -276,10 +276,9 @@ battery_full_dialog (GtkWidget *applet)
"gtk-ok",
GTK_RESPONSE_ACCEPT,
NULL);
- g_signal_connect_swapped (G_OBJECT (dialog),
- "response",
+ g_signal_connect_swapped (dialog, "response",
G_CALLBACK (gtk_widget_destroy),
- G_OBJECT (dialog));
+ dialog);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
@@ -438,8 +437,7 @@ battery_low_dialog (ProgressData *battery,
gtk_dialog_set_default_response (GTK_DIALOG (battery->battery_low_dialog),
GTK_RESPONSE_ACCEPT);
- g_signal_connect_swapped (G_OBJECT (battery->battery_low_dialog),
- "response",
+ g_signal_connect_swapped (battery->battery_low_dialog, "response",
G_CALLBACK (battery_low_dialog_destroy),
battery);
@@ -1091,18 +1089,15 @@ create_layout (ProgressData *battstat)
gtk_widget_show_all (battstat->applet);
/* Attach all sorts of signals to the applet. */
- g_signal_connect (G_OBJECT (battstat->applet),
- "destroy",
+ g_signal_connect (battstat->applet, "destroy",
G_CALLBACK (destroy_applet),
battstat);
- g_signal_connect (battstat->applet,
- "change_orient",
+ g_signal_connect (battstat->applet, "change_orient",
G_CALLBACK (change_orient),
battstat);
- g_signal_connect (battstat->applet,
- "size_allocate",
+ g_signal_connect (battstat->applet, "size_allocate",
G_CALLBACK (size_allocate),
battstat);
diff --git a/battstat/power-management.c b/battstat/power-management.c
index 8a19aed2..5c4145c6 100644
--- a/battstat/power-management.c
+++ b/battstat/power-management.c
@@ -122,32 +122,32 @@ initialise_test (void)
gtk_box_pack_start (box, gtk_label_new ("percent"), TRUE, TRUE, 0);
w = gtk_spin_button_new_with_range (-1.0, 100.0, 1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (w), 50.0);
- g_signal_connect (G_OBJECT (w), "value-changed",
+ g_signal_connect (w, "value-changed",
G_CALLBACK (test_update_integer), &test_status.percent);
gtk_box_pack_start (box, w, TRUE, TRUE, 0);
gtk_box_pack_start (box, gtk_label_new ("minutes"), TRUE, TRUE, 0);
w = gtk_spin_button_new_with_range (-1.0, 1000.0, 1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (w), 180.0);
- g_signal_connect (G_OBJECT (w), "value-changed",
+ g_signal_connect (w, "value-changed",
G_CALLBACK (test_update_integer), &test_status.minutes);
gtk_box_pack_start (box, w, TRUE, TRUE, 0);
w = gtk_toggle_button_new_with_label ("on_ac_power");
- g_signal_connect (G_OBJECT (w), "toggled",
+ g_signal_connect (w, "toggled",
G_CALLBACK (test_update_boolean),
&test_status.on_ac_power);
gtk_box_pack_start (box, w, TRUE, TRUE, 0);
w = gtk_toggle_button_new_with_label ("charging");
- g_signal_connect (G_OBJECT (w), "toggled",
+ g_signal_connect (w, "toggled",
G_CALLBACK (test_update_boolean), &test_status.charging);
gtk_box_pack_start (box, w, TRUE, TRUE, 0);
w = gtk_toggle_button_new_with_label ("present");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), TRUE);
- g_signal_connect (G_OBJECT (w), "toggled",
+ g_signal_connect (w, "toggled",
G_CALLBACK (test_update_boolean), &test_status.present);
gtk_box_pack_start (box, w, TRUE, TRUE, 0);