summaryrefslogtreecommitdiff
path: root/charpick
diff options
context:
space:
mode:
Diffstat (limited to 'charpick')
-rw-r--r--charpick/charpick.c26
-rw-r--r--charpick/properties.c34
2 files changed, 28 insertions, 32 deletions
diff --git a/charpick/charpick.c b/charpick/charpick.c
index 696d7067..6991b34f 100644
--- a/charpick/charpick.c
+++ b/charpick/charpick.c
@@ -308,7 +308,7 @@ populate_menu (charpick_data *curr_data)
group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_widget_show (menuitem);
g_object_set_data (G_OBJECT (menuitem), "string", string);
- g_signal_connect (G_OBJECT (menuitem), "activate",
+ g_signal_connect (menuitem, "activate",
G_CALLBACK (menuitem_activated),
curr_data);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
@@ -437,11 +437,11 @@ build_table (charpick_data *p_curr_data)
force_no_button_padding (button);
gtk_box_pack_start (GTK_BOX (box), button, TRUE, TRUE, 0);
- g_signal_connect (G_OBJECT (button), "clicked",
+ g_signal_connect (button, "clicked",
G_CALLBACK (chooser_button_clicked),
p_curr_data);
- g_signal_connect (G_OBJECT (button), "button_press_event",
+ g_signal_connect (button, "button_press_event",
G_CALLBACK (button_press_hack),
p_curr_data->applet);
}
@@ -488,11 +488,11 @@ build_table (charpick_data *p_curr_data)
g_object_set_data (G_OBJECT (toggle_button[i]), "unichar",
GINT_TO_POINTER (g_utf8_get_char (label)));
- g_signal_connect (G_OBJECT (toggle_button[i]), "toggled",
+ g_signal_connect (toggle_button[i], "toggled",
G_CALLBACK (toggle_button_toggled_cb),
p_curr_data);
- g_signal_connect (G_OBJECT (toggle_button[i]), "button_press_event",
+ g_signal_connect (toggle_button[i], "button_press_event",
G_CALLBACK (button_press_hack),
p_curr_data->applet);
}
@@ -774,7 +774,7 @@ charpicker_applet_fill (MatePanelApplet *applet)
|| (orientation == MATE_PANEL_APPLET_ORIENT_RIGHT);
build_table (curr_data);
- g_signal_connect (G_OBJECT (curr_data->applet), "key_press_event",
+ g_signal_connect (curr_data->applet, "key_press_event",
G_CALLBACK (key_press_event), curr_data);
utf8_atom = gdk_atom_intern ("UTF8_STRING", FALSE);
@@ -787,24 +787,24 @@ charpicker_applet_fill (MatePanelApplet *applet)
GDK_SELECTION_CLIPBOARD,
utf8_atom, 0);
- g_signal_connect (G_OBJECT (curr_data->applet), "selection_get",
- G_CALLBACK (charpick_selection_handler),
- curr_data);
+ g_signal_connect (curr_data->applet, "selection_get",
+ G_CALLBACK (charpick_selection_handler),
+ curr_data);
- g_signal_connect (G_OBJECT (curr_data->applet), "selection_clear_event",
+ g_signal_connect (curr_data->applet, "selection_clear_event",
G_CALLBACK (selection_clear_cb),
curr_data);
make_applet_accessible (GTK_WIDGET (applet));
/* session save signal */
- g_signal_connect (G_OBJECT (applet), "change_orient",
+ g_signal_connect (applet, "change_orient",
G_CALLBACK (applet_change_orient), curr_data);
- g_signal_connect (G_OBJECT (applet), "size_allocate",
+ g_signal_connect (applet, "size_allocate",
G_CALLBACK (applet_size_allocate), curr_data);
- g_signal_connect (G_OBJECT (applet), "destroy",
+ g_signal_connect (applet, "destroy",
G_CALLBACK (applet_destroy), curr_data);
gtk_widget_show_all (GTK_WIDGET (applet));
diff --git a/charpick/properties.c b/charpick/properties.c
index 66c13a68..f0693115 100644
--- a/charpick/properties.c
+++ b/charpick/properties.c
@@ -224,13 +224,11 @@ add_palette (GtkButton *buttonk,
if (curr_data->add_edit_dialog == NULL) {
add_edit_dialog_create (curr_data, NULL, _("Add Palette"));
- g_signal_connect (curr_data->add_edit_dialog,
- "response",
+ g_signal_connect (curr_data->add_edit_dialog, "response",
G_CALLBACK (add_palette_cb),
curr_data);
- g_signal_connect (curr_data->add_edit_dialog,
- "destroy",
+ g_signal_connect (curr_data->add_edit_dialog, "destroy",
G_CALLBACK (gtk_widget_destroyed),
&curr_data->add_edit_dialog);
@@ -262,13 +260,11 @@ edit_palette (GtkButton *button,
add_edit_dialog_create (curr_data, charlist, _("Edit Palette"));
- g_signal_connect (curr_data->add_edit_dialog,
- "response",
+ g_signal_connect (curr_data->add_edit_dialog, "response",
G_CALLBACK (edit_palette_cb),
curr_data);
- g_signal_connect (curr_data->add_edit_dialog,
- "destroy",
+ g_signal_connect (curr_data->add_edit_dialog, "destroy",
G_CALLBACK (gtk_widget_destroyed),
&curr_data->add_edit_dialog);
@@ -381,18 +377,18 @@ create_palettes_tree (charpick_data *curr_data,
while (list) {
GtkTreeIter iter;
gchar *charlist = list->data;
-
+
gtk_list_store_append (GTK_LIST_STORE (model), &iter);
gtk_list_store_set (GTK_LIST_STORE (model),
&iter, 0,
charlist, 1,
charlist, -1);
-
+
list = g_list_next (list);
}
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree));
- g_signal_connect (G_OBJECT (selection), "changed",
+ g_signal_connect (selection, "changed",
G_CALLBACK (selection_changed),
scrolled);
@@ -475,12 +471,12 @@ default_chars_frame_create (charpick_data *curr_data)
NULL));
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (add_palette),
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (add_palette),
curr_data);
set_access_namedesc (button, _("Add button"),
_("Click to add a new palette"));
-
+
button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
"label", CHARPICK_STOCK_EDIT,
"use-stock", TRUE,
@@ -488,14 +484,14 @@ default_chars_frame_create (charpick_data *curr_data)
NULL));
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
- g_signal_connect (G_OBJECT (button), "clicked",
+ g_signal_connect (button, "clicked",
G_CALLBACK (edit_palette),
curr_data);
g_object_set_data (G_OBJECT (scrolled),
"edit_button", button);
set_access_namedesc (button, _("Edit button"),
_("Click to edit the selected palette"));
-
+
button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
"label", "gtk-delete",
"use-stock", TRUE,
@@ -503,7 +499,7 @@ default_chars_frame_create (charpick_data *curr_data)
NULL));
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
- g_signal_connect (G_OBJECT (button), "clicked",
+ g_signal_connect (button, "clicked",
G_CALLBACK (delete_palette),
curr_data);
g_object_set_data (G_OBJECT (scrolled),
@@ -577,8 +573,8 @@ show_preferences_dialog (GtkAction *action,
gtk_dialog_set_default_response (GTK_DIALOG (curr_data->propwindow), GTK_RESPONSE_CLOSE);
default_chars_frame_create (curr_data);
- g_signal_connect (G_OBJECT (curr_data->propwindow), "response",
+ g_signal_connect (curr_data->propwindow, "response",
G_CALLBACK (response_cb), curr_data);
-
+
gtk_widget_show_all (curr_data->propwindow);
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-27 00:52:45 +0000