GNOME.org
 

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

commit da446e8a0907c449359c1f3389339b6dfbc2379f
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Thu Mar 26 03:44:19 2020 +0200

    gweather: port to libgnome-panel

 Makefile.am                                        |   2 -
 configure.ac                                       |   4 +-
 gnome-applets/Makefile.am                          |   3 +
 gnome-applets/ga-module.c                          |  11 ++
 .../src => gnome-applets/gweather}/Makefile.am     |  15 +--
 gnome-applets/gweather/gweather-applet-menu.xml    |  28 +++++
 .../gweather}/gweather-applet.c                    | 124 ++++++++++++---------
 .../gweather}/gweather-applet.h                    |  10 +-
 .../gweather}/gweather-dialog.c                    |   2 +-
 .../gweather}/gweather-dialog.h                    |   0
 .../src => gnome-applets/gweather}/gweather-pref.c |   2 +-
 .../src => gnome-applets/gweather}/gweather-pref.h |   0
 .../src => gnome-applets/gweather}/gweather-xml.c  |   0
 .../src => gnome-applets/gweather}/gweather-xml.h  |   0
 gweather/Makefile.am                               |  29 -----
 gweather/gweather-applet-menu.xml                  |  24 ----
 ...gnome.applets.GWeatherApplet.panel-applet.in.in |  15 ---
 gweather/src/main.c                                |  59 ----------
 po/POTFILES.in                                     |  10 +-
 po/POTFILES.skip                                   |   2 -
 20 files changed, 134 insertions(+), 206 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 951e03596..0ccba26ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,6 @@ always_built_SUBDIRS =  \
        drivemount      \
        inhibit         \
        geyes           \
-       gweather \
        mini-commander \
        multiload \
        netspeed \
@@ -52,7 +51,6 @@ DIST_SUBDIRS = \
        battstat        \
        multiload       \
        netspeed        \
-       gweather        \
        accessx-status  \
        sticky-notes    \
        cpufreq         \
diff --git a/configure.ac b/configure.ac
index ddf6eb335..cd9d93d3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -337,6 +337,7 @@ AC_CONFIG_FILES([
 
   gnome-applets/Makefile
   gnome-applets/brightness/Makefile
+  gnome-applets/gweather/Makefile
   gnome-applets/timer/Makefile
   gnome-applets/trash/Makefile
   gnome-applets/window-picker/Makefile
@@ -385,9 +386,6 @@ AC_CONFIG_FILES([
   geyes/src/Makefile
   geyes/themes/Makefile
 
-  gweather/Makefile
-  gweather/src/Makefile
-
   mini-commander/Makefile
   mini-commander/src/Makefile
 
diff --git a/gnome-applets/Makefile.am b/gnome-applets/Makefile.am
index 8971c4654..9ce3dcbfe 100644
--- a/gnome-applets/Makefile.am
+++ b/gnome-applets/Makefile.am
@@ -2,6 +2,7 @@ NULL =
 
 SUBDIRS = \
        brightness \
+       gweather \
        timer \
        trash \
        window-picker \
@@ -19,6 +20,7 @@ org_gnome_gnome_applets_la_CPPFLAGS = \
 
 org_gnome_gnome_applets_la_CFLAGS = \
        $(GNOME_PANEL_CFLAGS) \
+       $(LIBGWEATHER_CFLAGS) \
        $(AM_CFLAGS) \
        $(NULL)
 
@@ -28,6 +30,7 @@ org_gnome_gnome_applets_la_SOURCES = \
 
 org_gnome_gnome_applets_la_LIBADD = \
        $(top_builddir)/gnome-applets/brightness/libbrightness-applet.la \
+       $(top_builddir)/gnome-applets/gweather/libgweather-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 \
diff --git a/gnome-applets/ga-module.c b/gnome-applets/ga-module.c
index 099fae5d4..a7e0c4fa8 100644
--- a/gnome-applets/ga-module.c
+++ b/gnome-applets/ga-module.c
@@ -22,6 +22,7 @@
 #include <libgnome-panel/gp-module.h>
 
 #include "brightness/brightness-applet.h"
+#include "gweather/gweather-applet.h"
 #include "timer/timer-applet.h"
 #include "trash/trash-applet.h"
 #include "window-picker/wp-applet.h"
@@ -42,6 +43,13 @@ ga_get_applet_info (const char *id)
       description = _("Adjusts Laptop panel brightness");
       icon_name = "gnome-brightness-applet";
     }
+  else if (g_strcmp0 (id, "gweather") == 0)
+    {
+      type_func = gweather_applet_get_type;
+      name = _("Weather Report");
+      description = _("Monitor the current weather conditions, and forecasts");
+      icon_name = "weather-storm";
+    }
   else if (g_strcmp0 (id, "timer") == 0)
     {
       type_func = timer_applet_get_type;
@@ -79,6 +87,8 @@ ga_get_applet_id_from_iid (const char *iid)
 {
   if (g_strcmp0 (iid, "BrightnessAppletFactory::BrightnessApplet") == 0)
     return "brightness";
+  else if (g_strcmp0 (iid, "GWeatherAppletFactory::GWeatherApplet") == 0)
+    return "gweather";
   else if (g_strcmp0 (iid, "TimerAppletFactory::TimerApplet") == 0)
     return "timer";
   else if (g_strcmp0 (iid, "WindowPickerFactory::WindowPicker") == 0 ||
@@ -104,6 +114,7 @@ gp_module_load (GpModule *module)
 
   gp_module_set_applet_ids (module,
                             "brightness",
+                            "gweather",
                             "timer",
                             "trash",
                             "window-picker",
diff --git a/gweather/src/Makefile.am b/gnome-applets/gweather/Makefile.am
similarity index 79%
rename from gweather/src/Makefile.am
rename to gnome-applets/gweather/Makefile.am
index e8bf69e5c..265753d24 100644
--- a/gweather/src/Makefile.am
+++ b/gnome-applets/gweather/Makefile.am
@@ -1,21 +1,20 @@
 NULL =
 
 uidir = $(pkgdatadir)/ui
+ui_DATA = gweather-applet-menu.xml
 
-gweather_appletlibdir = $(pkglibdir)
-gweather_appletlib_LTLIBRARIES = libgweather-applet.la
+noinst_LTLIBRARIES = libgweather-applet.la
 
 libgweather_applet_la_CPPFLAGS = \
        -I$(srcdir) \
        -I$(top_srcdir) \
        -DGWEATHER_MENU_UI_DIR=\""$(uidir)"\" \
-       -DGNOMELOCALEDIR=\""$(localedir)"\" \
        -DG_LOG_DOMAIN=\"org.gnome.gnome-applets.gweather\" \
        -DG_LOG_USE_STRUCTURED=1 \
        $(NULL)
 
 libgweather_applet_la_CFLAGS = \
-       $(GNOME_APPLETS_CFLAGS) \
+       $(GNOME_PANEL_CFLAGS) \
        $(LIBGWEATHER_CFLAGS) \
        $(LIBNOTIFY_CFLAGS) \
        $(XML2_CFLAGS) \
@@ -32,20 +31,22 @@ libgweather_applet_la_SOURCES = \
        gweather-dialog.h \
        gweather-applet.c \
        gweather-applet.h \
-       main.c \
        $(NULL)
 
 libgweather_applet_la_LDFLAGS = \
-       -avoid-version \
        $(WARN_LDFLAGS) \
        $(AM_LDFLAGS) \
        $(NULL)
 
 libgweather_applet_la_LIBADD = \
-       $(GNOME_APPLETS_LIBS) \
+       $(GNOME_PANEL_LIBS) \
        $(LIBGWEATHER_LIBS) \
        $(LIBNOTIFY_LIBS) \
        $(XML2_LIBS) \
        $(NULL)
 
+EXTRA_DIST = \
+       $(ui_DATA) \
+       $(NULL)
+
 -include $(top_srcdir)/git.mk
diff --git a/gnome-applets/gweather/gweather-applet-menu.xml b/gnome-applets/gweather/gweather-applet-menu.xml
new file mode 100644
index 000000000..cdf10e8ba
--- /dev/null
+++ b/gnome-applets/gweather/gweather-applet-menu.xml
@@ -0,0 +1,28 @@
+<interface>
+  <menu id="gweather-menu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Details</attribute>
+        <attribute name="action">gweather.details</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_Update</attribute>
+        <attribute name="action">gweather.update</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Preferences</attribute>
+        <attribute name="action">gweather.preferences</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_Help</attribute>
+        <attribute name="action">gweather.help</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_About</attribute>
+        <attribute name="action">gweather.about</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>
diff --git a/gweather/src/gweather-applet.c b/gnome-applets/gweather/gweather-applet.c
similarity index 85%
rename from gweather/src/gweather-applet.c
rename to gnome-applets/gweather/gweather-applet.c
index c2ea3e34e..9c6772abc 100644
--- a/gweather/src/gweather-applet.c
+++ b/gnome-applets/gweather/gweather-applet.c
@@ -26,10 +26,9 @@
 #include <arpa/nameser.h>
 #include <resolv.h>
 
-#include <panel-applet.h>
-
 #include <gdk/gdkkeysyms.h>
 
+#include <libgnome-panel/gp-utils.h>
 #include <libnotify/notify.h>
 
 #include "gweather-pref.h"
@@ -38,6 +37,8 @@
 
 #define MAX_CONSECUTIVE_FAULTS (3)
 
+G_DEFINE_TYPE (GWeatherApplet, gweather_applet, GP_TYPE_APPLET)
+
 static void update_finish (GWeatherInfo *info, gpointer data);
 
 static GWeatherLocation*
@@ -124,7 +125,7 @@ static void help_cb (GSimpleAction *action,
        GWeatherApplet *gw_applet = (GWeatherApplet *) user_data;
     GError *error = NULL;
 
-    gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (gw_applet->applet)),
+    gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (gw_applet)),
                "help:gweather",
                gtk_get_current_event_time (),
                &error);
@@ -134,7 +135,7 @@ static void help_cb (GSimpleAction *action,
                                                    _("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 (GTK_WIDGET (gw_applet->applet)));
+       gtk_window_set_screen (GTK_WINDOW (dialog), gtk_widget_get_screen (GTK_WIDGET (gw_applet)));
        gtk_widget_show (dialog);
         g_error_free (error);
         error = NULL;
@@ -187,7 +188,8 @@ static const GActionEntry weather_applet_menu_actions [] = {
        { "update",      update_cb,  NULL, NULL, NULL },
        { "preferences", pref_cb,    NULL, NULL, NULL },
        { "help",        help_cb,    NULL, NULL, NULL },
-       { "about",       about_cb,   NULL, NULL, NULL }
+       { "about",       about_cb,   NULL, NULL, NULL },
+       { NULL }
 };
 
 static void place_widgets (GWeatherApplet *gw_applet)
@@ -198,13 +200,11 @@ static void place_widgets (GWeatherApplet *gw_applet)
     int panel_size = gw_applet->size;
     const gchar *icon_name;
 
-    switch (gw_applet->orient) {
-       case PANEL_APPLET_ORIENT_LEFT:
-       case PANEL_APPLET_ORIENT_RIGHT:
+    switch (gp_applet_get_orientation (GP_APPLET (gw_applet))) {
+       case GTK_ORIENTATION_VERTICAL:
            horizontal = FALSE;
            break;
-       case PANEL_APPLET_ORIENT_UP:
-       case PANEL_APPLET_ORIENT_DOWN:
+       case GTK_ORIENTATION_HORIZONTAL:
            horizontal = TRUE;
            break;
     }
@@ -228,7 +228,7 @@ static void place_widgets (GWeatherApplet *gw_applet)
 
     /* Create the temperature label */
     gw_applet->label = gtk_label_new("--");
-    panel_applet_add_text_class (gw_applet->applet, gw_applet->label);
+    gp_add_text_color_class (gw_applet->label);
 
     /* Update temperature text */
     if (gw_applet->gweather_info) {
@@ -268,23 +268,24 @@ static void place_widgets (GWeatherApplet *gw_applet)
     gtk_box_pack_start (GTK_BOX (gw_applet->box), gw_applet->image, TRUE, TRUE, 0);
     gtk_box_pack_start (GTK_BOX (gw_applet->box), gw_applet->label, TRUE, TRUE, 0);
 
-    gtk_widget_show_all (GTK_WIDGET (gw_applet->applet));
+    gtk_widget_show_all (GTK_WIDGET (gw_applet));
 }
 
-static void change_orient_cb (PanelApplet *w, PanelAppletOrient o, gpointer data)
+static void
+placement_changed_cb (GpApplet        *applet,
+                      GtkOrientation   orientation,
+                      GtkPositionType  position,
+                      GWeatherApplet  *self)
 {
-    GWeatherApplet *gw_applet = (GWeatherApplet *)data;
-       
-    gw_applet->orient = o;
-    place_widgets(gw_applet);
-    return;
+  place_widgets(self);
 }
 
-static void size_allocate_cb(PanelApplet *w, GtkAllocation *allocation, gpointer data)
+static void
+size_allocate_cb (GtkWidget      *widget,
+                  GtkAllocation  *allocation,
+                  GWeatherApplet *gw_applet)
 {
-    GWeatherApplet *gw_applet = (GWeatherApplet *)data;
-       
-    if ((gw_applet->orient == PANEL_APPLET_ORIENT_LEFT) || (gw_applet->orient == PANEL_APPLET_ORIENT_RIGHT)) 
{
+    if (gp_applet_get_orientation (GP_APPLET (gw_applet)) == GTK_ORIENTATION_VERTICAL) {
       if (gw_applet->size == allocation->width)
        return;
       gw_applet->size = allocation->width;
@@ -392,56 +393,43 @@ applet_destroy (GtkWidget *widget, GWeatherApplet *gw_applet)
 
 void gweather_applet_create (GWeatherApplet *gw_applet)
 {
-    GSimpleActionGroup *action_group;
     GAction *action;
     gchar          *ui_path;
     AtkObject      *atk_obj;
     GNetworkMonitor*monitor;
 
-    panel_applet_set_flags (gw_applet->applet, PANEL_APPLET_EXPAND_MINOR);
+    gp_applet_set_flags (GP_APPLET (gw_applet), GP_APPLET_FLAGS_EXPAND_MINOR);
 
     gw_applet->container = gtk_alignment_new (0.5, 0.5, 0, 0);
-    gtk_container_add (GTK_CONTAINER (gw_applet->applet), gw_applet->container);
+    gtk_container_add (GTK_CONTAINER (gw_applet), gw_applet->container);
 
-    g_signal_connect (G_OBJECT(gw_applet->applet), "change_orient",
-                       G_CALLBACK(change_orient_cb), gw_applet);
-    g_signal_connect (G_OBJECT(gw_applet->applet), "size_allocate",
+    g_signal_connect (gw_applet, "placement-changed",
+                       G_CALLBACK(placement_changed_cb), gw_applet);
+    g_signal_connect (gw_applet, "size_allocate",
                        G_CALLBACK(size_allocate_cb), gw_applet);
-    g_signal_connect (G_OBJECT(gw_applet->applet), "destroy", 
+    g_signal_connect (gw_applet, "destroy", 
                        G_CALLBACK (applet_destroy), gw_applet);
-    g_signal_connect (G_OBJECT(gw_applet->applet), "button_press_event",
+    g_signal_connect (gw_applet, "button_press_event",
                        G_CALLBACK(clicked_cb), gw_applet);
-    g_signal_connect (G_OBJECT(gw_applet->applet), "key_press_event",           
+    g_signal_connect (gw_applet, "key_press_event",           
                        G_CALLBACK(key_press_cb), gw_applet);
                      
-    gtk_widget_set_tooltip_text (GTK_WIDGET(gw_applet->applet), _("GNOME Weather"));
+    gtk_widget_set_tooltip_text (GTK_WIDGET(gw_applet), _("GNOME Weather"));
 
-    atk_obj = gtk_widget_get_accessible (GTK_WIDGET (gw_applet->applet));
+    atk_obj = gtk_widget_get_accessible (GTK_WIDGET (gw_applet));
     if (GTK_IS_ACCESSIBLE (atk_obj))
           atk_object_set_name (atk_obj, _("GNOME Weather"));
 
-    gw_applet->orient = panel_applet_get_orient (gw_applet->applet);
-
-    action_group = g_simple_action_group_new ();
-       g_action_map_add_action_entries (G_ACTION_MAP (action_group),
-                                        weather_applet_menu_actions,
-                                        G_N_ELEMENTS (weather_applet_menu_actions),
-                                        gw_applet);
     ui_path = g_build_filename (GWEATHER_MENU_UI_DIR, "gweather-applet-menu.xml", NULL);
-    panel_applet_setup_menu_from_file (gw_applet->applet,
-                                      ui_path, action_group,
-                                      GETTEXT_PACKAGE);
+    gp_applet_setup_menu_from_file (GP_APPLET (gw_applet),
+                                    ui_path,
+                                    weather_applet_menu_actions);
     g_free (ui_path);
 
-       gtk_widget_insert_action_group (GTK_WIDGET (gw_applet->applet), "gweather",
-                                       G_ACTION_GROUP (action_group));
-
-    action = g_action_map_lookup_action (G_ACTION_MAP (action_group), "preferences");
-       g_object_bind_property (gw_applet->applet, "locked-down", action, "enabled",
+    action = gp_applet_menu_lookup_action (GP_APPLET (gw_applet), "preferences");
+       g_object_bind_property (gw_applet, "locked-down", action, "enabled",
                                G_BINDING_DEFAULT|G_BINDING_INVERT_BOOLEAN|G_BINDING_SYNC_CREATE);
 
-    g_object_unref (action_group);
-
     gw_applet->gweather_info = gweather_info_new (get_default_location (gw_applet));
 
     gweather_info_set_enabled_providers (gw_applet->gweather_info,
@@ -510,7 +498,7 @@ update_finish (GWeatherInfo *info, gpointer data)
            g_free (text);
 
            text = gweather_info_get_weather_summary (gw_applet->gweather_info);
-           gtk_widget_set_tooltip_text (GTK_WIDGET (gw_applet->applet), text);
+           gtk_widget_set_tooltip_text (GTK_WIDGET (gw_applet), text);
            g_free (text);
 
            /* Update dialog -- if one is present */
@@ -597,8 +585,40 @@ suncalc_timeout_cb (gpointer data)
 
 void gweather_update (GWeatherApplet *gw_applet)
 {
-    gtk_widget_set_tooltip_text (GTK_WIDGET(gw_applet->applet),  _("Updating..."));
+    gtk_widget_set_tooltip_text (GTK_WIDGET (gw_applet),  _("Updating..."));
 
     gweather_info_set_location (gw_applet->gweather_info, get_default_location (gw_applet));
     gweather_info_update (gw_applet->gweather_info);
 }
+
+static void
+gweather_applet_constructed (GObject *object)
+{
+  GWeatherApplet *self;
+
+  self = GWEATHER_APPLET (object);
+
+  G_OBJECT_CLASS (gweather_applet_parent_class)->constructed (object);
+
+  self->lib_settings = g_settings_new ("org.gnome.GWeather");
+  self->applet_settings = gp_applet_settings_new (GP_APPLET (self),
+                                                  "org.gnome.gnome-applets.gweather");
+
+  gweather_applet_create (self);
+  gweather_update (self);
+}
+
+static void
+gweather_applet_class_init (GWeatherAppletClass *self_class)
+{
+  GObjectClass *object_class;
+
+  object_class = G_OBJECT_CLASS (self_class);
+
+  object_class->constructed = gweather_applet_constructed;
+}
+
+static void
+gweather_applet_init (GWeatherApplet *self)
+{
+}
diff --git a/gweather/src/gweather-applet.h b/gnome-applets/gweather/gweather-applet.h
similarity index 87%
rename from gweather/src/gweather-applet.h
rename to gnome-applets/gweather/gweather-applet.h
index 229f932e2..fb5a30abf 100644
--- a/gweather/src/gweather-applet.h
+++ b/gnome-applets/gweather/gweather-applet.h
@@ -19,20 +19,21 @@
 #ifndef __GWEATHER_APPLET_H_
 #define __GWEATHER_APPLET_H_
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
 #include <libgweather/gweather.h>
 
-#include <panel-applet.h>
+#include <libgnome-panel/gp-applet.h>
 
 G_BEGIN_DECLS
 
-typedef struct _GWeatherApplet GWeatherApplet;
+#define GWEATHER_TYPE_APPLET (gweather_applet_get_type ())
+G_DECLARE_FINAL_TYPE (GWeatherApplet, gweather_applet, GWEATHER, APPLET, GpApplet)
 
 struct _GWeatherApplet
 {
-  PanelApplet       *applet;
+  GpApplet           parent;
   GWeatherInfo      *gweather_info;
 
   GSettings         *lib_settings;
@@ -43,7 +44,6 @@ struct _GWeatherApplet
   GtkWidget         *label;
   GtkWidget         *image;
 
-  PanelAppletOrient  orient;
   gint               size;
   gint               timeout_tag;
   gint               suncalc_timeout_tag;
diff --git a/gweather/src/gweather-dialog.c b/gnome-applets/gweather/gweather-dialog.c
similarity index 99%
rename from gweather/src/gweather-dialog.c
rename to gnome-applets/gweather/gweather-dialog.c
index c0d060026..3179f8728 100644
--- a/gweather/src/gweather-dialog.c
+++ b/gnome-applets/gweather/gweather-dialog.c
@@ -204,7 +204,7 @@ gweather_dialog_create (GWeatherDialog *dialog)
       gtk_window_set_default_size (GTK_WINDOW (dialog), 590, 340);
 
   gtk_window_set_screen (GTK_WINDOW (dialog),
-                        gtk_widget_get_screen (GTK_WIDGET (gw_applet->applet)));
+                        gtk_widget_get_screen (GTK_WIDGET (gw_applet)));
 
   /* Must come after load geometry, otherwise it will get reset. */
   gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
diff --git a/gweather/src/gweather-dialog.h b/gnome-applets/gweather/gweather-dialog.h
similarity index 100%
rename from gweather/src/gweather-dialog.h
rename to gnome-applets/gweather/gweather-dialog.h
diff --git a/gweather/src/gweather-pref.c b/gnome-applets/gweather/gweather-pref.c
similarity index 99%
rename from gweather/src/gweather-pref.c
rename to gnome-applets/gweather/gweather-pref.c
index eb795fb79..acb802d7a 100644
--- a/gweather/src/gweather-pref.c
+++ b/gnome-applets/gweather/gweather-pref.c
@@ -735,7 +735,7 @@ gweather_pref_create (GWeatherPref *pref)
     gtk_container_set_border_width (GTK_CONTAINER (pref), 5);
     gtk_window_set_resizable (GTK_WINDOW (pref), TRUE);
     gtk_window_set_screen (GTK_WINDOW (pref),
-                          gtk_widget_get_screen (GTK_WIDGET (pref->priv->applet->applet)));
+                          gtk_widget_get_screen (GTK_WIDGET (pref->priv->applet)));
 
     pref_vbox = gtk_dialog_get_content_area (GTK_DIALOG (pref));
     gtk_box_set_spacing (GTK_BOX (pref_vbox), 2);
diff --git a/gweather/src/gweather-pref.h b/gnome-applets/gweather/gweather-pref.h
similarity index 100%
rename from gweather/src/gweather-pref.h
rename to gnome-applets/gweather/gweather-pref.h
diff --git a/gweather/src/gweather-xml.c b/gnome-applets/gweather/gweather-xml.c
similarity index 100%
rename from gweather/src/gweather-xml.c
rename to gnome-applets/gweather/gweather-xml.c
diff --git a/gweather/src/gweather-xml.h b/gnome-applets/gweather/gweather-xml.h
similarity index 100%
rename from gweather/src/gweather-xml.h
rename to gnome-applets/gweather/gweather-xml.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 10f0ce978..5e0da0673 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -48,6 +48,10 @@ geyes/src/themes.c
 [type: gettext/glade]gnome-applets/brightness/brightness-applet-menu.xml
 gnome-applets/brightness/brightness-applet.c
 gnome-applets/ga-module.c
+[type: gettext/glade]gnome-applets/gweather/gweather-applet-menu.xml
+gnome-applets/gweather/gweather-applet.c
+gnome-applets/gweather/gweather-dialog.c
+gnome-applets/gweather/gweather-pref.c
 gnome-applets/timer/timer-applet.c
 gnome-applets/trash/trash-applet.c
 gnome-applets/trash/trash-empty.c
@@ -59,12 +63,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]gweather/gweather-applet-menu.xml
-[type: gettext/ini]gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in
-gweather/src/gweather-applet.c
-gweather/src/gweather-dialog.c
-gweather/src/gweather-pref.c
-gweather/src/main.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
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 82224d480..9f78db162 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -24,8 +24,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
-gweather/Locations.xml.in
-gweather/org.gnome.applets.GWeatherApplet.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
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]