diff options
| -rw-r--r-- | charpick/Makefile.am | 33 | ||||
| -rw-r--r-- | charpick/charpick.c | 4 | ||||
| -rw-r--r-- | charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.desktop.in.in | 4 |
3 files changed, 16 insertions, 25 deletions
diff --git a/charpick/Makefile.am b/charpick/Makefile.am index 1c505e20..a9665974 100644 --- a/charpick/Makefile.am +++ b/charpick/Makefile.am @@ -1,7 +1,12 @@ NULL = +APPLET_LOCATION = $(libdir)/mate-applets/libmate-charpick-applet.so + SUBDIRS = help +mate_charpick_applet_libdir= $(pkglibdir) +mate_charpick_applet_lib_LTLIBRARIES=libmate-charpick-applet.la + AM_CPPFLAGS = \ -I. \ -I$(srcdir) \ @@ -11,17 +16,15 @@ AM_CPPFLAGS = \ $(GUCHARMAP_CFLAGS) \ $(NULL) -libexec_PROGRAMS = mate-charpick-applet - -BUILT_SOURCES = charpick-resources.c charpick-resources.h -nodist_mate_charpick_applet_SOURCES = $(BUILT_SOURCES) -mate_charpick_applet_SOURCES = \ +libmate_charpick_applet_la_SOURCES = \ charpick.c \ charpick.h \ properties.c \ + charpick-resources.c \ + charpick-resources.h \ $(NULL) -mate_charpick_applet_LDADD = \ +libmate_charpick_applet_la_LIBADD = \ $(MATE_APPLETS4_LIBS) \ $(GUCHARMAP_LIBS) \ $(NULL) @@ -38,22 +41,13 @@ applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-ap $(applet_in_files): $(applet_in_files).in Makefile $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ - -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \ - $< > $@ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \ + $< > $@ $(applet_DATA): $(applet_in_files) Makefile $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ -servicedir = $(datadir)/dbus-1/services -service_in_files = org.mate.panel.applet.CharpickerAppletFactory.service.in -service_DATA = $(service_in_files:.service.in=.service) - -org.mate.panel.applet.CharpickerAppletFactory.service: $(service_in_files) - $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ - $< > $@ - charpick_gschema_in_files = org.mate.panel.applet.charpick.gschema.xml.in gsettings_SCHEMAS = $(charpick_gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ @@ -61,15 +55,12 @@ gsettings_SCHEMAS = $(charpick_gschema_in_files:.xml.in=.xml) CLEANFILES = \ $(applet_DATA) \ $(applet_in_files) \ - $(service_DATA) \ $(gsettings_SCHEMAS) \ - $(BUILT_SOURCES) \ *.gschema.valid \ $(NULL) EXTRA_DIST = \ $(applet_in_files).in \ - $(service_in_files) \ $(charpick_gschema_in_files) \ charpick-applet-menu.xml \ charpick-resources.gresource.xml \ diff --git a/charpick/charpick.c b/charpick/charpick.c index 46b2dad8..952cfd23 100644 --- a/charpick/charpick.c +++ b/charpick/charpick.c @@ -764,8 +764,6 @@ charpicker_applet_fill (MatePanelApplet *applet) gchar *string; GtkActionGroup *action_group; - g_set_application_name (_("Character Palette")); - gtk_window_set_default_icon_name ("accessories-character-map"); mate_panel_applet_set_flags (applet, MATE_PANEL_APPLET_EXPAND_MINOR); @@ -872,7 +870,7 @@ charpicker_applet_factory (MatePanelApplet *applet, return retval; } -MATE_PANEL_APPLET_OUT_PROCESS_FACTORY ("CharpickerAppletFactory", +MATE_PANEL_APPLET_IN_PROCESS_FACTORY ("CharpickerAppletFactory", PANEL_TYPE_APPLET, "char-palette", charpicker_applet_factory, diff --git a/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.desktop.in.in b/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.desktop.in.in index 65a3c76d..97febf6f 100644 --- a/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.desktop.in.in +++ b/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.desktop.in.in @@ -1,6 +1,7 @@ [Applet Factory] Id=CharpickerAppletFactory -Location=@LIBEXECDIR@/mate-charpick-applet +Location=@APPLET_LOCATION@ +InProcess=true Name=Charpicker Applet Factory Description=Charpicker Applet Factory @@ -10,6 +11,7 @@ Description=Insert characters # Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=accessories-character-map MateComponentId=OAFIID:MATE_CharpickerApplet +Platforms=X11;Wayland; X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=mate-applets X-MATE-Bugzilla-Component=charpick |