diff options
Diffstat (limited to 'charpick/charpick.c')
| -rw-r--r-- | charpick/charpick.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/charpick/charpick.c b/charpick/charpick.c index 861c29a8..4afab222 100644 --- a/charpick/charpick.c +++ b/charpick/charpick.c @@ -9,12 +9,9 @@ #ifdef HAVE_GUCHARMAP #include <gucharmap/gucharmap.h> #endif +#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 */ @@ -494,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); } @@ -588,7 +585,7 @@ about (GtkAction *action, NULL }; - gtk_show_about_dialog (NULL, + mate_show_about_dialog (NULL, "version", VERSION, "copyright", "\xC2\xA9 1998, 2004-2005 GNOME Applets Maintainers " "and others", @@ -773,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); |