diff options
| author | infirit <[email protected]> | 2014-06-02 18:10:47 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-06-02 22:15:46 +0200 |
| commit | 53a1fe800f9f0c90dc298ba228b29852147794bb (patch) | |
| tree | 9dd51bac0cfdeb6767577986362c553709f3b333 /charpick | |
| parent | 4aebcf242c792e3c6e4b0162a74b90c7d882fb38 (diff) | |
| download | mate-applets-53a1fe800f9f0c90dc298ba228b29852147794bb.tar.bz2 mate-applets-53a1fe800f9f0c90dc298ba228b29852147794bb.tar.xz | |
Replace GtkObject with GObject also for gtk2
Diffstat (limited to 'charpick')
| -rw-r--r-- | charpick/charpick.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/charpick/charpick.c b/charpick/charpick.c index 7641e468..4afab222 100644 --- a/charpick/charpick.c +++ b/charpick/charpick.c @@ -12,10 +12,6 @@ #include <libmate-desktop/mate-aboutdialog.h> #include "charpick.h" -#if GTK_CHECK_VERSION (3, 0, 0) -#define GTK_OBJECT(x) G_OBJECT(x) -#endif - /* The comment for each char list has the html entity names of the chars */ /* All gunicar codes should end in 0 */ @@ -495,10 +491,10 @@ 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 (GTK_OBJECT (toggle_button[i]), "toggled", + g_signal_connect (G_OBJECT (toggle_button[i]), "toggled", G_CALLBACK (toggle_button_toggled_cb), p_curr_data); - g_signal_connect (GTK_OBJECT (toggle_button[i]), "button_press_event", + g_signal_connect (G_OBJECT (toggle_button[i]), "button_press_event", G_CALLBACK (button_press_hack), p_curr_data->applet); } @@ -774,10 +770,10 @@ charpicker_applet_fill (MatePanelApplet *applet) GDK_SELECTION_CLIPBOARD, utf8_atom, 0); - g_signal_connect (GTK_OBJECT (curr_data->applet), "selection_get", + g_signal_connect (G_OBJECT (curr_data->applet), "selection_get", G_CALLBACK (charpick_selection_handler), curr_data); - g_signal_connect (GTK_OBJECT (curr_data->applet), "selection_clear_event", + g_signal_connect (G_OBJECT (curr_data->applet), "selection_clear_event", G_CALLBACK (selection_clear_cb), curr_data); |