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



commit b68634b95fd51fde857a00462845f809e56a84e5
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Mar 30 14:25:19 2020 +0300

    inhibit: port to libgnome-panel

 Makefile.am                                        |   2 -
 configure.ac                                       |   4 +-
 gnome-applets/Makefile.am                          |   3 +
 gnome-applets/ga-module.c                          |  11 +
 {inhibit/src => gnome-applets/inhibit}/Makefile.am |  17 +-
 gnome-applets/inhibit/inhibit-applet-menu.xml      |  10 +
 .../src => gnome-applets/inhibit}/inhibit-applet.c | 221 +++++++--------------
 gnome-applets/inhibit/inhibit-applet.h             |  31 +++
 .../inhibit}/org.gnome.SessionManager.xml          |   0
 inhibit/Makefile.am                                |  29 ---
 inhibit/inhibit-applet-menu.xml                    |   6 -
 inhibit/org.gnome.InhibitApplet.panel-applet.in.in |  15 --
 po/POTFILES.in                                     |   5 +-
 po/POTFILES.skip                                   |   1 -
 14 files changed, 138 insertions(+), 217 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index c8add9eb4..6b2580526 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,6 @@ endif
 
 always_built_SUBDIRS =  \
        drivemount      \
-       inhibit         \
        geyes           \
        mini-commander \
        multiload \
@@ -43,7 +42,6 @@ DIST_SUBDIRS = \
        sticky-notes    \
        window-buttons  \
        window-title    \
-       inhibit         \
        tracker-search-bar \
        $(NULL)
 
diff --git a/configure.ac b/configure.ac
index 7c36204dc..578edcad5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -355,6 +355,7 @@ AC_CONFIG_FILES([
   gnome-applets/cpufreq/Makefile
   gnome-applets/cpufreq/cpufreq-selector/Makefile
   gnome-applets/gweather/Makefile
+  gnome-applets/inhibit/Makefile
   gnome-applets/netspeed/Makefile
   gnome-applets/timer/Makefile
   gnome-applets/trash/Makefile
@@ -383,9 +384,6 @@ AC_CONFIG_FILES([
   drivemount/Makefile
   drivemount/src/Makefile
 
-  inhibit/Makefile
-  inhibit/src/Makefile
-
   geyes/Makefile
   geyes/src/Makefile
   geyes/themes/Makefile
diff --git a/gnome-applets/Makefile.am b/gnome-applets/Makefile.am
index ba38db074..fddced2c8 100644
--- a/gnome-applets/Makefile.am
+++ b/gnome-applets/Makefile.am
@@ -7,6 +7,7 @@ SUBDIRS = \
        command \
        cpufreq \
        gweather \
+       inhibit \
        netspeed \
        timer \
        trash \
@@ -40,6 +41,7 @@ org_gnome_gnome_applets_la_LIBADD = \
        $(top_builddir)/gnome-applets/charpick/libcharacter-picker-applet.la \
        $(top_builddir)/gnome-applets/command/libcommand-applet.la \
        $(top_builddir)/gnome-applets/gweather/libgweather-applet.la \
+       $(top_builddir)/gnome-applets/inhibit/libinhibit-applet.la \
        $(top_builddir)/gnome-applets/netspeed/libnet-speed-applet.la \
        $(top_builddir)/gnome-applets/timer/libtimer-applet.la \
        $(top_builddir)/gnome-applets/trash/libtrash-applet.la \
@@ -82,6 +84,7 @@ ui_files = \
        charpick/charpick-applet-menu.xml \
        command/command-applet-menu.xml \
        gweather/gweather-applet-menu.xml \
+       inhibit/inhibit-applet-menu.xml \
        netspeed/netspeed-menu.xml \
        timer/timer-applet-menu.xml \
        trash/trash-empty.ui \
diff --git a/gnome-applets/ga-module.c b/gnome-applets/ga-module.c
index defa204ad..4a77be826 100644
--- a/gnome-applets/ga-module.c
+++ b/gnome-applets/ga-module.c
@@ -29,6 +29,7 @@
 #include "cpufreq/cpufreq-applet.h"
 #endif
 #include "gweather/gweather-applet.h"
+#include "inhibit/inhibit-applet.h"
 #include "netspeed/netspeed-applet.h"
 #include "timer/timer-applet.h"
 #include "trash/trash-applet.h"
@@ -87,6 +88,13 @@ ga_get_applet_info (const char *id)
       description = _("Monitor the current weather conditions, and forecasts");
       icon_name = "weather-storm";
     }
+  else if (g_strcmp0 (id, "inhibit") == 0)
+    {
+      type_func = inhibit_applet_get_type;
+      name = _("Inhibit Applet");
+      description = _("Allows user to inhibit automatic power saving");
+      icon_name = "gnome-inhibit-applet";
+    }
   else if (g_strcmp0 (id, "netspeed") == 0)
     {
       type_func = netspeed_applet_get_type;
@@ -143,6 +151,8 @@ ga_get_applet_id_from_iid (const char *iid)
 #endif
   else if (g_strcmp0 (iid, "GWeatherAppletFactory::GWeatherApplet") == 0)
     return "gweather";
+  else if (g_strcmp0 (iid, "InhibitAppletFactory::InhibitApplet") == 0)
+    return "inhibit";
   else if (g_strcmp0 (iid, "NetspeedAppletFactory::NetspeedApplet") == 0)
     return "netspeed";
   else if (g_strcmp0 (iid, "TimerAppletFactory::TimerApplet") == 0)
@@ -177,6 +187,7 @@ gp_module_load (GpModule *module)
                             "cpufreq",
 #endif
                             "gweather",
+                            "inhibit",
                             "netspeed",
                             "timer",
                             "trash",
diff --git a/inhibit/src/Makefile.am b/gnome-applets/inhibit/Makefile.am
similarity index 76%
rename from inhibit/src/Makefile.am
rename to gnome-applets/inhibit/Makefile.am
index 5c1da8ed9..7120d264e 100644
--- a/inhibit/src/Makefile.am
+++ b/gnome-applets/inhibit/Makefile.am
@@ -1,40 +1,33 @@
 NULL =
 
-uidir = $(pkgdatadir)/ui
-
-inhibit_appletlibdir = $(pkglibdir)
-inhibit_appletlib_LTLIBRARIES = libinhibit-applet.la
+noinst_LTLIBRARIES = libinhibit-applet.la
 
 libinhibit_applet_la_CPPFLAGS = \
-       -I. \
-       -I$(srcdir) \
-       -DINHIBIT_MENU_UI_DIR=\""$(uidir)"\" \
-       -DGNOMELOCALEDIR=\""$(localedir)"\" \
        -DPKG_DATA_DIR=\""$(pkgdatadir)"\" \
        -DG_LOG_DOMAIN=\"org.gnome.gnome-applets.inhibit\" \
        -DG_LOG_USE_STRUCTURED=1 \
        $(NULL)
 
 libinhibit_applet_la_CFLAGS = \
-       $(GNOME_APPLETS_CFLAGS) \
+       $(GNOME_PANEL_CFLAGS) \
        $(GIO_UNIX_CFLAGS) \
        $(WARN_CFLAGS) \
        $(AM_CFLAGS) \
        $(NULL)
 
 libinhibit_applet_la_SOURCES = \
-       $(BUILT_SOURCES) \
        inhibit-applet.c \
+       inhibit-applet.h \
+       $(BUILT_SOURCES) \
        $(NULL)
 
 libinhibit_applet_la_LDFLAGS = \
-       -avoid-version \
        $(WARN_LDFLAGS) \
        $(AM_LDFLAGS) \
        $(NULL)
 
 libinhibit_applet_la_LIBADD = \
-       $(GNOME_APPLETS_LIBS) \
+       $(GNOME_PANEL_LIBS) \
        $(GIO_UNIX_LIBS) \
        $(NULL)
 
diff --git a/gnome-applets/inhibit/inhibit-applet-menu.xml b/gnome-applets/inhibit/inhibit-applet-menu.xml
new file mode 100644
index 000000000..95e270a59
--- /dev/null
+++ b/gnome-applets/inhibit/inhibit-applet-menu.xml
@@ -0,0 +1,10 @@
+<interface>
+  <menu id="inhibit-menu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_About</attribute>
+        <attribute name="action">inhibit.about</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>
diff --git a/inhibit/src/inhibit-applet.c b/gnome-applets/inhibit/inhibit-applet.c
similarity index 65%
rename from inhibit/src/inhibit-applet.c
rename to gnome-applets/inhibit/inhibit-applet.c
index d50bde375..2bc7e0913 100644
--- a/inhibit/src/inhibit-applet.c
+++ b/gnome-applets/inhibit/inhibit-applet.c
@@ -1,6 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Inhibit Applet
+/*
  * Copyright (C) 2006 Benjamin Canou <bookeldor gmail com>
  * Copyright (C) 2006-2009 Richard Hughes <richard hughsie com>
  *
@@ -21,29 +19,22 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include "config.h"
+#include "inhibit-applet.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <panel-applet.h>
 #include <gtk/gtk.h>
 #include <glib-object.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "dbus-inhibit.h"
 
-#define GPM_TYPE_INHIBIT_APPLET                (gpm_inhibit_applet_get_type ())
-#define GPM_INHIBIT_APPLET(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GPM_TYPE_INHIBIT_APPLET, 
GpmInhibitApplet))
-#define GPM_INHIBIT_APPLET_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), GPM_TYPE_INHIBIT_APPLET, 
GpmInhibitAppletClass))
-#define GPM_IS_INHIBIT_APPLET(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GPM_TYPE_INHIBIT_APPLET))
-#define GPM_IS_INHIBIT_APPLET_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GPM_TYPE_INHIBIT_APPLET))
-#define GPM_INHIBIT_APPLET_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), GPM_TYPE_INHIBIT_APPLET, 
GpmInhibitAppletClass))
+struct _InhibitApplet
+{
+       GpApplet parent;
 
-typedef struct{
-       PanelApplet parent;
        /* applet state */
        guint cookie;
        /* the icon */
@@ -52,45 +43,26 @@ typedef struct{
        DBusSessionManager *proxy;
        guint bus_watch_id;
        guint level;
-} GpmInhibitApplet;
-
-typedef struct{
-       PanelAppletClass        parent_class;
-} GpmInhibitAppletClass;
-
-GType                gpm_inhibit_applet_get_type  (void);
+};
 
 #define GS_DBUS_SERVICE                "org.gnome.SessionManager"
 #define GS_DBUS_PATH           "/org/gnome/SessionManager"
 
-G_DEFINE_TYPE (GpmInhibitApplet, gpm_inhibit_applet, PANEL_TYPE_APPLET)
-
-static void    gpm_applet_update_icon          (GpmInhibitApplet *applet);
-static void    gpm_applet_size_allocate_cb     (GtkWidget *widget, GdkRectangle *allocation);
-static void    gpm_applet_update_tooltip       (GpmInhibitApplet *applet);
-static gboolean        gpm_applet_click_cb             (GpmInhibitApplet *applet, GdkEventButton *event);
-static void    gpm_applet_dialog_about_cb      (GSimpleAction *action, GVariant *parameter, gpointer data);
-static gboolean        gpm_applet_cb                   (PanelApplet *_applet, const gchar *iid, gpointer 
data);
-static void    gpm_applet_destroy_cb           (GObject *object);
+G_DEFINE_TYPE (InhibitApplet, inhibit_applet, GP_TYPE_APPLET)
 
-#define GPM_INHIBIT_APPLET_ID                  "InhibitApplet"
-#define GPM_INHIBIT_APPLET_FACTORY_ID          "InhibitAppletFactory"
 #define GPM_INHIBIT_APPLET_ICON                        "gnome-inhibit-applet"
 #define GPM_INHIBIT_APPLET_ICON_INHIBIT                "gpm-inhibit"
 #define GPM_INHIBIT_APPLET_ICON_INVALID                "gpm-inhibit-invalid"
 #define GPM_INHIBIT_APPLET_ICON_UNINHIBIT      "gpm-uninhibit"
 #define GPM_INHIBIT_APPLET_NAME                        _("Inhibit Applet")
 #define GPM_INHIBIT_APPLET_DESC                        _("Allows user to inhibit automatic power saving.")
-#define PANEL_APPLET_VERTICAL(p)                                       \
-        (((p) == PANEL_APPLET_ORIENT_LEFT) || ((p) == PANEL_APPLET_ORIENT_RIGHT))
-
 
 /** cookie is returned as an unsigned integer */
 static gboolean
-gpm_applet_inhibit (GpmInhibitApplet *applet,
-                   const gchar     *appname,
-                   const gchar     *reason,
-                   guint           *cookie)
+gpm_applet_inhibit (InhibitApplet *applet,
+                    const char    *appname,
+                    const char    *reason,
+                    guint         *cookie)
 {
        GError  *error = NULL;
        gboolean ret;
@@ -124,8 +96,8 @@ gpm_applet_inhibit (GpmInhibitApplet *applet,
 }
 
 static gboolean
-gpm_applet_uninhibit (GpmInhibitApplet *applet,
-                     guint            cookie)
+gpm_applet_uninhibit (InhibitApplet *applet,
+                      guint          cookie)
 {
        GError *error = NULL;
        gboolean ret;
@@ -158,7 +130,7 @@ gpm_applet_uninhibit (GpmInhibitApplet *applet,
  * sets an icon from stock
  **/
 static void
-gpm_applet_update_icon (GpmInhibitApplet *applet)
+gpm_applet_update_icon (InhibitApplet *applet)
 {
        const gchar *icon;
 
@@ -185,17 +157,18 @@ static void
 gpm_applet_size_allocate_cb (GtkWidget    *widget,
                              GdkRectangle *allocation)
 {
-       GpmInhibitApplet *applet = GPM_INHIBIT_APPLET (widget);
-       int               size = NULL;
+       InhibitApplet *applet;
+       int size;
+
+       applet = INHIBIT_APPLET (widget);
+       size = 0;
 
-       switch (panel_applet_get_orient (PANEL_APPLET (applet))) {
-               case PANEL_APPLET_ORIENT_LEFT:
-               case PANEL_APPLET_ORIENT_RIGHT:
+       switch (gp_applet_get_orientation (GP_APPLET (applet))) {
+               case GTK_ORIENTATION_VERTICAL:
                        size = allocation->width;
                        break;
 
-               case PANEL_APPLET_ORIENT_UP:
-               case PANEL_APPLET_ORIENT_DOWN:
+               case GTK_ORIENTATION_HORIZONTAL:
                        size = allocation->height;
                        break;
        }
@@ -223,7 +196,7 @@ gpm_applet_size_allocate_cb (GtkWidget    *widget,
  * sets tooltip's content (percentage or disabled)
  **/
 static void
-gpm_applet_update_tooltip (GpmInhibitApplet *applet)
+gpm_applet_update_tooltip (InhibitApplet *applet)
 {
        const gchar *buf;
        if (applet->proxy == NULL) {
@@ -245,7 +218,8 @@ gpm_applet_update_tooltip (GpmInhibitApplet *applet)
  * pops and unpops
  **/
 static gboolean
-gpm_applet_click_cb (GpmInhibitApplet *applet, GdkEventButton *event)
+gpm_applet_click_cb (InhibitApplet  *applet,
+                     GdkEventButton *event)
 {
        /* react only to left mouse button */
        if (event->button != 1) {
@@ -330,34 +304,14 @@ gpm_applet_dialog_about_cb (GSimpleAction *action, GVariant *parameter, gpointer
        g_object_unref (logo);
 }
 
-/**
- * gpm_applet_destroy_cb:
- * @object: Class instance to destroy
- **/
-static void
-gpm_applet_destroy_cb (GObject *object)
+static const GActionEntry menu_actions[] =
 {
-       GpmInhibitApplet *applet = GPM_INHIBIT_APPLET(object);
-
-       g_bus_unwatch_name (applet->bus_watch_id);
-}
+  { "about", gpm_applet_dialog_about_cb, NULL, NULL, NULL },
+  { NULL }
+};
 
-/**
- * gpm_inhibit_applet_class_init:
- * @klass: Class instance
- **/
-static void
-gpm_inhibit_applet_class_init (GpmInhibitAppletClass *class)
-{
-       /* nothing to do here */
-}
-
-
-/**
- * gpm_inhibit_applet_dbus_connect:
- **/
 static gboolean
-gpm_inhibit_applet_dbus_connect (GpmInhibitApplet *applet)
+gpm_inhibit_applet_dbus_connect (InhibitApplet *applet)
 {
        GError *error = NULL;
 
@@ -380,11 +334,8 @@ gpm_inhibit_applet_dbus_connect (GpmInhibitApplet *applet)
        return TRUE;
 }
 
-/**
- * gpm_inhibit_applet_dbus_disconnect:
- **/
 static gboolean
-gpm_inhibit_applet_dbus_disconnect (GpmInhibitApplet *applet)
+gpm_inhibit_applet_dbus_disconnect (InhibitApplet *applet)
 {
        if (applet->proxy != NULL) {
                g_debug ("removing proxy\n");
@@ -396,35 +347,58 @@ gpm_inhibit_applet_dbus_disconnect (GpmInhibitApplet *applet)
        return TRUE;
 }
 
-/**
- * gpm_inhibit_applet_name_appeared_cb:
- **/
 static void
-gpm_inhibit_applet_name_appeared_cb (GDBusConnection *connection, const gchar *name, const gchar 
*name_owner, GpmInhibitApplet *applet)
+gpm_inhibit_applet_name_appeared_cb (GDBusConnection *connection,
+                                     const char      *name,
+                                     const char      *name_owner,
+                                     InhibitApplet   *applet)
 {
        gpm_inhibit_applet_dbus_connect (applet);
        gpm_applet_update_tooltip (applet);
        gpm_applet_update_icon (applet);
 }
 
-/**
- * gpm_inhibit_applet_name_vanished_cb:
- **/
 static void
-gpm_inhibit_applet_name_vanished_cb (GDBusConnection *connection, const gchar *name, GpmInhibitApplet 
*applet)
+gpm_inhibit_applet_name_vanished_cb (GDBusConnection *connection,
+                                     const  char     *name,
+                                     InhibitApplet   *applet)
 {
        gpm_inhibit_applet_dbus_disconnect (applet);
        gpm_applet_update_tooltip (applet);
        gpm_applet_update_icon (applet);
 }
 
-/**
- * gpm_inhibit_applet_init:
- * @applet: Inhibit applet instance
- **/
 static void
-gpm_inhibit_applet_init (GpmInhibitApplet *applet)
+inhibit_applet_dispose (GObject *object)
+{
+  InhibitApplet *self;
+
+  self = INHIBIT_APPLET (object);
+
+  if (self->bus_watch_id != 0)
+    {
+      g_bus_unwatch_name (self->bus_watch_id);
+      self->bus_watch_id = 0;
+    }
+
+  G_OBJECT_CLASS (inhibit_applet_parent_class)->dispose (object);
+}
+
+static void
+inhibit_applet_class_init (InhibitAppletClass *self_class)
 {
+  GObjectClass *object_class;
+
+  object_class = G_OBJECT_CLASS (self_class);
+
+  object_class->dispose = inhibit_applet_dispose;
+}
+
+static void
+inhibit_applet_init (InhibitApplet *applet)
+{
+       const char *menu_resource;
+
        /* initialize fields */
        applet->image = NULL;
        applet->cookie = 0;
@@ -444,10 +418,15 @@ gpm_inhibit_applet_init (GpmInhibitApplet *applet)
                                  applet, NULL);
 
        /* prepare */
-       panel_applet_set_flags (PANEL_APPLET (applet), PANEL_APPLET_EXPAND_MINOR);
+       gp_applet_set_flags (GP_APPLET (applet), GP_APPLET_FLAGS_EXPAND_MINOR);
        applet->image = gtk_image_new();
        gtk_container_add (GTK_CONTAINER (applet), applet->image);
 
+       menu_resource = GRESOURCE_PREFIX "/ui/inhibit-applet-menu.xml";
+       gp_applet_setup_menu_from_resource (GP_APPLET (applet),
+                                           menu_resource,
+                                           menu_actions);
+
        /* show */
        gtk_widget_show_all (GTK_WIDGET(applet));
 
@@ -457,54 +436,4 @@ gpm_inhibit_applet_init (GpmInhibitApplet *applet)
 
        g_signal_connect (G_OBJECT(applet), "size-allocate",
                          G_CALLBACK(gpm_applet_size_allocate_cb), NULL);
-
-       g_signal_connect (G_OBJECT(applet), "destroy",
-                         G_CALLBACK(gpm_applet_destroy_cb), NULL);
 }
-
-/**
- * gpm_applet_cb:
- * @_applet: GpmInhibitApplet instance created by the applet factory
- * @iid: Applet id
- *
- * the function called by libpanel-applet factory after creation
- **/
-static gboolean
-gpm_applet_cb (PanelApplet *_applet, const gchar *iid, gpointer data)
-{
-       GpmInhibitApplet *applet = GPM_INHIBIT_APPLET(_applet);
-       GSimpleActionGroup *action_group;
-       gchar *ui_path;
-
-       static const GActionEntry menu_actions [] = {
-               { "about", gpm_applet_dialog_about_cb, NULL, NULL, NULL },
-       };
-
-       if (strcmp (iid, GPM_INHIBIT_APPLET_ID) != 0) {
-               return FALSE;
-       }
-
-       action_group = g_simple_action_group_new ();
-       g_action_map_add_action_entries (G_ACTION_MAP (action_group),
-                                        menu_actions,
-                                        G_N_ELEMENTS (menu_actions),
-                                        applet);
-       ui_path = g_build_filename (INHIBIT_MENU_UI_DIR, "inhibit-applet-menu.xml", NULL);
-       panel_applet_setup_menu_from_file (PANEL_APPLET (applet), ui_path, action_group, GETTEXT_PACKAGE);
-       g_free (ui_path);
-
-       gtk_widget_insert_action_group (GTK_WIDGET (applet), "inhibit",
-                                       G_ACTION_GROUP (action_group));
-
-       g_object_unref (action_group);
-
-       return TRUE;
-}
-
-/**
- * this generates a main with a applet factory
- **/
-PANEL_APPLET_IN_PROCESS_FACTORY (GPM_INHIBIT_APPLET_FACTORY_ID,
-                                 GPM_TYPE_INHIBIT_APPLET,
-                                 gpm_applet_cb,
-                                 NULL)
diff --git a/gnome-applets/inhibit/inhibit-applet.h b/gnome-applets/inhibit/inhibit-applet.h
new file mode 100644
index 000000000..3377e4fa5
--- /dev/null
+++ b/gnome-applets/inhibit/inhibit-applet.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2020 Alberts Muktupāvels
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef INHIBIT_APPLET_H
+#define INHIBIT_APPLET_H
+
+#include <libgnome-panel/gp-applet.h>
+
+G_BEGIN_DECLS
+
+#define INHIBIT_TYPE_APPLET (inhibit_applet_get_type ())
+G_DECLARE_FINAL_TYPE (InhibitApplet, inhibit_applet,
+                      INHIBIT, APPLET, GpApplet)
+
+G_END_DECLS
+
+#endif
diff --git a/inhibit/src/org.gnome.SessionManager.xml b/gnome-applets/inhibit/org.gnome.SessionManager.xml
similarity index 100%
rename from inhibit/src/org.gnome.SessionManager.xml
rename to gnome-applets/inhibit/org.gnome.SessionManager.xml
diff --git a/po/POTFILES.in b/po/POTFILES.in
index dbf69e6fc..175c961dc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -49,6 +49,8 @@ gnome-applets/ga-module.c
 gnome-applets/gweather/gweather-applet.c
 gnome-applets/gweather/gweather-dialog.c
 gnome-applets/gweather/gweather-pref.c
+[type: gettext/glade]gnome-applets/inhibit/inhibit-applet-menu.xml
+gnome-applets/inhibit/inhibit-applet.c
 [type: gettext/glade]gnome-applets/netspeed/netspeed-menu.xml
 gnome-applets/netspeed/netspeed-applet.c
 gnome-applets/netspeed/preferences.c
@@ -64,9 +66,6 @@ gnome-applets/window-picker/wp-applet.c
 [type: gettext/glade]gnome-applets/window-picker/wp-menu.xml
 [type: gettext/glade]gnome-applets/window-picker/wp-preferences-dialog.ui
 gnome-applets/window-picker/wp-task-title.c
-[type: gettext/glade]inhibit/inhibit-applet-menu.xml
-[type: gettext/ini]inhibit/org.gnome.InhibitApplet.panel-applet.in.in
-inhibit/src/inhibit-applet.c
 mini-commander/src/about.c
 mini-commander/src/cmd_completion.c
 mini-commander/src/command_line.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index c83fb7f5a..933686cbd 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -20,7 +20,6 @@ data/schemas/org.gnome.gnome-applets.window-picker-applet.gschema.xml.in
 data/schemas/org.gnome.gnome-applets.window-title.gschema.xml.in
 drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in
 geyes/org.gnome.applets.GeyesApplet.panel-applet.in
-inhibit/org.gnome.InhibitApplet.panel-applet.in
 mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in
 multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in
 sticky-notes/data/org.gnome.applets.StickyNotesApplet.panel-applet.in


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]