libgweather r515 - in trunk: . libgweather

[danw svn gnome org]

Author: danw
Date: Tue Nov 25 17:35:05 2008
New Revision: 515
URL: http://svn.gnome.org/viewvc/libgweather?rev=515&view=rev

Log:
	* configure.in: Add -DG_DISABLE_SINGLE_INCLUDES and
	-DGTK_DISABLE_SINGLE_INCLUDES. Also add various
	_DISABLE_DEPRECATED flags in maintainer mode. Fix a dumb bug where
	we weren't setting GTK_CFLAGS or LIBXML_CFLAGS.

	* libgweather/gweather-gconf.c:
	* libgweather/weather.c:
	* libgweather/weather.h: only use single includes. Patch from
	Maxim Ermilov, #560794.

	* libgweather/weather-wx.c (wx_start_open): Use
	soup_message_body_set_accumulate() rather than the deprecated
	SOUP_MESSAGE_OVERWRITE_CHUNKS flag.


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libgweather/gweather-gconf.h
   trunk/libgweather/weather-wx.c
   trunk/libgweather/weather.c
   trunk/libgweather/weather.h

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Nov 25 17:35:05 2008
@@ -81,14 +81,19 @@
     AC_MSG_RESULT(no)
 fi
 
+if test "x$enable_maintainer_mode" = "xyes"; then
+	CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED"
+fi
+
 dnl -- Check for GTK+ 2.0 (required) ------------------------------------------
 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
-AC_SUBST(GTK_FLAGS)
+GTK_CFLAGS="$GTK_CFLAGS -DGTK_DISABLE_SINGLE_INCLUDES"
+AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
 dnl -- Check for libxml (required) ------------------------------------------
 PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED)
-AC_SUBST(LIBXML_FLAGS)
+AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_LIBS)
 
 dnl -- check for libsoup (required) -----------------------------------------
@@ -111,6 +116,7 @@
 
 dnl -- check for glib; redundant at this point, but sets $GLIB_MKENUMS
 AM_PATH_GLIB_2_0($GLIB_REQUIRED)
+CFLAGS="$CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
 
 dnl gettext
 

Modified: trunk/libgweather/gweather-gconf.h
==============================================================================
--- trunk/libgweather/gweather-gconf.h	(original)
+++ trunk/libgweather/gweather-gconf.h	Tue Nov 25 17:35:05 2008
@@ -32,8 +32,7 @@
 #endif
 
 
-#include <glib/gmacros.h>
-#include <glib/gerror.h>
+#include <glib.h>
 #include <gconf/gconf-client.h>
 #include <gconf/gconf-value.h>
 

Modified: trunk/libgweather/weather-wx.c
==============================================================================
--- trunk/libgweather/weather-wx.c	(original)
+++ trunk/libgweather/weather-wx.c	Tue Nov 25 17:35:05 2008
@@ -93,7 +93,7 @@
  
     msg = soup_message_new ("GET", url);
     g_signal_connect (msg, "got-chunk", G_CALLBACK (wx_got_chunk), info);
-    soup_message_set_flags (msg, SOUP_MESSAGE_OVERWRITE_CHUNKS);
+    soup_message_body_set_accumulate (msg->response_body, FALSE);
     soup_session_queue_message (info->session, msg, wx_finish, info);
     g_free (url);
 

Modified: trunk/libgweather/weather.c
==============================================================================
--- trunk/libgweather/weather.c	(original)
+++ trunk/libgweather/weather.c	Tue Nov 25 17:35:05 2008
@@ -34,9 +34,8 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gdk-pixbuf-loader.h>
 
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
 #include "weather.h"

Modified: trunk/libgweather/weather.h
==============================================================================
--- trunk/libgweather/weather.h	(original)
+++ trunk/libgweather/weather.h	Tue Nov 25 17:35:05 2008
@@ -25,7 +25,7 @@
 #endif
 
 
-#include <gdk-pixbuf/gdk-pixbuf-loader.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 G_BEGIN_DECLS