GNOME.org
 

r7206 - in dumbhippo/trunk/client: linux linux/src windows/HippoUI

Author: otaylor
Date: 2008-01-15 11:57:12 -0600 (Tue, 15 Jan 2008)
New Revision: 7206

Added:
   dumbhippo/trunk/client/linux/Makefile-libengine.am
Modified:
   dumbhippo/trunk/client/linux/Makefile-libhippo.am
   dumbhippo/trunk/client/linux/Makefile-mugshot-uri-handler.am
   dumbhippo/trunk/client/linux/Makefile-mugshot.am
   dumbhippo/trunk/client/linux/Makefile.am
   dumbhippo/trunk/client/linux/configure.ac
   dumbhippo/trunk/client/linux/src/hippo-cookies-linux.c
   dumbhippo/trunk/client/linux/src/hippo-dbus-cookies.c
   dumbhippo/trunk/client/linux/src/hippo-dbus-model.c
   dumbhippo/trunk/client/linux/src/hippo-dbus-mugshot.h
   dumbhippo/trunk/client/linux/src/hippo-dbus-server.c
   dumbhippo/trunk/client/linux/src/hippo-dbus-server.h
   dumbhippo/trunk/client/linux/src/hippo-dbus-settings.c
   dumbhippo/trunk/client/linux/src/hippo-platform-impl.h
   dumbhippo/trunk/client/linux/src/hippo-status-icon.h
   dumbhippo/trunk/client/linux/src/main.h
   dumbhippo/trunk/client/linux/src/uri-handler.c
   dumbhippo/trunk/client/windows/HippoUI/HippoAbstractControl.h
   dumbhippo/trunk/client/windows/HippoUI/HippoAbstractWindow.h
   dumbhippo/trunk/client/windows/HippoUI/HippoChatManager.h
   dumbhippo/trunk/client/windows/HippoUI/HippoChatWindow.h
   dumbhippo/trunk/client/windows/HippoUI/HippoCrash.h
   dumbhippo/trunk/client/windows/HippoUI/HippoListenerProxy.h
   dumbhippo/trunk/client/windows/HippoUI/HippoPlatformImpl.cpp
   dumbhippo/trunk/client/windows/HippoUI/HippoPlatformImpl.h
   dumbhippo/trunk/client/windows/HippoUI/HippoPreferences.h
   dumbhippo/trunk/client/windows/HippoUI/HippoScrollbar.h
   dumbhippo/trunk/client/windows/HippoUI/HippoUI.h
   dumbhippo/trunk/client/windows/HippoUI/HippoUIUtil.h
Log:
Adapt linux/windows backend to moving engine files out of common/hippo.


Copied: dumbhippo/trunk/client/linux/Makefile-libengine.am (from rev 7196, dumbhippo/trunk/client/linux/Makefile-libhippo.am)
===================================================================
--- dumbhippo/trunk/client/linux/Makefile-libhippo.am	2008-01-14 18:37:02 UTC (rev 7196)
+++ dumbhippo/trunk/client/linux/Makefile-libengine.am	2008-01-15 17:57:12 UTC (rev 7206)
@@ -0,0 +1,77 @@
+noinst_LTLIBRARIES += libengine.la
+
+libengine_la_CPPFLAGS =			\
+	$(AM_CPPFLAGS)			\
+	-I $(MARSHAL_DIR)		\
+	$(LIBENGINE_CFLAGS)		\
+	-DDDM_I_KNOW_THIS_IS_UNSTABLE=1
+
+libengine_la_LIBADD = 			\
+	$(LIBENGINE_LIBS)		\
+	libhippo.la			\
+	libddm-1.la
+
+# none of this actually matters since it's just a convenience library, keeping it 
+# for future reference
+# libengine_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined
+
+COMMON_MARSHAL_LIST=$(COMMONSRCDIR)/engine/hippo-engine-marshal.list
+COMMON_MARSHAL_HEADER=$(MARSHAL_DIR)/hippo-engine-marshal.h
+COMMON_MARSHAL_BODY=$(MARSHAL_DIR)/hippo-engine-marshal.c
+
+$(COMMON_MARSHAL_HEADER): $(COMMON_MARSHAL_LIST)
+	mkdir $(MARSHAL_DIR) || true
+	$(GLIB_GENMARSHAL) --prefix=hippo_engine_marshal $(COMMON_MARSHAL_LIST) --header > $(COMMON_MARSHAL_HEADER)
+
+$(COMMON_MARSHAL_BODY): $(COMMON_MARSHAL_LIST)
+	mkdir $(MARSHAL_DIR) || true
+	(echo "#include \"hippo-engine-marshal.h\""; $(GLIB_GENMARSHAL) --prefix=hippo_engine_marshal $(COMMON_MARSHAL_LIST) --body) > $(COMMON_MARSHAL_BODY)
+
+LIBENGINE_SOURCEFILES =						\
+	$(COMMONSRCDIR)/engine/hippo-chat-room.c		\
+	$(COMMONSRCDIR)/engine/hippo-chat-room.h		\
+	$(COMMONSRCDIR)/engine/hippo-connection.c		\
+	$(COMMONSRCDIR)/engine/hippo-connection.h		\
+	$(COMMONSRCDIR)/engine/hippo-cookies.c			\
+	$(COMMONSRCDIR)/engine/hippo-cookies.h			\
+	$(COMMONSRCDIR)/engine/hippo-data-cache.c		\
+	$(COMMONSRCDIR)/engine/hippo-data-cache.h		\
+	$(COMMONSRCDIR)/engine/hippo-data-cache-internal.h	\
+	$(COMMONSRCDIR)/engine/hippo-disk-cache.c		\
+	$(COMMONSRCDIR)/engine/hippo-disk-cache.h		\
+	$(COMMONSRCDIR)/engine/hippo-data-model-backend.c	\
+	$(COMMONSRCDIR)/engine/hippo-data-model-backend.h	\
+	$(COMMONSRCDIR)/engine/hippo-endpoint-proxy.c		\
+	$(COMMONSRCDIR)/engine/hippo-endpoint-proxy.h		\
+        $(COMMONSRCDIR)/engine/hippo-engine.h			\
+        $(COMMONSRCDIR)/engine/hippo-engine-basics.c		\
+        $(COMMONSRCDIR)/engine/hippo-engine-basics.h		\
+        $(COMMONSRCDIR)/engine/hippo-engine-internal.h		\
+	$(COMMONSRCDIR)/engine/hippo-platform.c			\
+	$(COMMONSRCDIR)/engine/hippo-platform.h			\
+	$(COMMONSRCDIR)/engine/hippo-settings.c			\
+	$(COMMONSRCDIR)/engine/hippo-settings.h			\
+	$(COMMONSRCDIR)/engine/hippo-sqlite-utils.c     	\
+	$(COMMONSRCDIR)/engine/hippo-sqlite-utils.h     	\
+	$(COMMONSRCDIR)/engine/hippo-title-pattern.c		\
+	$(COMMONSRCDIR)/engine/hippo-title-pattern.h		\
+	$(COMMONSRCDIR)/engine/hippo-xml-utils.c		\
+	$(COMMONSRCDIR)/engine/hippo-xml-utils.h
+
+LIBENGINE_BUILT_SOURCEFILES =			\
+	$(COMMON_MARSHAL_HEADER)		\
+	$(COMMON_MARSHAL_BODY)
+
+MAINTAINERCLEANFILES +=	$(LIBENGINE_BUILT_SOURCEFILES)
+BUILT_SOURCES += $(LIBENGINE_BUILT_SOURCEFILES)	
+
+## we need to nodist these because otherwise automake would copy 
+## ../common to distdir/../common which puts common outside of distdir.
+## so we handle the disting manually so the destination is always distdir/common-dist
+nodist_libengine_la_SOURCES=$(LIBENGINE_SOURCEFILES) $(LIBENGINE_BUILT_SOURCEFILES)
+libengine-dist-hook:
+	-mkdir $(distdir)/common-dist
+	mkdir $(distdir)/common-dist/engine
+	mkdir $(distdir)/common-dist/engine/generated
+	cp $(LIBENGINE_SOURCEFILES) $(distdir)/common-dist/hippo
+	cp $(COMMONSRCDIR)/engine/hippo-engine-marshal.list $(distdir)/common-dist/hippo

Modified: dumbhippo/trunk/client/linux/Makefile-libhippo.am
===================================================================
--- dumbhippo/trunk/client/linux/Makefile-libhippo.am	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/linux/Makefile-libhippo.am	2008-01-15 17:57:12 UTC (rev 7206)
@@ -10,71 +10,23 @@
 	$(LIBHIPPO_LIBS)		\
 	libddm-1.la
 
-# none of this actually matters since it's just a convenience library, keeping it 
-# for future reference
-# libhippo_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined
-
-COMMON_MARSHAL_LIST=$(COMMONSRCDIR)/hippo/hippo-common-marshal.list
-COMMON_MARSHAL_HEADER=$(MARSHAL_DIR)/hippo-common-marshal.h
-COMMON_MARSHAL_BODY=$(MARSHAL_DIR)/hippo-common-marshal.c
-
-$(COMMON_MARSHAL_HEADER): $(COMMON_MARSHAL_LIST)
-	mkdir $(MARSHAL_DIR) || true
-	$(GLIB_GENMARSHAL) --prefix=hippo_common_marshal $(COMMON_MARSHAL_LIST) --header > $(COMMON_MARSHAL_HEADER)
-
-$(COMMON_MARSHAL_BODY): $(COMMON_MARSHAL_LIST)
-	mkdir $(MARSHAL_DIR) || true
-	(echo "#include \"hippo-common-marshal.h\""; $(GLIB_GENMARSHAL) --prefix=hippo_common_marshal $(COMMON_MARSHAL_LIST) --body) > $(COMMON_MARSHAL_BODY)
-
 LIBHIPPO_SOURCEFILES =						\
 	$(COMMONSRCDIR)/hippo/hippo-basics.c			\
 	$(COMMONSRCDIR)/hippo/hippo-basics.h			\
-	$(COMMONSRCDIR)/hippo/hippo-chat-room.c			\
-	$(COMMONSRCDIR)/hippo/hippo-chat-room.h			\
 	$(COMMONSRCDIR)/hippo/hippo-common.h			\
         $(COMMONSRCDIR)/hippo/hippo-common-internal.h		\
-	$(COMMONSRCDIR)/hippo/hippo-connection.c		\
-	$(COMMONSRCDIR)/hippo/hippo-connection.h		\
-	$(COMMONSRCDIR)/hippo/hippo-cookies.c			\
-	$(COMMONSRCDIR)/hippo/hippo-cookies.h			\
-	$(COMMONSRCDIR)/hippo/hippo-data-cache.c		\
-	$(COMMONSRCDIR)/hippo/hippo-data-cache.h		\
-	$(COMMONSRCDIR)/hippo/hippo-data-cache-internal.h	\
-	$(COMMONSRCDIR)/hippo/hippo-disk-cache.c		\
-	$(COMMONSRCDIR)/hippo/hippo-disk-cache.h		\
-	$(COMMONSRCDIR)/hippo/hippo-data-model-backend.c	\
-	$(COMMONSRCDIR)/hippo/hippo-data-model-backend.h	\
 	$(COMMONSRCDIR)/hippo/hippo-entity.c			\
 	$(COMMONSRCDIR)/hippo/hippo-entity.h			\
 	$(COMMONSRCDIR)/hippo/hippo-entity-protected.h		\
-	$(COMMONSRCDIR)/hippo/hippo-endpoint-proxy.c		\
-	$(COMMONSRCDIR)/hippo/hippo-endpoint-proxy.h		\
 	$(COMMONSRCDIR)/hippo/hippo-feed.c			\
 	$(COMMONSRCDIR)/hippo/hippo-feed.h			\
 	$(COMMONSRCDIR)/hippo/hippo-group.c			\
 	$(COMMONSRCDIR)/hippo/hippo-group.h			\
 	$(COMMONSRCDIR)/hippo/hippo-person.c			\
 	$(COMMONSRCDIR)/hippo/hippo-person.h			\
-	$(COMMONSRCDIR)/hippo/hippo-platform.c			\
-	$(COMMONSRCDIR)/hippo/hippo-platform.h			\
-	$(COMMONSRCDIR)/hippo/hippo-settings.c			\
-	$(COMMONSRCDIR)/hippo/hippo-settings.h			\
-	$(COMMONSRCDIR)/hippo/hippo-sqlite-utils.c     		\
-	$(COMMONSRCDIR)/hippo/hippo-sqlite-utils.h     		\	
-	$(COMMONSRCDIR)/hippo/hippo-title-pattern.c		\
-	$(COMMONSRCDIR)/hippo/hippo-title-pattern.h		\
 	$(COMMONSRCDIR)/hippo/hippo-track.c			\
-	$(COMMONSRCDIR)/hippo/hippo-track.h			\
-	$(COMMONSRCDIR)/hippo/hippo-xml-utils.c			\
-	$(COMMONSRCDIR)/hippo/hippo-xml-utils.h
+	$(COMMONSRCDIR)/hippo/hippo-track.h
 
-LIBHIPPO_BUILT_SOURCEFILES =			\
-	$(COMMON_MARSHAL_HEADER)		\
-	$(COMMON_MARSHAL_BODY)
-
-MAINTAINERCLEANFILES +=	$(LIBHIPPO_BUILT_SOURCEFILES)
-BUILT_SOURCES += $(LIBHIPPO_BUILT_SOURCEFILES)	
-
 ## we need to nodist these because otherwise automake would copy 
 ## ../common to distdir/../common which puts common outside of distdir.
 ## so we handle the disting manually so the destination is always distdir/common-dist
@@ -84,4 +36,3 @@
 	mkdir $(distdir)/common-dist/hippo
 	mkdir $(distdir)/common-dist/hippo/generated
 	cp $(LIBHIPPO_SOURCEFILES) $(distdir)/common-dist/hippo
-	cp $(COMMONSRCDIR)/hippo/hippo-common-marshal.list $(distdir)/common-dist/hippo

Modified: dumbhippo/trunk/client/linux/Makefile-mugshot-uri-handler.am
===================================================================
--- dumbhippo/trunk/client/linux/Makefile-mugshot-uri-handler.am	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/linux/Makefile-mugshot-uri-handler.am	2008-01-15 17:57:12 UTC (rev 7206)
@@ -5,7 +5,7 @@
 	$(MUGSHOT_URI_HANDLER_CFLAGS)
 
 mugshot_uri_handler_LDFLAGS=
-mugshot_uri_handler_LDADD= libhippo.la $(MUGSHOT_URI_HANDLER_LIBS)
+mugshot_uri_handler_LDADD= libhippo.la libengine.la $(MUGSHOT_URI_HANDLER_LIBS)
 
 mugshot_uri_handler_SOURCES=			\
 	src/hippo-dbus-client.c			\

Modified: dumbhippo/trunk/client/linux/Makefile-mugshot.am
===================================================================
--- dumbhippo/trunk/client/linux/Makefile-mugshot.am	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/linux/Makefile-mugshot.am	2008-01-15 17:57:12 UTC (rev 7206)
@@ -1,4 +1,4 @@
-bin_PROGRAMS += mugshot mugshot-uri-handler
+bin_PROGRAMS += mugshot
 
 mugshot_CPPFLAGS = 			\
 	$(AM_CPPFLAGS)			\
@@ -9,7 +9,7 @@
 	-DDDM_I_KNOW_THIS_IS_UNSTABLE=1
 
 mugshot_LDFLAGS=
-mugshot_LDADD= libhippoipc.la libhippo.la libstacker.la $(MUGSHOT_LIBS) $(CANVAS_LIBADD)
+mugshot_LDADD= libhippoipc.la libhippo.la libengine.la libstacker.la $(MUGSHOT_LIBS) $(CANVAS_LIBADD)
 
 if !HAVE_GTK210
 mugshot_CPPFLAGS += -I$(top_srcdir)/gtkcopy

Modified: dumbhippo/trunk/client/linux/Makefile.am
===================================================================
--- dumbhippo/trunk/client/linux/Makefile.am	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/linux/Makefile.am	2008-01-15 17:57:12 UTC (rev 7206)
@@ -67,6 +67,7 @@
 include Makefile-libddm.am
 include Makefile-libhippoipc.am
 include Makefile-libhippo.am
+include Makefile-libengine.am
 include Makefile-libstacker.am
 include Makefile-libgtkcopy.am
 include Makefile-libhippofirefox.am

Modified: dumbhippo/trunk/client/linux/configure.ac
===================================================================
--- dumbhippo/trunk/client/linux/configure.ac	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/linux/configure.ac	2008-01-15 17:57:12 UTC (rev 7206)
@@ -454,7 +454,8 @@
 
 PKG_CHECK_MODULES(LIBDDM, gobject-2.0 >= $GLIB2_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED)
 PKG_CHECK_MODULES(LIBHIPPOCANVAS, gtk+-2.0 >= $GTK2_REQUIRED gobject-2.0 >= $GLIB2_REQUIRED cairo pango)
-PKG_CHECK_MODULES(LIBHIPPO, gobject-2.0 >= $GLIB2_REQUIRED gthread-2.0 loudmouth-1.0 >= $LOUDMOUTH_REQUIRED $PCRE_MODULES $SQLITE_MODULES)
+PKG_CHECK_MODULES(LIBHIPPO, gobject-2.0 >= $GLIB2_REQUIRED gthread-2.0)
+PKG_CHECK_MODULES(LIBENGINE, gobject-2.0 >= $GLIB2_REQUIRED gthread-2.0 loudmouth-1.0 >= $LOUDMOUTH_REQUIRED $PCRE_MODULES $SQLITE_MODULES)
 PKG_CHECK_MODULES(LIBSTACKER, gobject-2.0 >= $GLIB2_REQUIRED gthread-2.0 cairo pango $CANVAS_MODULES)
 AC_DEFINE(HIPPO_LOUDMOUTH_IS_10, 1, [Define if Loudmouth is version 1.0 or below])
 PKG_CHECK_MODULES(LIBHIPPOIPC, gobject-2.0 dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED)

Modified: dumbhippo/trunk/client/linux/src/hippo-cookies-linux.c
===================================================================
--- dumbhippo/trunk/client/linux/src/hippo-cookies-linux.c	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/linux/src/hippo-cookies-linux.c	2008-01-15 17:57:12 UTC (rev 7206)
@@ -3,6 +3,7 @@
 #include "hippo-cookies-linux.h"
 #include <string.h>
 #include <libgnomevfs/gnome-vfs.h>
+#include <engine/hippo-cookies.h>
 
 typedef struct {
     HippoCookiesMonitorFunc func;

Modified: dumbhippo/trunk/client/linux/src/hippo-dbus-cookies.c
===================================================================
--- dumbhippo/trunk/client/linux/src/hippo-dbus-cookies.c	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/linux/src/hippo-dbus-cookies.c	2008-01-15 17:57:12 UTC (rev 7206)
@@ -10,6 +10,7 @@
 #include "hippo-dbus-server.h"
 #include "hippo-dbus-web.h"
 #include "hippo-dbus-cookies.h"
+#include <engine/hippo-cookies.h>
 #include "main.h"
 
 /* This is its own file primarily because it likely needs a cache if ever really

Modified: dumbhippo/trunk/client/linux/src/hippo-dbus-model.c
===================================================================
--- dumbhippo/trunk/client/linux/src/hippo-dbus-model.c	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/linux/src/hippo-dbus-model.c	2008-01-15 17:57:12 UTC (rev 7206)
@@ -15,7 +15,7 @@
  * API.
  */
 
-#include <hippo/hippo-data-cache.h>
+#include <engine/hippo-data-cache.h>
 
 typedef struct _DataClientId           DataClientId;
 typedef struct _DataClientMap          DataClientMap;

Modified: dumbhippo/trunk/client/linux/src/hippo-dbus-mugshot.h
===================================================================
--- dumbhippo/trunk/client/linux/src/hippo-dbus-mugshot.h	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/linux/src/hippo-dbus-mugshot.h	2008-01-15 17:57:12 UTC (rev 7206)
@@ -36,8 +36,6 @@
 
 
 #include "hippo-dbus-server.h"
-#include "hippo/hippo-connection.h"
-#include "hippo/hippo-external-account.h"
 
 G_BEGIN_DECLS
 

Modified: dumbhippo/trunk/client/linux/src/hippo-dbus-server.c
===================================================================
--- dumbhippo/trunk/client/linux/src/hippo-dbus-server.c	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/linux/src/hippo-dbus-server.c	2008-01-15 17:57:12 UTC (rev 7206)
@@ -17,7 +17,7 @@
 #include "hippo-dbus-web.h"
 #include "hippo-dbus-http.h"
 #include "hippo-distribution.h"
-#include <hippo/hippo-endpoint-proxy.h>
+#include <engine/hippo-endpoint-proxy.h>
 #include <stacker/hippo-stack-manager.h>
 #include "main.h"
 

Modified: dumbhippo/trunk/client/linux/src/hippo-dbus-server.h
===================================================================
--- dumbhippo/trunk/client/linux/src/hippo-dbus-server.h	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/linux/src/hippo-dbus-server.h	2008-01-15 17:57:12 UTC (rev 7206)
@@ -6,7 +6,6 @@
 
 #include <glib-object.h>
 #include <hippo/hippo-basics.h>
-#include <hippo/hippo-external-account.h>
 #include "main.h"
 
 G_BEGIN_DECLS
@@ -48,10 +47,6 @@
 void       hippo_dbus_notify_xmpp_connected    (HippoDBus   *dbus,
                                                 gboolean     connected);
                                                 
-void       hippo_dbus_notify_whereim_changed   (HippoDBus               *dbus,
-                                                HippoConnection         *xmpp_connection,
-                                                HippoExternalAccount    *acct);                                                
-
 void       hippo_dbus_notify_entity_changed    (HippoDBus               *dbus,
                                                 HippoEntity             *entity);
 

Modified: dumbhippo/trunk/client/linux/src/hippo-dbus-settings.c
===================================================================
--- dumbhippo/trunk/client/linux/src/hippo-dbus-settings.c	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/linux/src/hippo-dbus-settings.c	2008-01-15 17:57:12 UTC (rev 7206)
@@ -6,7 +6,7 @@
 #define DBUS_API_SUBJECT_TO_CHANGE 1
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include <hippo/hippo-settings.h>
+#include <engine/hippo-settings.h>
 #include "hippo-dbus-server.h"
 #include "hippo-dbus-web.h"
 #include "hippo-dbus-settings.h"

Modified: dumbhippo/trunk/client/linux/src/hippo-platform-impl.h
===================================================================
--- dumbhippo/trunk/client/linux/src/hippo-platform-impl.h	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/linux/src/hippo-platform-impl.h	2008-01-15 17:57:12 UTC (rev 7206)
@@ -2,7 +2,7 @@
 #ifndef __HIPPO_PLATFORM_IMPL_H__
 #define __HIPPO_PLATFORM_IMPL_H__
 
-#include <hippo/hippo-common.h>
+#include <engine/hippo-platform.h>
 
 G_BEGIN_DECLS
 

Modified: dumbhippo/trunk/client/linux/src/hippo-status-icon.h
===================================================================
--- dumbhippo/trunk/client/linux/src/hippo-status-icon.h	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/linux/src/hippo-status-icon.h	2008-01-15 17:57:12 UTC (rev 7206)
@@ -2,7 +2,7 @@
 #ifndef __HIPPO_STATUS_ICON_H__
 #define __HIPPO_STATUS_ICON_H__
 
-#include <hippo/hippo-common.h>
+#include <engine/hippo-engine.h>
 #include <gtk/gtkstatusicon.h>
 
 G_BEGIN_DECLS

Modified: dumbhippo/trunk/client/linux/src/main.h
===================================================================
--- dumbhippo/trunk/client/linux/src/main.h	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/linux/src/main.h	2008-01-15 17:57:12 UTC (rev 7206)
@@ -3,7 +3,7 @@
 #define __HIPPO_MAIN_H__
 
 #include <config.h>
-#include <hippo/hippo-common.h>
+#include <engine/hippo-engine.h>
 #include <stacker/hippo-stacker-platform.h>
 #include <stacker/hippo-stack-manager.h>
 

Modified: dumbhippo/trunk/client/linux/src/uri-handler.c
===================================================================
--- dumbhippo/trunk/client/linux/src/uri-handler.c	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/linux/src/uri-handler.c	2008-01-15 17:57:12 UTC (rev 7206)
@@ -1,6 +1,6 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 #include <config.h>
-#include <hippo/hippo-basics.h>
+#include <engine/hippo-engine-basics.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 #include <stdarg.h>

Modified: dumbhippo/trunk/client/windows/HippoUI/HippoAbstractControl.h
===================================================================
--- dumbhippo/trunk/client/windows/HippoUI/HippoAbstractControl.h	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/windows/HippoUI/HippoAbstractControl.h	2008-01-15 17:57:12 UTC (rev 7206)
@@ -7,7 +7,6 @@
 
 #include "HippoUIUtil.h"
 #include "HippoAbstractWindow.h"
-#include <hippo/hippo-basics.h>
 
 class HippoAbstractControl : public HippoAbstractWindow {
 public:

Modified: dumbhippo/trunk/client/windows/HippoUI/HippoAbstractWindow.h
===================================================================
--- dumbhippo/trunk/client/windows/HippoUI/HippoAbstractWindow.h	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/windows/HippoUI/HippoAbstractWindow.h	2008-01-15 17:57:12 UTC (rev 7206)
@@ -6,7 +6,6 @@
 
 #include <HippoMessageHook.h>
 #include <HippoUtil.h>
-#include <hippo/hippo-basics.h>
 #include <hippo/hippo-graphics.h>
 
 class HippoUI;

Modified: dumbhippo/trunk/client/windows/HippoUI/HippoChatManager.h
===================================================================
--- dumbhippo/trunk/client/windows/HippoUI/HippoChatManager.h	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/windows/HippoUI/HippoChatManager.h	2008-01-15 17:57:12 UTC (rev 7206)
@@ -7,7 +7,7 @@
 #include <HippoMessageHook.h>
 #include <HippoThreadExecutor.h>
 #include <HippoUtil.h>
-#include <hippo/hippo-basics.h>
+#include <stacker/hippo-window.h>
 
 class HippoChatWindow;
 

Modified: dumbhippo/trunk/client/windows/HippoUI/HippoChatWindow.h
===================================================================
--- dumbhippo/trunk/client/windows/HippoUI/HippoChatWindow.h	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/windows/HippoUI/HippoChatWindow.h	2008-01-15 17:57:12 UTC (rev 7206)
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <HippoUtil.h>
-#include <hippo/hippo-basics.h>
+#include <stacker/hippo-window.h>
 
 class HippoChatManager;
 

Modified: dumbhippo/trunk/client/windows/HippoUI/HippoCrash.h
===================================================================
--- dumbhippo/trunk/client/windows/HippoUI/HippoCrash.h	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/windows/HippoUI/HippoCrash.h	2008-01-15 17:57:12 UTC (rev 7206)
@@ -3,7 +3,7 @@
  * Copyright Red Hat, Inc. 2007
  **/
 
-#include <hippo/hippo-basics.h>
+#include <engine/hippo-engine-basics.h>
 
 // Called when the executable is invoked from a crash handler in reporting
 // mode. Returns true if we should continue on to normal executions
@@ -13,4 +13,4 @@
 void hippoCrashInit(HippoInstanceType instance);
 
 // Force a dump
-void hippoCrashDump();
\ No newline at end of file
+void hippoCrashDump();

Modified: dumbhippo/trunk/client/windows/HippoUI/HippoListenerProxy.h
===================================================================
--- dumbhippo/trunk/client/windows/HippoUI/HippoListenerProxy.h	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/windows/HippoUI/HippoListenerProxy.h	2008-01-15 17:57:12 UTC (rev 7206)
@@ -4,7 +4,7 @@
  **/
 #pragma once
 
-#include <hippo/hippo-endpoint-proxy.h>
+#include <engine/hippo-endpoint-proxy.h>
 #include <HippoUtil.h>
 
 class HippoListenerProxy {
@@ -23,4 +23,4 @@
     
     virtual STDMETHODIMP_(DWORD) AddRef() = 0;
     virtual STDMETHODIMP_(DWORD) Release() = 0;
-};
\ No newline at end of file
+};

Modified: dumbhippo/trunk/client/windows/HippoUI/HippoPlatformImpl.cpp
===================================================================
--- dumbhippo/trunk/client/windows/HippoUI/HippoPlatformImpl.cpp	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/windows/HippoUI/HippoPlatformImpl.cpp	2008-01-15 17:57:12 UTC (rev 7206)
@@ -10,7 +10,7 @@
 #include <ShlObj.h>
 #include <Windows.h>
 #include <mshtml.h>
-#include <hippo/hippo-basics.h>
+#include <hippo/hippo-engine-basics.h>
 #include <stacker/hippo-stacker-platform.h>
 
 static void      hippo_platform_impl_init                (HippoPlatformImpl       *impl);

Modified: dumbhippo/trunk/client/windows/HippoUI/HippoPlatformImpl.h
===================================================================
--- dumbhippo/trunk/client/windows/HippoUI/HippoPlatformImpl.h	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/windows/HippoUI/HippoPlatformImpl.h	2008-01-15 17:57:12 UTC (rev 7206)
@@ -1,7 +1,7 @@
 #ifndef __HIPPO_PLATFORM_IMPL_H__
 #define __HIPPO_PLATFORM_IMPL_H__
 
-#include <hippo/hippo-platform.h>
+#include <engine/hippo-platform.h>
 #include "HippoPreferences.h"
 
 class HippoUI;

Modified: dumbhippo/trunk/client/windows/HippoUI/HippoPreferences.h
===================================================================
--- dumbhippo/trunk/client/windows/HippoUI/HippoPreferences.h	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/windows/HippoUI/HippoPreferences.h	2008-01-15 17:57:12 UTC (rev 7206)
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <HippoUtil.h>
-#include <hippo/hippo-basics.h>
+#include <engine/hippo-engine-basics.h>
 
 class HippoPreferences
 {

Modified: dumbhippo/trunk/client/windows/HippoUI/HippoScrollbar.h
===================================================================
--- dumbhippo/trunk/client/windows/HippoUI/HippoScrollbar.h	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/windows/HippoUI/HippoScrollbar.h	2008-01-15 17:57:12 UTC (rev 7206)
@@ -7,7 +7,6 @@
 
 #include "HippoAbstractControl.h"
 #include "HippoUIUtil.h"
-#include <hippo/hippo-basics.h>
 
 class HippoScrollbar : public HippoAbstractControl {
 public:

Modified: dumbhippo/trunk/client/windows/HippoUI/HippoUI.h
===================================================================
--- dumbhippo/trunk/client/windows/HippoUI/HippoUI.h	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/windows/HippoUI/HippoUI.h	2008-01-15 17:57:12 UTC (rev 7206)
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <glib.h>
-#include <hippo/hippo-common.h>
+#include <engine/hippo-engine.h>
 #include <HippoUtil.h>
 #include <HippoArray.h>
 #include <HippoMessageHook.h>

Modified: dumbhippo/trunk/client/windows/HippoUI/HippoUIUtil.h
===================================================================
--- dumbhippo/trunk/client/windows/HippoUI/HippoUIUtil.h	2008-01-15 04:51:00 UTC (rev 7205)
+++ dumbhippo/trunk/client/windows/HippoUI/HippoUIUtil.h	2008-01-15 17:57:12 UTC (rev 7206)
@@ -7,7 +7,6 @@
 #include <HippoUtil.h>
 #include <HippoArray.h>
 #include <glib-object.h>
-#include <hippo/hippo-basics.h>
 #include <hippo/hippo-graphics.h>
 
 class HippoUIUtil
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]