GNOME.org
 

[libgda] Fix for bug #594117

commit d0394d633ca117881e1076d2908fafa8d84b74cb
Author: Vivien Malerba <malerba gnome-db org>
Date:   Fri Sep 4 21:55:40 2009 +0200

    Fix for bug #594117

 tools/browser/Makefile.am                |    2 +-
 tools/browser/auth-dialog.c              |    4 ++--
 tools/browser/browser-connections-list.c |    4 ++--
 tools/browser/browser-stock-icons.c      |    2 +-
 tools/browser/browser-window.c           |    4 ++--
 tools/browser/canvas-example.c           |    2 +-
 tools/browser/data/Makefile.am           |   16 ++++++++--------
 tools/browser/login-dialog.c             |    4 ++--
 tools/browser/support.c                  |    2 +-
 9 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/tools/browser/Makefile.am b/tools/browser/Makefile.am
index 0e62382..cf32065 100644
--- a/tools/browser/Makefile.am
+++ b/tools/browser/Makefile.am
@@ -118,7 +118,7 @@ canvas_example_LDFLAGS = \
 	$(top_builddir)/tools/browser/common/libcommon.la
 
 # icons
-iconsdir=$(datadir)/pixmaps
+iconsdir=$(datadir)/libgda-4.0/pixmaps
 icons_DATA= \
 	gda-browser.png \
 	gda-browser-auth.png \
diff --git a/tools/browser/auth-dialog.c b/tools/browser/auth-dialog.c
index 430ed60..cf10aaa 100644
--- a/tools/browser/auth-dialog.c
+++ b/tools/browser/auth-dialog.c
@@ -146,7 +146,7 @@ auth_dialog_init (AuthDialog *dialog)
 	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 5);
 	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, TRUE);
 
-	str = gda_gbr_get_file_path (GDA_DATA_DIR, "pixmaps", "gda-browser-auth.png", NULL);
+	str = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "pixmaps", "gda-browser-auth.png", NULL);
 	gtk_window_set_icon_from_file (GTK_WINDOW (dialog), str, NULL);
 	g_free (str);
 
@@ -155,7 +155,7 @@ auth_dialog_init (AuthDialog *dialog)
 	gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0);
 	
-	str = gda_gbr_get_file_path (GDA_DATA_DIR, "pixmaps", "gda-browser-auth-big.png", NULL);
+	str = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "pixmaps", "gda-browser-auth-big.png", NULL);
 	wid = gtk_image_new_from_file (str);
 	g_free (str);
 	gtk_box_pack_start (GTK_BOX (hbox), wid, FALSE, FALSE, 0);
diff --git a/tools/browser/browser-connections-list.c b/tools/browser/browser-connections-list.c
index e682242..ac455c5 100644
--- a/tools/browser/browser-connections-list.c
+++ b/tools/browser/browser-connections-list.c
@@ -327,7 +327,7 @@ browser_connections_list_show (void)
 		g_signal_connect (G_OBJECT (clist), "delete_event",
 				  G_CALLBACK (delete_event), NULL);
 
-		str = gda_gbr_get_file_path (GDA_DATA_DIR, "pixmaps", "gda-browser-connected.png", NULL);
+		str = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "pixmaps", "gda-browser-connected.png", NULL);
 		gtk_window_set_icon_from_file (GTK_WINDOW (clist), str, NULL);
 		g_free (str);
 
@@ -343,7 +343,7 @@ browser_connections_list_show (void)
 		hbox = gtk_hbox_new (FALSE, 6);
 		gtk_table_attach (GTK_TABLE (table), hbox, 0, 3, 0, 1, GTK_EXPAND | GTK_FILL, 0, 0, 6);
 
-		str = gda_gbr_get_file_path (GDA_DATA_DIR, "pixmaps", "gda-browser-connected-big.png", NULL);
+		str = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "pixmaps", "gda-browser-connected-big.png", NULL);
 		wid = gtk_image_new_from_file (str);
 		g_free (str);
 		gtk_box_pack_start (GTK_BOX (hbox), wid, FALSE, FALSE, 0);
diff --git a/tools/browser/browser-stock-icons.c b/tools/browser/browser-stock-icons.c
index 2887e10..ad31171 100644
--- a/tools/browser/browser-stock-icons.c
+++ b/tools/browser/browser-stock-icons.c
@@ -84,6 +84,6 @@ browser_stock_icons_init (void)
 	 */
 	/* FIXME: multi-head! */
 	gchar *path;
-	path = gda_gbr_get_file_path (GDA_DATA_DIR, "libgda", "icons", NULL);
+	path = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "icons", NULL);
 	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), path);
 }
diff --git a/tools/browser/browser-window.c b/tools/browser/browser-window.c
index 73b4c58..9d25db1 100644
--- a/tools/browser/browser-window.c
+++ b/tools/browser/browser-window.c
@@ -293,7 +293,7 @@ browser_window_new (BrowserConnection *bcnc, BrowserPerspectiveFactory *factory)
 	/* icon */
 	GdkPixbuf *icon;
         gchar *path;
-        path = gda_gbr_get_file_path (GDA_DATA_DIR, "pixmaps", "gda-browser.png", NULL);
+        path = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "pixmaps", "gda-browser.png", NULL);
         icon = gdk_pixbuf_new_from_file (path, NULL);
         g_free (path);
         if (icon) {
@@ -778,7 +778,7 @@ about_cb (GtkAction *action, BrowserWindow *bwin)
         const gchar *translator_credits = "";
 
         gchar *path;
-        path = gda_gbr_get_file_path (GDA_DATA_DIR, "pixmaps", "gda-browser.png", NULL);
+        path = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "pixmaps", "gda-browser.png", NULL);
         icon = gdk_pixbuf_new_from_file (path, NULL);
         g_free (path);
 
diff --git a/tools/browser/canvas-example.c b/tools/browser/canvas-example.c
index 9131b97..60cfd83 100644
--- a/tools/browser/canvas-example.c
+++ b/tools/browser/canvas-example.c
@@ -185,7 +185,7 @@ browser_get_pixbuf_icon (BrowserIconType type)
                 array = g_new0 (GdkPixbuf *, BROWSER_ICON_LAST);
         if (!array [type]) {
                 gchar *path;
-                path = gda_gbr_get_file_path (GDA_DATA_DIR, "pixmaps", names[type], NULL);
+                path = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "pixmaps", names[type], NULL);
                 array [type] = gdk_pixbuf_new_from_file (path, NULL);
                 g_free (path);
 
diff --git a/tools/browser/data/Makefile.am b/tools/browser/data/Makefile.am
index eb220ae..d8fc4ab 100644
--- a/tools/browser/data/Makefile.am
+++ b/tools/browser/data/Makefile.am
@@ -37,12 +37,12 @@ update-icon-cache:
 	@-if test -z "$(DESTDIR)"; then \
 		echo "Updating Gtk icon cache."; \
 		for theme in $(public_icons_themes); do \
-			$(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
+			$(gtk_update_icon_cache) $(datadir)/libgda-4.0/icons/$$theme; \
 		done; \
 	else \
 		echo "*** Icon cache not updated.  After (un)install, run this:"; \
 		for theme in $(public_icons_themes); do \
-			echo "***   $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
+			echo "***   $(gtk_update_icon_cache) $(datadir)/libgda-4.0/icons/$$theme"; \
 		done; \
 	fi
 
@@ -52,16 +52,16 @@ install-icons:
 		CONTEXT=`echo $$icon | cut -d_ -f2`; \
 		SIZE=`echo $$icon | cut -d_ -f3`; \
 		ICONFILE=`echo $$icon | cut -d_ -f4`; \
-		mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
-		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+		mkdir -p $(DESTDIR)$(datadir)/libgda-4.0/icons/$$THEME/$$SIZE/$$CONTEXT; \
+		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/libgda-4.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
 	done; \
 	for icon in $(private_icons); do \
 		THEME=`echo $$icon | cut -d_ -f1`; \
 		CONTEXT=`echo $$icon | cut -d_ -f2`; \
 		SIZE=`echo $$icon | cut -d_ -f3`; \
 		ICONFILE=`echo $$icon | cut -d_ -f4`; \
-		mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
-		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+		mkdir -p $(DESTDIR)$(datadir)/libgda-4.0/icons/$$THEME/$$SIZE/$$CONTEXT; \
+		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/libgda-4.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
 	done
 
 uninstall-icons:
@@ -70,14 +70,14 @@ uninstall-icons:
 		CONTEXT=`echo $$icon | cut -d_ -f2`; \
 		SIZE=`echo $$icon | cut -d_ -f3`; \
 		ICONFILE=`echo $$icon | cut -d_ -f4`; \
-		rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+		rm -f $(DESTDIR)$(datadir)/libgda-4.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
 	done; \
 	for icon in $(private_icons); do \
 		THEME=`echo $$icon | cut -d_ -f1`; \
 		CONTEXT=`echo $$icon | cut -d_ -f2`; \
 		SIZE=`echo $$icon | cut -d_ -f3`; \
 		ICONFILE=`echo $$icon | cut -d_ -f4`; \
-		rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+		rm -f $(DESTDIR)$(datadir)/libgda-4.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
 	done
 
 install-data-local: install-icons update-icon-cache
diff --git a/tools/browser/login-dialog.c b/tools/browser/login-dialog.c
index ce14b6e..405a716 100644
--- a/tools/browser/login-dialog.c
+++ b/tools/browser/login-dialog.c
@@ -116,7 +116,7 @@ login_dialog_init (LoginDialog *dialog)
 	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 5);
 	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, FALSE);
 
-	str = gda_gbr_get_file_path (GDA_DATA_DIR, "pixmaps", "gda-browser-non-connected.png", NULL);
+	str = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "pixmaps", "gda-browser-non-connected.png", NULL);
 	gtk_window_set_icon_from_file (GTK_WINDOW (dialog), str, NULL);
 	g_free (str);
 
@@ -125,7 +125,7 @@ login_dialog_init (LoginDialog *dialog)
 	gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0);
 	
-	str = gda_gbr_get_file_path (GDA_DATA_DIR, "pixmaps", "gda-browser-non-connected-big.png", NULL);
+	str = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "pixmaps", "gda-browser-non-connected-big.png", NULL);
 	wid = gtk_image_new_from_file (str);
 	g_free (str);
 	gtk_box_pack_start (GTK_BOX (hbox), wid, FALSE, FALSE, 0);
diff --git a/tools/browser/support.c b/tools/browser/support.c
index 8eb647a..a9f4594 100644
--- a/tools/browser/support.c
+++ b/tools/browser/support.c
@@ -244,7 +244,7 @@ browser_get_pixbuf_icon (BrowserIconType type)
 		array = g_new0 (GdkPixbuf *, BROWSER_ICON_LAST);
 	if (!array [type]) {
 		gchar *path;
-		path = gda_gbr_get_file_path (GDA_DATA_DIR, "pixmaps", names[type], NULL);
+		path = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "pixmaps", names[type], NULL);
 		array [type] = gdk_pixbuf_new_from_file (path, NULL);
 		g_free (path);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]