r7200 - in dumbhippo/trunk/client: common/hippo common/stacker linux/src

[commits mugshot org]

Author: otaylor
Date: 2008-01-14 13:25:31 -0600 (Mon, 14 Jan 2008)
New Revision: 7200

Modified:
   dumbhippo/trunk/client/common/hippo/hippo-basics.h
   dumbhippo/trunk/client/common/stacker/hippo-stacker-platform.h
   dumbhippo/trunk/client/linux/src/hippo-http.h
Log:
Move HippoHttpFunc into hippo-stacker-platform.h

Modified: dumbhippo/trunk/client/common/hippo/hippo-basics.h
===================================================================
--- dumbhippo/trunk/client/common/hippo/hippo-basics.h	2008-01-14 19:21:07 UTC (rev 7199)
+++ dumbhippo/trunk/client/common/hippo/hippo-basics.h	2008-01-14 19:25:31 UTC (rev 7200)
@@ -204,13 +204,6 @@
 
 typedef void (* HippoPrintDebugFunc) (const char *message);
 
-/* if content_type == NULL then we failed to get any content and the string is an error
- * message. If content_type != NULL then the string is the content.
- */
-typedef void (* HippoHttpFunc) (const char *content_type,
-                                GString    *content_or_error,
-                                void       *data);
-
 gboolean hippo_parse_int32  (const char *s,
                              int        *result);
 gboolean hippo_parse_int64  (const char *s,

Modified: dumbhippo/trunk/client/common/stacker/hippo-stacker-platform.h
===================================================================
--- dumbhippo/trunk/client/common/stacker/hippo-stacker-platform.h	2008-01-14 19:21:07 UTC (rev 7199)
+++ dumbhippo/trunk/client/common/stacker/hippo-stacker-platform.h	2008-01-14 19:25:31 UTC (rev 7200)
@@ -30,6 +30,13 @@
     HIPPO_WINDOW_STATE_ACTIVE /* the window the user is actively working with */
 } HippoWindowState;
 
+/* if content_type == NULL then we failed to get any content and the string is an error
+ * message. If content_type != NULL then the string is the content.
+ */
+typedef void (* HippoHttpFunc) (const char *content_type,
+                                GString    *content_or_error,
+                                void       *data);
+
 struct _HippoStackerPlatformClass {
     GTypeInterface base_iface;
 

Modified: dumbhippo/trunk/client/linux/src/hippo-http.h
===================================================================
--- dumbhippo/trunk/client/linux/src/hippo-http.h	2008-01-14 19:21:07 UTC (rev 7199)
+++ dumbhippo/trunk/client/linux/src/hippo-http.h	2008-01-14 19:25:31 UTC (rev 7200)
@@ -3,7 +3,7 @@
 #define __HIPPO_HTTP_H__
 
 #include <glib-object.h>
-#include <hippo/hippo-basics.h>
+#include <stacker/hippo-stacker-platform.h> /* For HippoHttpFunc */
 
 G_BEGIN_DECLS