[libgda] Corrected build regarding internal library

[Vivien Malerba <vivien src gnome org>]

commit 84ea8a2e8d20e839a5e969fe0b7d7c2cd8b35757
Author: Vivien Malerba <malerba gnome-db org>
Date:   Tue Oct 19 22:17:33 2010 +0200

    Corrected build regarding internal library

 libgda-ui/internal/popup-container.c               |   12 ++---
 tools/browser/canvas/browser-canvas-db-relations.c |    2 +-
 tools/browser/common/Makefile.am                   |    3 -
 tools/browser/common/objects-cloud.c               |    2 +-
 tools/browser/common/popup-container.c             |    1 -
 tools/browser/common/popup-container.h             |    1 -
 tools/browser/data-manager/data-console.c          |    2 +-
 .../browser/data-manager/data-favorite-selector.c  |    2 +-
 tools/browser/doc/tmpl/popup-container.sgml        |   42 --------------------
 tools/browser/query-exec/query-console.c           |    2 +-
 tools/browser/query-exec/query-editor.c            |    2 +-
 tools/browser/query-exec/query-favorite-selector.c |    2 +-
 tools/browser/schema-browser/objects-index.c       |    2 +-
 tools/browser/schema-browser/relations-diagram.c   |    2 +-
 tools/browser/schema-browser/table-info.c          |    2 +-
 15 files changed, 15 insertions(+), 64 deletions(-)
---
diff --git a/libgda-ui/internal/popup-container.c b/libgda-ui/internal/popup-container.c
index 9673b0c..d1420e9 100644
--- a/libgda-ui/internal/popup-container.c
+++ b/libgda-ui/internal/popup-container.c
@@ -249,13 +249,11 @@ popup_container_get_type (void)
 			(GInstanceInitFunc) popup_container_init,
 			0
 		};
-#ifdef PRIV_OBJ_PREFIX
-		type = g_type_register_static (GTK_TYPE_WINDOW, PRIV_OBJ_PREFIX "GdauiPopupContainer",
-					       &info, 0);
-#else
-		type = g_type_register_static (GTK_TYPE_WINDOW, "GdauiPopupContainer",
-					       &info, 0);
-#endif
+
+		type = g_type_from_name ("GdauiPopupContainer");
+		if (!type)
+			type = g_type_register_static (GTK_TYPE_WINDOW, "GdauiPopupContainer",
+						       &info, 0);
 	}
 	return type;
 }
diff --git a/tools/browser/canvas/browser-canvas-db-relations.c b/tools/browser/canvas/browser-canvas-db-relations.c
index c86ad11..94f3aa7 100644
--- a/tools/browser/canvas/browser-canvas-db-relations.c
+++ b/tools/browser/canvas/browser-canvas-db-relations.c
@@ -28,7 +28,7 @@
 #include "browser-canvas-column.h"
 #include "browser-canvas-fkey.h"
 #include "../common/objects-cloud.h"
-#include "../common/popup-container.h"
+#include <libgda-ui/internal/popup-container.h>
 
 static void browser_canvas_db_relations_class_init (BrowserCanvasDbRelationsClass *class);
 static void browser_canvas_db_relations_init       (BrowserCanvasDbRelations *canvas);
diff --git a/tools/browser/common/Makefile.am b/tools/browser/common/Makefile.am
index 6537dcc..94f6561 100644
--- a/tools/browser/common/Makefile.am
+++ b/tools/browser/common/Makefile.am
@@ -4,7 +4,6 @@ AM_CPPFLAGS = \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libgda \
-	-DPRIV_OBJ_PREFIX="\"BROWSER\"" \
 	$(LIBGDA_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(MAC_INTEGRATION_CFLAGS)
@@ -19,8 +18,6 @@ libcommon_la_SOURCES = \
 	marshal.h \
 	objects-cloud.c \
 	objects-cloud.h \
-	popup-container.c \
-	popup-container.h \
 	gdaui-data-import.c \
 	gdaui-data-import.h \
 	gdaui-entry-import.c \
diff --git a/tools/browser/common/objects-cloud.c b/tools/browser/common/objects-cloud.c
index 9190b21..503888d 100644
--- a/tools/browser/common/objects-cloud.c
+++ b/tools/browser/common/objects-cloud.c
@@ -31,7 +31,7 @@
 #include "../cc-gray-bar.h"
 #include "marshal.h"
 #include <gdk/gdkkeysyms.h>
-#include "popup-container.h"
+#include <libgda-ui/internal/popup-container.h>
 
 struct _ObjectsCloudPrivate {
 	gboolean             show_schemas;
diff --git a/tools/browser/data-manager/data-console.c b/tools/browser/data-manager/data-console.c
index f969320..c495620 100644
--- a/tools/browser/data-manager/data-console.c
+++ b/tools/browser/data-manager/data-console.c
@@ -33,7 +33,7 @@
 #include "../browser-page.h"
 #include "../browser-perspective.h"
 #include "../browser-stock-icons.h"
-#include "../common/popup-container.h"
+#include <libgda-ui/internal/popup-container.h>
 #include <libgda/sql-parser/gda-sql-parser.h>
 #include <libgda-ui/libgda-ui.h>
 #include "data-source-manager.h"
diff --git a/tools/browser/data-manager/data-favorite-selector.c b/tools/browser/data-manager/data-favorite-selector.c
index 1ebc9cf..b1702a6 100644
--- a/tools/browser/data-manager/data-favorite-selector.c
+++ b/tools/browser/data-manager/data-favorite-selector.c
@@ -33,7 +33,7 @@
 #include "../cc-gray-bar.h"
 #include "../browser-favorites.h"
 #include <gdk/gdkkeysyms.h>
-#include "../common/popup-container.h"
+#include <libgda-ui/internal/popup-container.h>
 
 #ifdef HAVE_GTKSOURCEVIEW
   #ifdef GTK_DISABLE_SINGLE_INCLUDES
diff --git a/tools/browser/doc/tmpl/popup-container.sgml b/tools/browser/doc/tmpl/popup-container.sgml
index 00766c0..e3fcf93 100644
--- a/tools/browser/doc/tmpl/popup-container.sgml
+++ b/tools/browser/doc/tmpl/popup-container.sgml
@@ -20,45 +20,3 @@ Popup window without any frame which hides itself when focus goes out
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### STRUCT PopupContainer ##### -->
-<para>
-
-</para>
-
- parent: 
- priv: 
-
-<!-- ##### STRUCT PopupContainerPrivate ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### USER_FUNCTION PopupContainerPositionFunc ##### -->
-<para>
-
-</para>
-
- cont: 
- out_x: 
- out_y: 
-
-
-<!-- ##### FUNCTION popup_container_new ##### -->
-<para>
-
-</para>
-
- position_widget: 
- Returns: 
-
-
-<!-- ##### FUNCTION popup_container_new_with_func ##### -->
-<para>
-
-</para>
-
- pos_func: 
- Returns: 
-
-
diff --git a/tools/browser/query-exec/query-console.c b/tools/browser/query-exec/query-console.c
index cf37d77..e37aab4 100644
--- a/tools/browser/query-exec/query-console.c
+++ b/tools/browser/query-exec/query-console.c
@@ -32,7 +32,7 @@
 #include "../browser-stock-icons.h"
 #include "query-editor.h"
 #include "query-result.h"
-#include "../common/popup-container.h"
+#include <libgda-ui/internal/popup-container.h>
 #include <libgda/sql-parser/gda-sql-parser.h>
 #include <libgda-ui/libgda-ui.h>
 
diff --git a/tools/browser/query-exec/query-editor.c b/tools/browser/query-exec/query-editor.c
index 5bcc9ae..8e012bd 100644
--- a/tools/browser/query-exec/query-editor.c
+++ b/tools/browser/query-exec/query-editor.c
@@ -39,7 +39,7 @@
 #include <binreloc/gda-binreloc.h>
 #include "../browser-connection.h"
 #include "../browser-window.h"
-#include "../common/popup-container.h"
+#include <libgda-ui/internal/popup-container.h>
 #include "../support.h"
 
 #define QUERY_EDITOR_LANGUAGE_SQL "gda-sql"
diff --git a/tools/browser/query-exec/query-favorite-selector.c b/tools/browser/query-exec/query-favorite-selector.c
index 8b4a23b..fcb1005 100644
--- a/tools/browser/query-exec/query-favorite-selector.c
+++ b/tools/browser/query-exec/query-favorite-selector.c
@@ -33,7 +33,7 @@
 #include "../cc-gray-bar.h"
 #include "../browser-favorites.h"
 #include <gdk/gdkkeysyms.h>
-#include "../common/popup-container.h"
+#include <libgda-ui/internal/popup-container.h>
 #include "query-editor.h"
 
 struct _QueryFavoriteSelectorPrivate {
diff --git a/tools/browser/schema-browser/objects-index.c b/tools/browser/schema-browser/objects-index.c
index 817d824..6dfbf13 100644
--- a/tools/browser/schema-browser/objects-index.c
+++ b/tools/browser/schema-browser/objects-index.c
@@ -31,7 +31,7 @@
 #include "../cc-gray-bar.h"
 #include "marshal.h"
 #include <gdk/gdkkeysyms.h>
-#include "../common/popup-container.h"
+#include <libgda-ui/internal/popup-container.h>
 #include "../common/objects-cloud.h"
 
 struct _ObjectsIndexPrivate {
diff --git a/tools/browser/schema-browser/relations-diagram.c b/tools/browser/schema-browser/relations-diagram.c
index 8af7718..f198822 100644
--- a/tools/browser/schema-browser/relations-diagram.c
+++ b/tools/browser/schema-browser/relations-diagram.c
@@ -27,7 +27,7 @@
 #include "../cc-gray-bar.h"
 #include "../canvas/browser-canvas-db-relations.h"
 #include <gdk/gdkkeysyms.h>
-#include "../common/popup-container.h"
+#include <libgda-ui/internal/popup-container.h>
 #include "../browser-page.h"
 #include "../browser-perspective.h"
 #include "../browser-window.h"
diff --git a/tools/browser/schema-browser/table-info.c b/tools/browser/schema-browser/table-info.c
index 8665131..67c7a7d 100644
--- a/tools/browser/schema-browser/table-info.c
+++ b/tools/browser/schema-browser/table-info.c
@@ -38,7 +38,7 @@
 #include "../data-manager/data-manager-perspective.h"
 #include <libgda-ui/gdaui-enums.h>
 #include <libgda-ui/gdaui-basic-form.h>
-#include "../common/popup-container.h"
+#include <libgda-ui/internal/popup-container.h>
 #include <libgda/gda-data-model-extra.h>
 
 struct _TableInfoPrivate {