diff options
Diffstat (limited to 'charpick')
| -rw-r--r-- | charpick/Makefile.am | 10 | ||||
| -rw-r--r-- | charpick/charpick.c | 15 | ||||
| -rw-r--r-- | charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in | 2 | ||||
| -rw-r--r-- | charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in | 2 |
4 files changed, 14 insertions, 15 deletions
diff --git a/charpick/Makefile.am b/charpick/Makefile.am index b4c7d1d4..365fae44 100644 --- a/charpick/Makefile.am +++ b/charpick/Makefile.am @@ -5,16 +5,18 @@ AM_CPPFLAGS = \ -I$(srcdir) \ -DCHARPICK_MENU_UI_DIR=\""$(uidir)"\" \ $(MATE_APPLETS4_CFLAGS) \ + $(MATEDESKTOP_CFLAGS) \ $(GUCHARMAP_CFLAGS) -libexec_PROGRAMS = charpick_applet2 +libexec_PROGRAMS = charpick-applet -charpick_applet2_SOURCES = charpick.c \ +charpick_applet_SOURCES = charpick.c \ charpick.h \ properties.c -charpick_applet2_LDADD = \ +charpick_applet_LDADD = \ $(MATE_APPLETS4_LIBS) \ + $(MATEDESKTOP_LIBS) \ $(GUCHARMAP_LIBS) appletdir = $(datadir)/mate-panel/applets @@ -45,7 +47,7 @@ gsettings_SCHEMAS = org.mate.panel.applet.charpick.gschema.xml %.gschema.xml.in: %.gschema.xml.in.in Makefile $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ -uidir = $(datadir)/mate-2.0/ui +uidir = $(datadir)/mate/ui ui_DATA = charpick-applet-menu.xml CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) *.gschema.valid 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); diff --git a/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in b/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in index c7160c71..f7a9d2b0 100644 --- a/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in +++ b/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in @@ -1,6 +1,6 @@ [Applet Factory] Id=CharpickerAppletFactory -Location=@LIBEXECDIR@/charpick_applet2 +Location=@LIBEXECDIR@/charpick-applet _Name=Charpicker Applet Factory _Description=Charpicker Applet Factory diff --git a/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in b/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in index 66669019..bfca2847 100644 --- a/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in +++ b/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.mate.panel.applet.CharpickerAppletFactory -Exec=@LIBEXECDIR@/charpick_applet2 +Exec=@LIBEXECDIR@/charpick-applet |