GNOME.org
 

[gnome-applets/wip/muktupavels/sticky-notes: 2/2] sticky-notes: port to libgnome-panel

commit ff98d202d543e489a854ea9e9d99008aa5874416
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Mar 31 16:14:02 2020 +0300

    sticky-notes: port to libgnome-panel

 Makefile.am                                        |   2 -
 configure.ac                                       |   6 +-
 gnome-applets/Makefile.am                          |  16 +-
 gnome-applets/ga-module.c                          |  11 ++
 gnome-applets/sticky-notes/Makefile.am             |  44 ++++++
 .../src => gnome-applets/sticky-notes}/gsettings.h |   0
 .../icons/sticky-notes-stock-close.png             | Bin
 .../icons/sticky-notes-stock-locked.png            | Bin
 .../icons/sticky-notes-stock-resize-se.png         | Bin
 .../icons/sticky-notes-stock-resize-sw.png         | Bin
 .../icons/sticky-notes-stock-unlocked.png          | Bin
 .../sticky-notes/sticky-notes-applet-callbacks.c   |  35 +++--
 .../sticky-notes/sticky-notes-applet-callbacks.h   |   8 +-
 .../sticky-notes/sticky-notes-applet.c             | 163 ++++++++++-----------
 .../sticky-notes/sticky-notes-applet.h             |  36 ++---
 .../sticky-notes/sticky-notes-callbacks.c          |  10 +-
 .../sticky-notes/sticky-notes-callbacks.h          |   2 +-
 .../sticky-notes/sticky-notes.c                    |  54 ++++---
 .../sticky-notes/sticky-notes.h                    |   2 +-
 .../sticky-notes/ui/sticky-notes-applet-menu.xml   |  36 +++++
 .../sticky-notes/ui}/sticky-notes-delete-all.ui    |   0
 .../sticky-notes/ui}/sticky-notes-delete.ui        |   0
 .../sticky-notes/ui}/sticky-notes-note-menu.xml    |   0
 .../sticky-notes/ui}/sticky-notes-note.ui          |   0
 .../sticky-notes/ui}/sticky-notes-preferences.ui   |   0
 .../sticky-notes/ui}/sticky-notes-properties.ui    |   0
 .../src => gnome-applets/sticky-notes}/util.c      |  20 +--
 .../src => gnome-applets/sticky-notes}/util.h      |   0
 po/POTFILES.in                                     |  23 ++-
 po/POTFILES.skip                                   |   1 -
 sticky-notes/Makefile.am                           |   3 -
 sticky-notes/data/Makefile.am                      |  26 ----
 ...me.applets.StickyNotesApplet.panel-applet.in.in |  15 --
 sticky-notes/pixmaps/Makefile.am                   |  25 ----
 sticky-notes/src/Makefile.am                       |  76 ----------
 sticky-notes/src/sticky-notes-applet-menu.xml      |  32 ----
 .../src/sticky-notes-resources.gresource.xml       |  12 --
 37 files changed, 285 insertions(+), 373 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 2a7887431..142b887a9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,6 @@ NULL =
 
 always_built_SUBDIRS =  \
        multiload \
-       sticky-notes    \
        window-buttons \
        $(NULL)
 
@@ -20,7 +19,6 @@ DIST_SUBDIRS = \
        help \
        po              \
        multiload       \
-       sticky-notes    \
        window-buttons  \
        $(NULL)
 
diff --git a/configure.ac b/configure.ac
index 30db55e20..59a038d3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -357,6 +357,7 @@ AC_CONFIG_FILES([
   gnome-applets/inhibit/Makefile
   gnome-applets/mini-commander/Makefile
   gnome-applets/netspeed/Makefile
+  gnome-applets/sticky-notes/Makefile
   gnome-applets/timer/Makefile
   gnome-applets/tracker-search-bar/Makefile
   gnome-applets/trash/Makefile
@@ -382,11 +383,6 @@ AC_CONFIG_FILES([
   multiload/Makefile
   multiload/src/Makefile
 
-  sticky-notes/Makefile
-  sticky-notes/data/Makefile
-  sticky-notes/src/Makefile
-  sticky-notes/pixmaps/Makefile
-
   window-buttons/Makefile
   window-buttons/themes/Makefile
 ])
diff --git a/gnome-applets/Makefile.am b/gnome-applets/Makefile.am
index db0989ddd..3980de893 100644
--- a/gnome-applets/Makefile.am
+++ b/gnome-applets/Makefile.am
@@ -13,6 +13,7 @@ SUBDIRS = \
        inhibit \
        mini-commander \
        netspeed \
+       sticky-notes \
        timer \
        tracker-search-bar \
        trash \
@@ -53,6 +54,7 @@ org_gnome_gnome_applets_la_LIBADD = \
        $(top_builddir)/gnome-applets/inhibit/libinhibit-applet.la \
        $(top_builddir)/gnome-applets/mini-commander/libmini-commander-applet.la \
        $(top_builddir)/gnome-applets/netspeed/libnet-speed-applet.la \
+       $(top_builddir)/gnome-applets/sticky-notes/libsticky-notes-applet.la \
        $(top_builddir)/gnome-applets/timer/libtimer-applet.la \
        $(top_builddir)/gnome-applets/trash/libtrash-applet.la \
        $(top_builddir)/gnome-applets/window-picker/libwindow-picker-applet.la \
@@ -132,6 +134,11 @@ icon_files = \
        accessx-status/icons/ax-slowkeys-yes.png \
        accessx-status/icons/ax-slowkeys-no.png \
        accessx-status/icons/ax-bouncekeys.png \
+       sticky-notes/icons/sticky-notes-stock-locked.png \
+       sticky-notes/icons/sticky-notes-stock-unlocked.png \
+       sticky-notes/icons/sticky-notes-stock-close.png \
+       sticky-notes/icons/sticky-notes-stock-resize-se.png \
+       sticky-notes/icons/sticky-notes-stock-resize-sw.png \
        window-picker/wp-about-logo.png \
        $(NULL)
 
@@ -150,6 +157,13 @@ ui_files = \
        mini-commander/mini-commander-applet-menu.xml \
        netspeed/netspeed-menu.xml \
        timer/timer-applet-menu.xml \
+       sticky-notes/ui/sticky-notes-applet-menu.xml \
+       sticky-notes/ui/sticky-notes-delete.ui \
+       sticky-notes/ui/sticky-notes-delete-all.ui \
+       sticky-notes/ui/sticky-notes-note.ui \
+       sticky-notes/ui/sticky-notes-note-menu.xml \
+       sticky-notes/ui/sticky-notes-preferences.ui \
+       sticky-notes/ui/sticky-notes-properties.ui \
        trash/trash-empty.ui \
        trash/trash-menu.xml \
        window-picker/wp-menu.xml \
@@ -174,7 +188,7 @@ ui_files += \
        $(NULL)
 endif
 
-gnome-applets.gresource.xml: Makefile
+gnome-applets.gresource.xml: Makefile.am Makefile
        $(AM_V_GEN) echo '<?xml version="1.0" encoding="UTF-8"?>' > $@; \
                echo '<gresources>' >> $@; \
                echo "  <gresource prefix=\"$(GRESOURCE_PREFIX)/icons\">" >> $@; \
diff --git a/gnome-applets/ga-module.c b/gnome-applets/ga-module.c
index 22c409658..9d3d792b8 100644
--- a/gnome-applets/ga-module.c
+++ b/gnome-applets/ga-module.c
@@ -35,6 +35,7 @@
 #include "inhibit/inhibit-applet.h"
 #include "mini-commander/mini-commander-applet.h"
 #include "netspeed/netspeed-applet.h"
+#include "sticky-notes/sticky-notes-applet.h"
 #include "timer/timer-applet.h"
 #ifdef HAVE_TRACKER_SEARCH_BAR
 #include "tracker-search-bar/tracker-applet.h"
@@ -138,6 +139,13 @@ ga_get_applet_info (const char *id)
       description = _("Netspeed Applet");
       icon_name = "netspeed-applet";
     }
+  else if (g_strcmp0 (id, "sticky-notes") == 0)
+    {
+      type_func = sticky_notes_applet_get_type;
+      name = _("Sticky Notes");
+      description = _("Create, view, and manage sticky notes on the desktop");
+      icon_name = "gnome-sticky-notes-applet";
+    }
   else if (g_strcmp0 (id, "timer") == 0)
     {
       type_func = timer_applet_get_type;
@@ -215,6 +223,8 @@ ga_get_applet_id_from_iid (const char *iid)
     return "mini-commander";
   else if (g_strcmp0 (iid, "NetspeedAppletFactory::NetspeedApplet") == 0)
     return "netspeed";
+  else if (g_strcmp0 (iid, "StickyNotesAppletFactory::StickyNotesApplet") == 0)
+    return "sticky-notes";
   else if (g_strcmp0 (iid, "TimerAppletFactory::TimerApplet") == 0)
     return "timer";
 #ifdef HAVE_TRACKER_SEARCH_BAR
@@ -259,6 +269,7 @@ gp_module_load (GpModule *module)
                             "inhibit",
                             "mini-commander",
                             "netspeed",
+                            "sticky-notes",
                             "timer",
 #ifdef HAVE_TRACKER_SEARCH_BAR
                             "tracker-search-bar",
diff --git a/gnome-applets/sticky-notes/Makefile.am b/gnome-applets/sticky-notes/Makefile.am
new file mode 100644
index 000000000..3db9068fc
--- /dev/null
+++ b/gnome-applets/sticky-notes/Makefile.am
@@ -0,0 +1,44 @@
+NULL =
+
+noinst_LTLIBRARIES = libsticky-notes-applet.la
+
+libsticky_notes_applet_la_CPPFLAGS = \
+       -DG_LOG_DOMAIN=\"org.gnome.gnome-applets.sticky-notes\" \
+       -DG_LOG_USE_STRUCTURED=1 \
+       $(NULL)
+
+libsticky_notes_applet_la_CFLAGS = \
+       $(GNOME_PANEL_CFLAGS) \
+       $(LIBWNCK_CFLAGS) \
+       $(XML2_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
+
+libsticky_notes_applet_la_SOURCES = \
+       gsettings.h \
+       sticky-notes.c \
+       sticky-notes.h \
+       sticky-notes-applet.c \
+       sticky-notes-applet.h \
+       sticky-notes-applet-callbacks.c \
+       sticky-notes-applet-callbacks.h \
+       sticky-notes-callbacks.c \
+       sticky-notes-callbacks.h \
+       util.c \
+       util.h \
+       $(NULL)
+
+libsticky_notes_applet_la_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
+libsticky_notes_applet_la_LIBADD = \
+       $(GNOME_PANEL_LIBS) \
+       $(LIBWNCK_LIBS) \
+       $(X_LIBS) \
+       $(XML2_LIBS) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/sticky-notes/src/gsettings.h b/gnome-applets/sticky-notes/gsettings.h
similarity index 100%
rename from sticky-notes/src/gsettings.h
rename to gnome-applets/sticky-notes/gsettings.h
diff --git a/sticky-notes/pixmaps/stickynotes-stock-close.png 
b/gnome-applets/sticky-notes/icons/sticky-notes-stock-close.png
similarity index 100%
rename from sticky-notes/pixmaps/stickynotes-stock-close.png
rename to gnome-applets/sticky-notes/icons/sticky-notes-stock-close.png
diff --git a/sticky-notes/pixmaps/stickynotes-stock-locked.png 
b/gnome-applets/sticky-notes/icons/sticky-notes-stock-locked.png
similarity index 100%
rename from sticky-notes/pixmaps/stickynotes-stock-locked.png
rename to gnome-applets/sticky-notes/icons/sticky-notes-stock-locked.png
diff --git a/sticky-notes/pixmaps/stickynotes-stock-resize-se.png 
b/gnome-applets/sticky-notes/icons/sticky-notes-stock-resize-se.png
similarity index 100%
rename from sticky-notes/pixmaps/stickynotes-stock-resize-se.png
rename to gnome-applets/sticky-notes/icons/sticky-notes-stock-resize-se.png
diff --git a/sticky-notes/pixmaps/stickynotes-stock-resize-sw.png 
b/gnome-applets/sticky-notes/icons/sticky-notes-stock-resize-sw.png
similarity index 100%
rename from sticky-notes/pixmaps/stickynotes-stock-resize-sw.png
rename to gnome-applets/sticky-notes/icons/sticky-notes-stock-resize-sw.png
diff --git a/sticky-notes/pixmaps/stickynotes-stock-unlocked.png 
b/gnome-applets/sticky-notes/icons/sticky-notes-stock-unlocked.png
similarity index 100%
rename from sticky-notes/pixmaps/stickynotes-stock-unlocked.png
rename to gnome-applets/sticky-notes/icons/sticky-notes-stock-unlocked.png
diff --git a/sticky-notes/src/stickynotes_applet_callbacks.c 
b/gnome-applets/sticky-notes/sticky-notes-applet-callbacks.c
similarity index 95%
rename from sticky-notes/src/stickynotes_applet_callbacks.c
rename to gnome-applets/sticky-notes/sticky-notes-applet-callbacks.c
index 9bccf358d..4c6cef665 100644
--- a/sticky-notes/src/stickynotes_applet_callbacks.c
+++ b/gnome-applets/sticky-notes/sticky-notes-applet-callbacks.c
@@ -17,8 +17,8 @@
 
 #include <config.h>
 #include <string.h>
-#include "stickynotes_applet_callbacks.h"
-#include "stickynotes.h"
+#include "sticky-notes-applet-callbacks.h"
+#include "sticky-notes.h"
 #include "gsettings.h"
 #include <gdk/gdkkeysyms.h>
 #include <X11/Xatom.h>
@@ -58,7 +58,7 @@ static gboolean get_desktop_window (Window *window)
 static void
 popup_add_note (StickyNotesApplet *applet, GtkWidget *item)
 {
-       stickynotes_add (gtk_widget_get_screen (applet->w_applet));
+       stickynotes_add (gtk_widget_get_screen (GTK_WIDGET (applet)));
 }
 
 static void
@@ -118,7 +118,7 @@ applet_key_cb (GtkWidget         *widget,
                        stickynote_show_notes (TRUE);
                        return TRUE;
        }
-       return FALSE;
+       return FALSE;
 }
 
 /* Applet Callback : Cross (enter or leave) the applet. */
@@ -205,17 +205,19 @@ void install_check_click_on_desktop (void)
 }
 
 /* Applet Callback : Change the panel orientation. */
-void applet_change_orient_cb(PanelApplet *panel_applet, PanelAppletOrient orient, StickyNotesApplet *applet)
+void
+applet_placement_changed_cb (GpApplet          *applet,
+                             GtkOrientation     orientation,
+                             GtkPositionType    position,
+                             StickyNotesApplet *self)
 {
-       applet->panel_orient = orient;
-
-       return;
+       self->panel_orient = orientation;
 }
 
 /* Applet Callback : Resize the applet. */
 void applet_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, StickyNotesApplet *applet)
 {
-       if ((applet->panel_orient == PANEL_APPLET_ORIENT_UP) || (applet->panel_orient == 
PANEL_APPLET_ORIENT_DOWN)) {
+       if (applet->panel_orient == GTK_ORIENTATION_HORIZONTAL) {
          if (applet->panel_size == allocation->height)
            return;
          applet->panel_size = allocation->height;
@@ -231,7 +233,7 @@ void applet_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, Stick
 }
 
 /* Applet Callback : Deletes the applet. */
-void applet_destroy_cb (PanelApplet *panel_applet, StickyNotesApplet *applet)
+void applet_destroy_cb (GtkWidget *widget, StickyNotesApplet *applet)
 {
        GList *notes;
 
@@ -240,9 +242,6 @@ void applet_destroy_cb (PanelApplet *panel_applet, StickyNotesApplet *applet)
        if (applet->destroy_all_dialog != NULL)
                gtk_widget_destroy (applet->destroy_all_dialog);
 
-       if (applet->action_group)
-               g_object_unref (applet->action_group);
-
        if (stickynotes->applets != NULL)
                stickynotes->applets = g_list_remove (stickynotes->applets, applet);
 
@@ -303,7 +302,7 @@ void menu_destroy_all_cb(GSimpleAction *action, GVariant *parameter, gpointer us
 
        if (applet->destroy_all_dialog != NULL) {
                gtk_window_set_screen (GTK_WINDOW (applet->destroy_all_dialog),
-                                      gtk_widget_get_screen (GTK_WIDGET (applet->w_applet)));
+                                      gtk_widget_get_screen (GTK_WIDGET (applet)));
 
                gtk_window_present (GTK_WINDOW (applet->destroy_all_dialog));
                return;
@@ -318,7 +317,7 @@ void menu_destroy_all_cb(GSimpleAction *action, GVariant *parameter, gpointer us
                          applet);
 
        gtk_window_set_screen (GTK_WINDOW (applet->destroy_all_dialog),
-                       gtk_widget_get_screen (applet->w_applet));
+                       gtk_widget_get_screen (GTK_WIDGET (applet)));
 
        gtk_widget_show_all (applet->destroy_all_dialog);
 }
@@ -344,7 +343,7 @@ void menu_preferences_cb(GSimpleAction *action, GVariant *parameter, gpointer us
 {
        StickyNotesApplet *applet = (StickyNotesApplet *) user_data;
        stickynotes_applet_update_prefs();
-       gtk_window_set_screen(GTK_WINDOW(stickynotes->w_prefs), gtk_widget_get_screen(applet->w_applet));
+       gtk_window_set_screen(GTK_WINDOW(stickynotes->w_prefs), gtk_widget_get_screen(GTK_WIDGET (applet)));
        gtk_window_present(GTK_WINDOW(stickynotes->w_prefs));
 }
 
@@ -353,7 +352,7 @@ void menu_help_cb(GSimpleAction *action, GVariant *parameter, gpointer user_data
 {
        StickyNotesApplet *applet = (StickyNotesApplet *) user_data;
        GError *error = NULL;
-       gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet->w_applet)),
+       gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet)),
                        "help:stickynotes_applet",
                        gtk_get_current_event_time (),
                        &error);
@@ -362,7 +361,7 @@ void menu_help_cb(GSimpleAction *action, GVariant *parameter, gpointer user_data
                                                           _("There was an error displaying help: %s"), 
error->message);
                g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(gtk_widget_destroy), NULL);
                gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
-               gtk_window_set_screen (GTK_WINDOW(dialog), gtk_widget_get_screen(applet->w_applet));
+               gtk_window_set_screen (GTK_WINDOW(dialog), gtk_widget_get_screen(GTK_WIDGET (applet)));
                gtk_widget_show(dialog);
                g_error_free(error);
        }
diff --git a/sticky-notes/src/stickynotes_applet_callbacks.h 
b/gnome-applets/sticky-notes/sticky-notes-applet-callbacks.h
similarity index 91%
rename from sticky-notes/src/stickynotes_applet_callbacks.h
rename to gnome-applets/sticky-notes/sticky-notes-applet-callbacks.h
index 078c00ff5..3b66411a5 100644
--- a/sticky-notes/src/stickynotes_applet_callbacks.h
+++ b/gnome-applets/sticky-notes/sticky-notes-applet-callbacks.h
@@ -15,20 +15,20 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "stickynotes_applet.h"
-
 #ifndef __STICKYNOTES_APPLET_CALLBACKS_H__
 #define __STICKYNOTES_APPLET_CALLBACKS_H__
 
+#include "sticky-notes-applet.h"
+
 /* Callbacks for the sticky notes applet */
 gboolean applet_button_cb(GtkWidget *widget, GdkEventButton *event, StickyNotesApplet *applet);
 gboolean applet_key_cb(GtkWidget *widget, GdkEventKey *event, StickyNotesApplet *applet);
 gboolean applet_cross_cb(GtkWidget *widget, GdkEventCrossing *event, StickyNotesApplet *applet);
 gboolean applet_focus_cb(GtkWidget *widget, GdkEventFocus *event, StickyNotesApplet *applet);
 void install_check_click_on_desktop (void);
-void applet_change_orient_cb(PanelApplet *panel_applet, PanelAppletOrient orient, StickyNotesApplet *applet);
+void applet_placement_changed_cb(GpApplet *applet, GtkOrientation orientation, GtkPositionType position, 
StickyNotesApplet *self);
 void applet_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, StickyNotesApplet *applet);
-void applet_destroy_cb (PanelApplet *panel_applet, StickyNotesApplet *applet);
+void applet_destroy_cb (GtkWidget *widget, StickyNotesApplet *applet);
 /* Callbacks for sticky notes applet menu */
 void menu_create_cb(GSimpleAction *action, GVariant *parameter, gpointer user_data);
 void menu_new_note_cb(GSimpleAction *action, GVariant *parameter, gpointer user_data);
diff --git a/sticky-notes/src/stickynotes_applet.c b/gnome-applets/sticky-notes/sticky-notes-applet.c
similarity index 78%
rename from sticky-notes/src/stickynotes_applet.c
rename to gnome-applets/sticky-notes/sticky-notes-applet.c
index 6f23512cb..f990be7c0 100644
--- a/sticky-notes/src/stickynotes_applet.c
+++ b/gnome-applets/sticky-notes/sticky-notes-applet.c
@@ -15,19 +15,26 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
+#include "sticky-notes-applet.h"
+
 #include <string.h>
-#include "stickynotes_applet.h"
-#include "stickynotes_applet_callbacks.h"
-#include "stickynotes.h"
+
+#include "sticky-notes-applet-callbacks.h"
+#include "sticky-notes.h"
 #include "gsettings.h"
 
 #include <gtk/gtk.h>
 
-#define GRESOURCE "/org/gnome/gnome-applets/sticky-notes/"
+G_DEFINE_TYPE (StickyNotesApplet, sticky_notes_applet, GP_TYPE_APPLET)
 
 StickyNotes *stickynotes = NULL;
 
+static void sticky_notes_init       (GpApplet          *applet);
+static void sticky_notes_init_prefs (void);
+
+static void sticky_notes_applet_new (StickyNotesApplet *self);
+
 /* Popup menu on the applet */
 static const GActionEntry stickynotes_applet_menu_actions [] = {
        { "new-note",    menu_new_note_cb,    NULL, NULL,    NULL },
@@ -36,35 +43,47 @@ static const GActionEntry stickynotes_applet_menu_actions [] = {
        { "destroy-all", menu_destroy_all_cb, NULL, NULL,    NULL },
        { "preferences", menu_preferences_cb, NULL, NULL,    NULL },
        { "help",        menu_help_cb,        NULL, NULL,    NULL },
-       { "about",       menu_about_cb,       NULL, NULL,    NULL }
+       { "about",       menu_about_cb,       NULL, NULL,    NULL },
+       { NULL }
 };
 
-/* Sticky Notes applet factory */
-static gboolean stickynotes_applet_factory(PanelApplet *panel_applet, const gchar *iid, gpointer data)
+static void
+sticky_notes_applet_setup (StickyNotesApplet *self)
 {
-       if (!strcmp(iid, "StickyNotesApplet")) {
-               if (!stickynotes)
-                       stickynotes_applet_init (panel_applet);
+  if (stickynotes == NULL)
+    sticky_notes_init (GP_APPLET (self));
 
-               panel_applet_set_flags (panel_applet, PANEL_APPLET_EXPAND_MINOR);
+  sticky_notes_applet_new (self);
 
-               /* Add applet to linked list of all applets */
-               stickynotes->applets = g_list_append (stickynotes->applets, 
stickynotes_applet_new(panel_applet));
+  /* Add applet to linked list of all applets */
+  stickynotes->applets = g_list_append (stickynotes->applets, self);
 
-               stickynotes_applet_update_menus ();
-               stickynotes_applet_update_tooltips ();
+  stickynotes_applet_update_menus ();
+  stickynotes_applet_update_tooltips ();
+}
 
-               return TRUE;
-       }
+static void
+sticky_notes_applet_constructed (GObject *object)
+{
+  G_OBJECT_CLASS (sticky_notes_applet_parent_class)->constructed (object);
+  sticky_notes_applet_setup (STICKY_NOTES_APPLET (object));
+}
+
+static void
+sticky_notes_applet_class_init (StickyNotesAppletClass *self_class)
+{
+  GObjectClass *object_class;
+
+  object_class = G_OBJECT_CLASS (self_class);
 
-       return FALSE;
+  object_class->constructed = sticky_notes_applet_constructed;
 }
 
-/* Sticky Notes applet factory */
-PANEL_APPLET_IN_PROCESS_FACTORY("StickyNotesAppletFactory",
-                                PANEL_TYPE_APPLET,
-                                stickynotes_applet_factory,
-                                NULL)
+static void
+sticky_notes_applet_init (StickyNotesApplet *self)
+{
+  gp_applet_set_flags (GP_APPLET (self), GP_APPLET_FLAGS_EXPAND_MINOR);
+}
 
 /* colorshift a pixbuf */
 static void
@@ -107,19 +126,16 @@ stickynotes_make_prelight_icon (GdkPixbuf *dest, GdkPixbuf *src, int shift)
 }
 
 /* Create and initalize global sticky notes instance */
-void
-stickynotes_applet_init (PanelApplet *panel_applet)
+static void
+sticky_notes_init (GpApplet *applet)
 {
        stickynotes = g_new(StickyNotes, 1);
 
        stickynotes->notes = NULL;
        stickynotes->applets = NULL;
-       stickynotes->settings = panel_applet_settings_new (panel_applet, STICKYNOTES_SCHEMA);
+       stickynotes->settings = gp_applet_settings_new (applet, STICKYNOTES_SCHEMA);
        stickynotes->last_timeout_data = 0;
 
-       gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
-                                          PKG_DATA_DIR G_DIR_SEPARATOR_S "icons");
-
        stickynotes->icon_normal = gtk_icon_theme_load_icon (
                        gtk_icon_theme_get_default (),
                        "gnome-sticky-notes-applet",
@@ -136,7 +152,7 @@ stickynotes_applet_init (PanelApplet *panel_applet)
                        stickynotes->icon_normal, 30);
        stickynotes->visible = TRUE;
 
-       stickynotes_applet_init_prefs();
+       sticky_notes_init_prefs ();
 
        g_signal_connect (stickynotes->settings, "changed",
                          G_CALLBACK (preferences_apply_cb), NULL);
@@ -145,18 +161,18 @@ stickynotes_applet_init (PanelApplet *panel_applet)
        stickynotes->max_height = 0.8*gdk_screen_get_height( gdk_screen_get_default() );
 
        /* Load sticky notes */
-       stickynotes_load (gtk_widget_get_screen (GTK_WIDGET (panel_applet)));
+       stickynotes_load (gtk_widget_get_screen (GTK_WIDGET (applet)));
 
        install_check_click_on_desktop ();
 }
 
-void stickynotes_applet_init_prefs(void)
+static void
+sticky_notes_init_prefs (void)
 {
-
        stickynotes->builder = gtk_builder_new ();
 
        gtk_builder_add_from_resource (stickynotes->builder,
-                                      GRESOURCE "sticky-notes-preferences.ui",
+                                      GRESOURCE_PREFIX "/ui/sticky-notes-preferences.ui",
                                       NULL);
 
        stickynotes->w_prefs = GTK_WIDGET (gtk_builder_get_object (stickynotes->builder,
@@ -283,18 +299,14 @@ void stickynotes_applet_init_prefs(void)
 }
 
 /* Create a Sticky Notes applet */
-StickyNotesApplet *
-stickynotes_applet_new (PanelApplet *panel_applet)
+static void
+sticky_notes_applet_new (StickyNotesApplet *applet)
 {
        AtkObject *atk_obj;
        const gchar *resource_name;
        GAction *action;
 
-       /* Create Sticky Notes Applet */
-       StickyNotesApplet *applet = g_new(StickyNotesApplet, 1);
-
        /* Initialize Sticky Notes Applet */
-       applet->w_applet = GTK_WIDGET(panel_applet);
        applet->w_image = gtk_image_new();
        applet->destroy_all_dialog = NULL;
        applet->prelighted = FALSE;
@@ -302,62 +314,47 @@ stickynotes_applet_new (PanelApplet *panel_applet)
 
        applet->menu_tip = NULL;
 
-       /* Expand the applet for Fitts' law complience. */
-       panel_applet_set_flags(panel_applet, PANEL_APPLET_EXPAND_MINOR);
-
        /* Add the applet icon */
-       gtk_container_add(GTK_CONTAINER(panel_applet), applet->w_image);
-       applet->panel_orient = panel_applet_get_orient (panel_applet);
+       gtk_container_add(GTK_CONTAINER(applet), applet->w_image);
+       applet->panel_orient = gp_applet_get_orientation (GP_APPLET (applet));
        stickynotes_applet_update_icon(applet);
 
        /* Add the popup menu */
-       applet->action_group = g_simple_action_group_new ();
-       g_action_map_add_action_entries (G_ACTION_MAP (applet->action_group),
-                                        stickynotes_applet_menu_actions,
-                                        G_N_ELEMENTS (stickynotes_applet_menu_actions),
-                                        applet);
-
-       resource_name = GRESOURCE "sticky-notes-applet-menu.xml";
-       panel_applet_setup_menu_from_resource (panel_applet,
-                                              resource_name,
-                                              applet->action_group,
-                                              GETTEXT_PACKAGE);
-
-       gtk_widget_insert_action_group (GTK_WIDGET (panel_applet), "stickynotes",
-                                       G_ACTION_GROUP (applet->action_group));
-
-       action = g_action_map_lookup_action (G_ACTION_MAP (applet->action_group), "preferences");
-       g_object_bind_property (panel_applet, "locked-down",
+       resource_name = GRESOURCE_PREFIX "/ui/sticky-notes-applet-menu.xml";
+       gp_applet_setup_menu_from_resource (GP_APPLET (applet),
+                                           resource_name,
+                                           stickynotes_applet_menu_actions);
+
+       action = gp_applet_menu_lookup_action (GP_APPLET (applet), "preferences");
+       g_object_bind_property (applet, "locked-down",
                                action, "enabled",
                                G_BINDING_DEFAULT|G_BINDING_INVERT_BOOLEAN|G_BINDING_SYNC_CREATE);
 
        /* Connect all signals for applet management */
-       g_signal_connect(G_OBJECT(applet->w_applet), "button-press-event",
+       g_signal_connect(applet, "button-press-event",
                        G_CALLBACK(applet_button_cb), applet);
-       g_signal_connect(G_OBJECT(applet->w_applet), "key-press-event",
+       g_signal_connect(applet, "key-press-event",
                        G_CALLBACK(applet_key_cb), applet);
-       g_signal_connect(G_OBJECT(applet->w_applet), "focus-in-event",
+       g_signal_connect(applet, "focus-in-event",
                        G_CALLBACK(applet_focus_cb), applet);
-       g_signal_connect(G_OBJECT(applet->w_applet), "focus-out-event",
+       g_signal_connect(applet, "focus-out-event",
                        G_CALLBACK(applet_focus_cb), applet);
-       g_signal_connect(G_OBJECT(applet->w_applet), "enter-notify-event",
+       g_signal_connect(applet, "enter-notify-event",
                        G_CALLBACK(applet_cross_cb), applet);
-       g_signal_connect(G_OBJECT(applet->w_applet), "leave-notify-event",
+       g_signal_connect(applet, "leave-notify-event",
                        G_CALLBACK(applet_cross_cb), applet);
-       g_signal_connect(G_OBJECT(applet->w_applet), "size-allocate",
+       g_signal_connect(applet, "size-allocate",
                        G_CALLBACK(applet_size_allocate_cb), applet);
-       g_signal_connect(G_OBJECT(applet->w_applet), "change-orient",
-                       G_CALLBACK(applet_change_orient_cb), applet);
-       g_signal_connect(G_OBJECT(applet->w_applet), "destroy",
+       g_signal_connect(applet, "placement-changed",
+                       G_CALLBACK(applet_placement_changed_cb), applet);
+       g_signal_connect(applet, "destroy",
                        G_CALLBACK(applet_destroy_cb), applet);
 
-       atk_obj = gtk_widget_get_accessible (applet->w_applet);
+       atk_obj = gtk_widget_get_accessible (GTK_WIDGET (applet));
        atk_object_set_name (atk_obj, _("Sticky Notes"));
 
        /* Show the applet */
-       gtk_widget_show_all(GTK_WIDGET(applet->w_applet));
-
-       return applet;
+       gtk_widget_show_all (GTK_WIDGET (applet));
 }
 
 void stickynotes_applet_update_icon(StickyNotesApplet *applet)
@@ -371,9 +368,9 @@ void stickynotes_applet_update_icon(StickyNotesApplet *applet)
 
        /* Choose appropriate icon and size it */
        if (applet->prelighted)
-               pixbuf1 = gdk_pixbuf_scale_simple(stickynotes->icon_prelight, size, size, 
GDK_INTERP_BILINEAR);
+               pixbuf1 = gdk_pixbuf_scale_simple(stickynotes->icon_prelight, size, size, 
GDK_INTERP_BILINEAR);
        else
-               pixbuf1 = gdk_pixbuf_scale_simple(stickynotes->icon_normal, size, size, GDK_INTERP_BILINEAR);
+               pixbuf1 = gdk_pixbuf_scale_simple(stickynotes->icon_normal, size, size, GDK_INTERP_BILINEAR);
 
        if (!pixbuf1)
                return;
@@ -495,9 +492,9 @@ void stickynotes_applet_update_menus(void)
        for (l = stickynotes->applets; l != NULL; l = l->next) {
                StickyNotesApplet *applet = l->data;
 
-               GSimpleAction *action = (GSimpleAction *) g_action_map_lookup_action (G_ACTION_MAP 
(applet->action_group), "lock");
-               g_simple_action_set_enabled (action, locked_writable);
-               g_simple_action_set_state (action, g_variant_new_boolean (locked));
+               GAction *action = gp_applet_menu_lookup_action (GP_APPLET (applet), "lock");
+               g_simple_action_set_enabled (G_SIMPLE_ACTION (action), locked_writable);
+               g_simple_action_set_state (G_SIMPLE_ACTION (action), g_variant_new_boolean (locked));
        }
 }
 
@@ -517,7 +514,7 @@ stickynotes_applet_update_tooltips (void)
        for (l = stickynotes->applets; l; l = l->next)
        {
                applet = l->data;
-               gtk_widget_set_tooltip_text (applet->w_applet, tooltip);
+               gtk_widget_set_tooltip_text (GTK_WIDGET (applet), tooltip);
 
                if (applet->menu_tip)
                        gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (
diff --git a/sticky-notes/src/stickynotes_applet.h b/gnome-applets/sticky-notes/sticky-notes-applet.h
similarity index 76%
rename from sticky-notes/src/stickynotes_applet.h
rename to gnome-applets/sticky-notes/sticky-notes-applet.h
index d3acb32b8..136dfa3fc 100644
--- a/sticky-notes/src/stickynotes_applet.h
+++ b/gnome-applets/sticky-notes/sticky-notes-applet.h
@@ -22,20 +22,18 @@
 #include <gdk/gdk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
-#include <panel-applet.h>
+#include <libgnome-panel/gp-applet.h>
 
 #define IS_STRING_EMPTY(x) ((x) == NULL || (x)[0] == '\0')
 
-#define STICKYNOTES_STOCK_LOCKED       "stickynotes-stock-locked"
-#define STICKYNOTES_STOCK_UNLOCKED     "stickynotes-stock-unlocked"
-#define STICKYNOTES_STOCK_CLOSE        "stickynotes-stock-close"
-#define STICKYNOTES_STOCK_RESIZE_SE    "stickynotes-stock-resize-se"
-#define STICKYNOTES_STOCK_RESIZE_SW    "stickynotes-stock-resize-sw"
+#define STICKY_NOTES_TYPE_APPLET (sticky_notes_applet_get_type ())
+G_DECLARE_FINAL_TYPE (StickyNotesApplet, sticky_notes_applet,
+                      STICKY_NOTES, APPLET, GpApplet)
 
 /* Global Sticky Notes instance */
 typedef struct
 {
-       GtkBuilder *builder;            
+       GtkBuilder *builder;
 
        GtkWidget *w_prefs;             /* The prefs dialog */
        GtkAdjustment *w_prefs_width;
@@ -51,7 +49,7 @@ typedef struct
 
        GList *notes;                   /* Linked-List of all the sticky notes */
        GList *applets;                 /* Linked-List of all the applets */
-       
+
        GdkPixbuf *icon_normal;         /* Normal applet icon */
        GdkPixbuf *icon_prelight;       /* Prelighted applet icon */
 
@@ -64,45 +62,37 @@ typedef struct
 } StickyNotes;
 
 /* Sticky Notes Applet */
-typedef struct
+struct _StickyNotesApplet
 {
-       GtkWidget *w_applet;            /* The applet */
+  GpApplet parent;
+
        GtkWidget *w_image;             /* The applet icon */
 
        GtkWidget *destroy_all_dialog;  /* The applet it's destroy all dialog */
-       
+
        gboolean prelighted;            /* Whether applet is prelighted */
        gboolean pressed;               /* Whether applet is pressed */
 
        gint panel_size;
-       PanelAppletOrient panel_orient;
+       GtkOrientation panel_orient;
 
-       GSimpleActionGroup *action_group;
        GtkWidget *menu_tip;
-} StickyNotesApplet;
-       
+};
+
 typedef enum
 {
        STICKYNOTES_NEW = 0,
        STICKYNOTES_SET_VISIBLE,
        STICKYNOTES_SET_LOCKED
-
 } StickyNotesDefaultAction;
 
 extern StickyNotes *stickynotes;
 
-void stickynotes_applet_init(PanelApplet *panel_applet);
-void stickynotes_applet_init_prefs(void);
-
-StickyNotesApplet * stickynotes_applet_new(PanelApplet *panel_applet);
-
 void stickynotes_applet_update_icon(StickyNotesApplet *applet);
 void stickynotes_applet_update_prefs(void);
 void stickynotes_applet_update_menus(void);
 void stickynotes_applet_update_tooltips(void);
 
-void stickynotes_applet_do_default_action(GdkScreen *screen);
-
 void stickynotes_applet_panel_icon_get_geometry (int *x, int *y, int *width, int *height);
 
 #endif /* __STICKYNOTES_APPLET_H__ */
diff --git a/sticky-notes/src/stickynotes_callbacks.c b/gnome-applets/sticky-notes/sticky-notes-callbacks.c
similarity index 99%
rename from sticky-notes/src/stickynotes_callbacks.c
rename to gnome-applets/sticky-notes/sticky-notes-callbacks.c
index 8a2eee453..aa696edbc 100644
--- a/sticky-notes/src/stickynotes_callbacks.c
+++ b/gnome-applets/sticky-notes/sticky-notes-callbacks.c
@@ -15,8 +15,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
-#include "stickynotes_callbacks.h"
+#include "config.h"
+#include "sticky-notes-callbacks.h"
 
 /* Sticky Window Callback : Lock/Unlock the window */
 gboolean
@@ -34,7 +34,7 @@ stickynote_close_cb (GtkWidget  *widget,
                      StickyNote *note)
 {
        stickynotes_remove (note);
-       
+
        return TRUE;
 }
 
@@ -54,7 +54,7 @@ stickynote_resize_cb (GtkWidget      *widget,
        }
        else
                return FALSE;
-                       
+
        return TRUE;
 }
 
@@ -184,7 +184,7 @@ properties_apply_color_cb (StickyNote *note)
 {
        char *color_str = NULL;
        char *font_color_str = NULL;
-       
+
        if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (note->w_def_color)))
        {
                GdkRGBA color;
diff --git a/sticky-notes/src/stickynotes_callbacks.h b/gnome-applets/sticky-notes/sticky-notes-callbacks.h
similarity index 99%
rename from sticky-notes/src/stickynotes_callbacks.h
rename to gnome-applets/sticky-notes/sticky-notes-callbacks.h
index 2f7e067d9..5ebb02361 100644
--- a/sticky-notes/src/stickynotes_callbacks.h
+++ b/gnome-applets/sticky-notes/sticky-notes-callbacks.h
@@ -18,7 +18,7 @@
 #ifndef __STICKYNOTES_CALLBACKS_H__
 #define __STICKYNOTES_CALLBACKS_H__
 
-#include "stickynotes.h"
+#include "sticky-notes.h"
 
 /* Callbacks for the sticky notes windows */
 gboolean stickynote_toggle_lock_cb(GtkWidget *widget, StickyNote *note);
diff --git a/sticky-notes/src/stickynotes.c b/gnome-applets/sticky-notes/sticky-notes.c
similarity index 95%
rename from sticky-notes/src/stickynotes.c
rename to gnome-applets/sticky-notes/sticky-notes.c
index 2be170321..975fe1625 100644
--- a/sticky-notes/src/stickynotes.c
+++ b/gnome-applets/sticky-notes/sticky-notes.c
@@ -23,15 +23,15 @@
 #include <libwnck/libwnck.h>
 #include <string.h>
 
-#include "stickynotes.h"
-#include "stickynotes_callbacks.h"
+#include "sticky-notes.h"
+#include "sticky-notes-callbacks.h"
 #include "util.h"
-#include "stickynotes_applet.h"
+#include "sticky-notes-applet.h"
 #include "gsettings.h"
 
-#define GRESOURCE "/org/gnome/gnome-applets/sticky-notes/"
 /* Stop gcc complaining about xmlChar's signedness */
 #define XML_CHAR(str) ((xmlChar *) (str))
+
 #define STICKYNOTES_ICON_SIZE 8
 
 static gboolean save_scheduled = FALSE;
@@ -60,7 +60,7 @@ setup_note_menu (StickyNote *note)
                                         G_N_ELEMENTS (stickynotes_note_menu_actions),
                                         note);
 
-       resource_name = GRESOURCE "sticky-notes-note-menu.xml";
+       resource_name = GRESOURCE_PREFIX "/ui/sticky-notes-note-menu.xml";
        builder = gtk_builder_new_from_resource (resource_name);
 
        gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
@@ -76,6 +76,26 @@ setup_note_menu (StickyNote *note)
        g_object_unref (action_group);
 }
 
+static void
+set_image_from_name (GtkImage   *image,
+                     const char *name)
+{
+  char *resource_path;
+  GdkPixbuf *pixbuf;
+
+  resource_path = g_build_filename (GRESOURCE_PREFIX "/icons/", name, NULL);
+  pixbuf = gdk_pixbuf_new_from_resource_at_scale (resource_path,
+                                                  STICKYNOTES_ICON_SIZE,
+                                                  STICKYNOTES_ICON_SIZE,
+                                                  TRUE,
+                                                  NULL);
+
+  g_free (resource_path);
+
+  gtk_image_set_from_pixbuf (image, pixbuf);
+  g_object_unref (pixbuf);
+}
+
 /* Based on a function found in wnck */
 static void
 set_icon_geometry  (GdkWindow *window,
@@ -141,9 +161,11 @@ stickynote_new_aux (GdkScreen *screen, gint x, gint y, gint w, gint h)
 
        builder = gtk_builder_new ();
        gtk_builder_add_from_resource (builder,
-                                      GRESOURCE "sticky-notes-note.ui", NULL);
+                                      GRESOURCE_PREFIX "/ui/sticky-notes-note.ui",
+                                      NULL);
        gtk_builder_add_from_resource (builder,
-                                      GRESOURCE "sticky-notes-properties.ui", NULL);
+                                      GRESOURCE_PREFIX "/ui/sticky-notes-properties.ui",
+                                      NULL);
 
        note->w_window = GTK_WIDGET (gtk_builder_get_object (builder, "stickynote_window"));
        gtk_window_set_screen(GTK_WINDOW(note->w_window),screen);
@@ -227,14 +249,9 @@ stickynote_new_aux (GdkScreen *screen, gint x, gint y, gint w, gint h)
                                note->y);
 
        /* Set the button images */
-       gtk_image_set_from_icon_name (note->img_close, STICKYNOTES_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
-       gtk_image_set_pixel_size (note->img_close, STICKYNOTES_ICON_SIZE);
-
-       gtk_image_set_from_icon_name (note->img_resize_se, STICKYNOTES_STOCK_RESIZE_SE, GTK_ICON_SIZE_MENU);
-       gtk_image_set_pixel_size (note->img_resize_se, STICKYNOTES_ICON_SIZE);
-
-       gtk_image_set_from_icon_name (note->img_resize_sw, STICKYNOTES_STOCK_RESIZE_SW, GTK_ICON_SIZE_MENU);
-       gtk_image_set_pixel_size (note->img_resize_sw, STICKYNOTES_ICON_SIZE);
+       set_image_from_name (note->img_close, "sticky-notes-stock-close.png");
+       set_image_from_name (note->img_resize_se, "sticky-notes-stock-resize-se.png");
+       set_image_from_name (note->img_resize_sw, "sticky-notes-stock-resize-sw.png");
 
        gtk_widget_show(note->w_lock);
        gtk_widget_show(note->w_close);
@@ -761,11 +778,11 @@ stickynote_set_locked (StickyNote *note,
 
        /* Show appropriate icon and tooltip */
        if (locked) {
-               gtk_image_set_from_icon_name (note->img_lock, STICKYNOTES_STOCK_LOCKED, GTK_ICON_SIZE_MENU);
+               set_image_from_name (note->img_lock, "sticky-notes-stock-locked.png");
                gtk_widget_set_tooltip_text(note->w_lock, _("This note is locked."));
        }
        else {
-               gtk_image_set_from_icon_name (note->img_lock, STICKYNOTES_STOCK_UNLOCKED, GTK_ICON_SIZE_MENU);
+               set_image_from_name (note->img_lock, "sticky-notes-stock-unlocked.png");
                gtk_widget_set_tooltip_text(note->w_lock, _("This note is unlocked."));
        }
 
@@ -846,7 +863,8 @@ void stickynotes_remove(StickyNote *note)
 
        builder = gtk_builder_new ();
        gtk_builder_add_from_resource (builder,
-                                      GRESOURCE "sticky-notes-delete.ui", NULL);
+                                      GRESOURCE_PREFIX "/ui/sticky-notes-delete.ui",
+                                      NULL);
 
        dialog = GTK_WIDGET (gtk_builder_get_object (builder, "delete_dialog"));
 
diff --git a/sticky-notes/src/stickynotes.h b/gnome-applets/sticky-notes/sticky-notes.h
similarity index 99%
rename from sticky-notes/src/stickynotes.h
rename to gnome-applets/sticky-notes/sticky-notes.h
index bc1e2b324..756a0cf5f 100644
--- a/sticky-notes/src/stickynotes.h
+++ b/gnome-applets/sticky-notes/sticky-notes.h
@@ -20,7 +20,7 @@
 
 #define WNCK_I_KNOW_THIS_IS_UNSTABLE 1
 #include <libwnck/libwnck.h>
-#include "stickynotes_applet.h"
+#include "sticky-notes-applet.h"
 
 typedef struct
 {
diff --git a/gnome-applets/sticky-notes/ui/sticky-notes-applet-menu.xml 
b/gnome-applets/sticky-notes/ui/sticky-notes-applet-menu.xml
new file mode 100644
index 000000000..be3b04799
--- /dev/null
+++ b/gnome-applets/sticky-notes/ui/sticky-notes-applet-menu.xml
@@ -0,0 +1,36 @@
+<interface>
+  <menu id="sticky-notes-menu">
+    <section>
+    <item>
+      <attribute name="label" translatable="yes">_New Note</attribute>
+      <attribute name="action">sticky-notes.new-note</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">Hi_de Notes</attribute>
+      <attribute name="action">sticky-notes.hide-notes</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">_Lock Notes</attribute>
+      <attribute name="action">sticky-notes.lock</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">_Delete Notes</attribute>
+      <attribute name="action">sticky-notes.destroy-all</attribute>
+    </item>
+  </section>
+  <section>
+    <item>
+      <attribute name="label" translatable="yes">_Preferences</attribute>
+      <attribute name="action">sticky-notes.preferences</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <attribute name="action">sticky-notes.help</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">_About</attribute>
+      <attribute name="action">sticky-notes.about</attribute>
+    </item>
+    </section>
+  </menu>
+</interface>
diff --git a/sticky-notes/src/sticky-notes-delete-all.ui 
b/gnome-applets/sticky-notes/ui/sticky-notes-delete-all.ui
similarity index 100%
rename from sticky-notes/src/sticky-notes-delete-all.ui
rename to gnome-applets/sticky-notes/ui/sticky-notes-delete-all.ui
diff --git a/sticky-notes/src/sticky-notes-delete.ui b/gnome-applets/sticky-notes/ui/sticky-notes-delete.ui
similarity index 100%
rename from sticky-notes/src/sticky-notes-delete.ui
rename to gnome-applets/sticky-notes/ui/sticky-notes-delete.ui
diff --git a/sticky-notes/src/sticky-notes-note-menu.xml 
b/gnome-applets/sticky-notes/ui/sticky-notes-note-menu.xml
similarity index 100%
rename from sticky-notes/src/sticky-notes-note-menu.xml
rename to gnome-applets/sticky-notes/ui/sticky-notes-note-menu.xml
diff --git a/sticky-notes/src/sticky-notes-note.ui b/gnome-applets/sticky-notes/ui/sticky-notes-note.ui
similarity index 100%
rename from sticky-notes/src/sticky-notes-note.ui
rename to gnome-applets/sticky-notes/ui/sticky-notes-note.ui
diff --git a/sticky-notes/src/sticky-notes-preferences.ui 
b/gnome-applets/sticky-notes/ui/sticky-notes-preferences.ui
similarity index 100%
rename from sticky-notes/src/sticky-notes-preferences.ui
rename to gnome-applets/sticky-notes/ui/sticky-notes-preferences.ui
diff --git a/sticky-notes/src/sticky-notes-properties.ui 
b/gnome-applets/sticky-notes/ui/sticky-notes-properties.ui
similarity index 100%
rename from sticky-notes/src/sticky-notes-properties.ui
rename to gnome-applets/sticky-notes/ui/sticky-notes-properties.ui
diff --git a/sticky-notes/src/util.c b/gnome-applets/sticky-notes/util.c
similarity index 94%
rename from sticky-notes/src/util.c
rename to gnome-applets/sticky-notes/util.c
index 59efe6abb..0e4bc8d3a 100644
--- a/sticky-notes/src/util.c
+++ b/gnome-applets/sticky-notes/util.c
@@ -30,20 +30,20 @@
  * looks like this: "Nov 30, '78" */
 gchar * get_current_date(const gchar *format)
 {
-       time_t clock = time(NULL);
-       struct tm *current = localtime(&clock);
+       time_t clock = time(NULL);
+       struct tm *current = localtime(&clock);
 
        gint date_length = 10;
-       gchar *date = g_new(gchar, date_length);
-       
+       gchar *date = g_new(gchar, date_length);
+
        do
        {
                date_length += 5;
                date = (gchar *) g_renew(gchar, date, date_length);
        }
-       while(strftime(date, date_length, format, current) == 0);
-       
-       return date;
+       while(strftime(date, date_length, format, current) == 0);
+
+       return date;
 }
 
 static Atom
@@ -101,14 +101,14 @@ xstuff_get_current_workspace (GtkWindow *window)
                                     &bytes_after, (gpointer) &num);
        if (gdk_error_trap_pop () || result != Success)
                return -1;
- 
+
        if (type != XA_CARDINAL) {
                XFree (num);
                return -1;
        }
 
        retval = *num;
- 
+
        XFree (num);
 
        return retval;
@@ -125,7 +125,7 @@ xstuff_change_workspace (GtkWindow *window,
   gdk_display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
   xwindow = GDK_WINDOW_XID (GDK_WINDOW (gtk_widget_get_window (GTK_WIDGET (window))));
   screen = GDK_SCREEN_XSCREEN (gtk_widget_get_screen (GTK_WIDGET (window)));
-  
+
   xev.xclient.type = ClientMessage;
   xev.xclient.serial = 0;
   xev.xclient.send_event = True;
diff --git a/sticky-notes/src/util.h b/gnome-applets/sticky-notes/util.h
similarity index 100%
rename from sticky-notes/src/util.h
rename to gnome-applets/sticky-notes/util.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 58acae1a0..f4a6f8ce2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -58,6 +58,17 @@ gnome-applets/mini-commander/preferences.c
 [type: gettext/glade]gnome-applets/netspeed/netspeed-menu.xml
 gnome-applets/netspeed/netspeed-applet.c
 gnome-applets/netspeed/preferences.c
+gnome-applets/sticky-notes/sticky-notes-applet.c
+gnome-applets/sticky-notes/sticky-notes-applet-callbacks.c
+gnome-applets/sticky-notes/sticky-notes-callbacks.c
+gnome-applets/sticky-notes/sticky-notes.c
+[type: gettext/glade]gnome-applets/sticky-notes/sticky-notes-applet-menu.xml
+[type: gettext/glade]gnome-applets/sticky-notes/sticky-notes-delete-all.ui
+[type: gettext/glade]gnome-applets/sticky-notes/sticky-notes-delete.ui
+[type: gettext/glade]gnome-applets/sticky-notes/sticky-notes-note-menu.xml
+[type: gettext/glade]gnome-applets/sticky-notes/sticky-notes-note.ui
+[type: gettext/glade]gnome-applets/sticky-notes/sticky-notes-preferences.ui
+[type: gettext/glade]gnome-applets/sticky-notes/sticky-notes-properties.ui
 [type: gettext/glade]gnome-applets/timer/timer-applet-menu.xml
 gnome-applets/timer/timer-applet.c
 gnome-applets/tracker-search-bar/tracker-applet.c
@@ -84,18 +95,6 @@ multiload/src/load-graph.c
 multiload/src/main.c
 multiload/src/netspeed.c
 multiload/src/properties.c
-[type: gettext/ini]sticky-notes/data/org.gnome.applets.StickyNotesApplet.panel-applet.in.in
-sticky-notes/src/stickynotes_applet.c
-sticky-notes/src/stickynotes_applet_callbacks.c
-[type: gettext/glade]sticky-notes/src/sticky-notes-applet-menu.xml
-sticky-notes/src/stickynotes.c
-sticky-notes/src/stickynotes_callbacks.c
-[type: gettext/glade]sticky-notes/src/sticky-notes-delete-all.ui
-[type: gettext/glade]sticky-notes/src/sticky-notes-delete.ui
-[type: gettext/glade]sticky-notes/src/sticky-notes-note-menu.xml
-[type: gettext/glade]sticky-notes/src/sticky-notes-note.ui
-[type: gettext/glade]sticky-notes/src/sticky-notes-preferences.ui
-[type: gettext/glade]sticky-notes/src/sticky-notes-properties.ui
 [type: gettext/ini]window-buttons/org.gnome.panel.WindowButtonsApplet.panel-applet.in.in
 window-buttons/windowbuttons.c
 [type: gettext/glade]window-buttons/windowbuttons.ui
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 47a601a9f..f4a8c9261 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -18,5 +18,4 @@ data/schemas/org.gnome.gnome-applets.window-buttons.gschema.xml.in
 data/schemas/org.gnome.gnome-applets.window-picker-applet.gschema.xml.in
 data/schemas/org.gnome.gnome-applets.window-title.gschema.xml.in
 multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in
-sticky-notes/data/org.gnome.applets.StickyNotesApplet.panel-applet.in
 window-buttons/org.gnome.panel.WindowButtonsApplet.panel-applet.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]