summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCallum McKenzie <callum@src.gnome.org>2008-01-14 19:55:40 +0000
committerCallum McKenzie <callum@src.gnome.org>2008-01-14 19:55:40 +0000
commit371f309544c8d8536a0b0a727818fc630ba514ff (patch)
tree05da4f5be752d4f3e00111349bcb94b03d659a80
parent238028fd9420047b60d99de47991c862313066c1 (diff)
2.21.4: Allow compilation with the latest libgweather.GNOME_APPLETS_2_21_4
svn path=/trunk/; revision=10593
-rw-r--r--ChangeLog6
-rw-r--r--NEWS7
-rw-r--r--configure.in2
-rw-r--r--gweather/ChangeLog13
-rw-r--r--gweather/gweather-about.c2
-rw-r--r--gweather/gweather-about.h2
-rw-r--r--gweather/gweather-applet.c2
-rw-r--r--gweather/gweather-applet.h2
-rw-r--r--gweather/gweather-dialog.c2
-rw-r--r--gweather/gweather-dialog.h3
-rw-r--r--gweather/gweather-pref.c2
-rw-r--r--gweather/gweather-pref.h3
-rw-r--r--gweather/main.c2
13 files changed, 47 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e073c2a5e..275e3ff4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-15 Callum McKenzie <callum@spooky-possum.org>
+
+ * configure.in:
+ * NEWS: 2.21.4: A new release to build with the latest
+ libgweather.
+
2008-01-14 Callum McKenzie <callum@spooky-possum.org>
* configure.in:
diff --git a/NEWS b/NEWS
index 39c53e257..b9b61880a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Changes in GNOME-Applets 2.21.4
+===============================
+Codename: "Fate Still Amenable to Change"
+
+A quick release to ensure the package builds with the latest
+libgweather.
+
Changes in GNOME-Applets 2.21.3
===============================
Codename: "Fate Amenable to Change"
diff --git a/configure.in b/configure.in
index a58438d28..0f3e46d8f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
dnl ***************************************************************************
dnl *** configure.in for GNOME-APPLETS ***
dnl ***************************************************************************
-AC_INIT(gnome-applets, 2.21.3)
+AC_INIT(gnome-applets, 2.21.4)
AC_PREREQ(2.59)
AM_CONFIG_HEADER(config.h)
diff --git a/gweather/ChangeLog b/gweather/ChangeLog
index f6bc8d935..08faf0091 100644
--- a/gweather/ChangeLog
+++ b/gweather/ChangeLog
@@ -1,3 +1,16 @@
+2008-01-15 Callum McKenzie <callum@spooky-possum.org>
+
+ * main.c:
+ * gweather-pref.c:
+ * gweather-pref.h:
+ * gweather-dialog.c:
+ * gweather-dialog.h:
+ * gweather-applet.c:
+ * gweather-applet.h:
+ * gweather-about.c:
+ * gweather-about.h: Add GWEATHER_I_KNOW_THIS_IS_UNSTABLE to enable
+ the gweather API.
+
2008-01-13 Callum McKenzie <callum@spooky-possum.org>
* Makefile.am: Move Locations.xml and associated pieces to a new
diff --git a/gweather/gweather-about.c b/gweather/gweather-about.c
index 3c2be11dc..5bc7facba 100644
--- a/gweather/gweather-about.c
+++ b/gweather/gweather-about.c
@@ -20,6 +20,8 @@
#include <gnome.h>
+#define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
+
#include "gweather.h"
#include "gweather-about.h"
diff --git a/gweather/gweather-about.h b/gweather/gweather-about.h
index a182e3f6b..ba95fd493 100644
--- a/gweather/gweather-about.h
+++ b/gweather/gweather-about.h
@@ -13,6 +13,8 @@
*
*/
+#define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
+
#include "gweather.h"
G_BEGIN_DECLS
diff --git a/gweather/gweather-applet.c b/gweather/gweather-applet.c
index 89a5c2e3c..67f5a1a8d 100644
--- a/gweather/gweather-applet.c
+++ b/gweather/gweather-applet.c
@@ -29,6 +29,8 @@
#include <libnotify/notification.h>
#endif
+#define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
+
#include "gweather.h"
#include "gweather-about.h"
#include "gweather-pref.h"
diff --git a/gweather/gweather-applet.h b/gweather/gweather-applet.h
index 1256da193..18c34b043 100644
--- a/gweather/gweather-applet.h
+++ b/gweather/gweather-applet.h
@@ -13,6 +13,8 @@
*
*/
+#define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
+
#include "gweather.h"
G_BEGIN_DECLS
diff --git a/gweather/gweather-dialog.c b/gweather/gweather-dialog.c
index 050392d54..4f3ef9077 100644
--- a/gweather/gweather-dialog.c
+++ b/gweather/gweather-dialog.c
@@ -21,6 +21,8 @@
#include <gconf/gconf-client.h>
#include <gnome.h>
+#define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
+
#include "gweather.h"
#include "gweather-applet.h"
#include "gweather-pref.h"
diff --git a/gweather/gweather-dialog.h b/gweather/gweather-dialog.h
index 06f602323..88ea2b44e 100644
--- a/gweather/gweather-dialog.h
+++ b/gweather/gweather-dialog.h
@@ -14,6 +14,9 @@
*/
#include <gtk/gtkdialog.h>
+
+#define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
+
#include "gweather.h"
G_BEGIN_DECLS
diff --git a/gweather/gweather-pref.c b/gweather/gweather-pref.c
index 5c3df66ee..78e6c49cf 100644
--- a/gweather/gweather-pref.c
+++ b/gweather/gweather-pref.c
@@ -31,6 +31,8 @@
#include <libxml/parser.h>
#include <libxml/tree.h>
+#define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
+
#include "gweather.h"
#include "gweather-pref.h"
#include "gweather-applet.h"
diff --git a/gweather/gweather-pref.h b/gweather/gweather-pref.h
index 08d6e08a2..003b71718 100644
--- a/gweather/gweather-pref.h
+++ b/gweather/gweather-pref.h
@@ -14,6 +14,9 @@
#define __GWEATHER_PREF_H_
#include <gtk/gtkdialog.h>
+
+#define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
+
#include "gweather.h"
G_BEGIN_DECLS
diff --git a/gweather/main.c b/gweather/main.c
index f28f2b29f..789694d6b 100644
--- a/gweather/main.c
+++ b/gweather/main.c
@@ -15,6 +15,8 @@
#include <gnome.h>
#include <panel-applet.h>
+#define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
+
#include <libgweather/gweather-gconf.h>
#include <libgweather/gweather-prefs.h>