diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | stickynotes/Makefile.am | 2 | ||||
| -rw-r--r-- | stickynotes/data/MATE_StickyNotesApplet.server.in | 24 | ||||
| -rw-r--r-- | stickynotes/data/Makefile.am | 19 |
5 files changed, 1 insertions, 46 deletions
diff --git a/configure.ac b/configure.ac index 1456fd65..d0880f24 100644 --- a/configure.ac +++ b/configure.ac @@ -667,7 +667,6 @@ man/Makefile stickynotes/Makefile stickynotes/pixmaps/Makefile stickynotes/docs/Makefile -stickynotes/data/Makefile trashapplet/Makefile trashapplet/src/Makefile trashapplet/docs/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index c6f4d41c..aa8c9786 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -67,7 +67,6 @@ null_applet/MATE_Panel_WirelessApplet.server.in null_applet/MATE_KeyboardApplet.server.in null_applet/null_applet.c # NB. these are actually separate files -stickynotes/data/MATE_StickyNotesApplet.server.in [type: gettext/ini]stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in stickynotes/stickynotes.c [type: gettext/glade]stickynotes/stickynotes.ui diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am index b58f553c..2b10fd29 100644 --- a/stickynotes/Makefile.am +++ b/stickynotes/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = pixmaps docs data +SUBDIRS = pixmaps docs ui_files = stickynotes-applet-menu.xml builder_files = stickynotes.ui diff --git a/stickynotes/data/MATE_StickyNotesApplet.server.in b/stickynotes/data/MATE_StickyNotesApplet.server.in deleted file mode 100644 index a96cce74..00000000 --- a/stickynotes/data/MATE_StickyNotesApplet.server.in +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0"?> -<!-- This file was installed to automatically upgrade your machine from using - stickynotes to using Tomboy. - - If you wish to continue using stickynotes, please recompile MATE-Applets - with -enable-stickynotes and your stickynotes applets should reappear. ---> - -<oaf_info> - <oaf_server iid="OAFIID:MATE_StickyNotesApplet" type="factory" location="OAFIID:TomboyApplet_Factory"> - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:MATE/Vertigo/MatePanelAppletShell:1.0"/> - <item value="IDL:MateComponent/Control:1.0"/> - <item value="IDL:MateComponent/Unknown:1.0"/> - </oaf_attribute> - <oaf_attribute name="name" type="string" _value="Tomboy (ne Stickynotes)"/> - <oaf_attribute name="description" type="string" _value="Tomboy (transparent upgrade from stickynotes)"/> - <oaf_attribute name="bugzilla:bugzilla" type="string" value="MATE"/> - <oaf_attribute name="bugzilla:product" type="string" value="mate-applets"/> - <oaf_attribute name="bugzilla:component" type="string" value="stickynotes"/> - <oaf_attribute name="bugzilla:other_binaries" type="string" value="stickynotes_applet"/> - </oaf_server> -</oaf_info> - diff --git a/stickynotes/data/Makefile.am b/stickynotes/data/Makefile.am deleted file mode 100644 index 194d08f9..00000000 --- a/stickynotes/data/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -# install the upgrading .server file -# - -server_in_files = \ - MATE_StickyNotesApplet.server.in - -if BUILD_STICKYNOTES_APPLET -else -serverdir = $(libdir)/matecomponent/servers -server_DATA = $(server_in_files:.server.in=.server) - -@INTLTOOL_SERVER_RULE@ - -CLEANFILES = $(server_DATA) - -endif -EXTRA_DIST = $(server_in_files) - --include $(top_srcdir)/git.mk |