[libgda] Install application icons with a 4.0 suffix

[Vivien Malerba <vivien src gnome org>]

commit 6e3ed77d2a09f1d891b814ce2ff7bcfa01f71d7b
Author: Vivien Malerba <malerba gnome-db org>
Date:   Mon Sep 14 21:43:18 2009 +0200

    Install application icons with a 4.0 suffix
    
    and moved all the other icons into $datadir)/libgda-4.0/pixmaps

 control-center/.gitignore                        |    2 +-
 control-center/Makefile.am                       |    8 ++++++--
 control-center/dsn-properties-dialog.c           |    2 +-
 control-center/gda-control-center-4.0.desktop.in |    2 +-
 control-center/gda-control-center-4.0.png        |    1 +
 control-center/gdaui-dsn-assistant.c             |    2 +-
 control-center/main.c                            |    4 ++--
 tools/browser/.gitignore                         |    2 +-
 tools/browser/Makefile.am                        |    7 ++++++-
 tools/browser/gda-browser-4.0.desktop.in         |    2 +-
 tools/browser/gda-browser-4.0.png                |    1 +
 11 files changed, 22 insertions(+), 11 deletions(-)
---
diff --git a/control-center/.gitignore b/control-center/.gitignore
index 1c2a8d5..cfbff4d 100644
--- a/control-center/.gitignore
+++ b/control-center/.gitignore
@@ -1,2 +1,2 @@
-gda-control-center-4.*
+gda-control-center-4.0
 gda-control-center-4.*.desktop
diff --git a/control-center/Makefile.am b/control-center/Makefile.am
index 93c4c2d..621e6f9 100644
--- a/control-center/Makefile.am
+++ b/control-center/Makefile.am
@@ -60,13 +60,17 @@ Desktop_in_files = gda-control-center-4.0.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
 # icons
-iconsdir=$(datadir)/pixmaps
+iconsdir=$(datadir)/libgda-4.0/pixmaps
 icons_DATA= \
 	gda-control-center.png \
 	gda-control-center-newcnc.png
 
+appiconsdir=$(datadir)/pixmaps
+appicons_DATA= \
+	gda-control-center-4.0.png
+
 EXTRA_DIST = \
 	control-center-res.rc \
 	gda-control-center.ico \
-	$(Desktop_in_files) $(icons_DATA)
+	$(Desktop_in_files) $(icons_DATA) $(appicons_DATA)
 DISTCLEANFILES = $(desktop_DATA)
diff --git a/control-center/dsn-properties-dialog.c b/control-center/dsn-properties-dialog.c
index f405293..f7af81a 100644
--- a/control-center/dsn-properties-dialog.c
+++ b/control-center/dsn-properties-dialog.c
@@ -133,7 +133,7 @@ dsn_properties_dialog (GtkWindow *parent, const gchar *dsn)
 				(GDestroyNotify) data_source_info_free);
 
 	gchar *path;
-	path = gda_gbr_get_file_path (GDA_DATA_DIR, "pixmaps", "gdaui-control-center.png", NULL);
+	path = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "pixmaps", "gda-control-center.png", NULL);
 	icon = gdk_pixbuf_new_from_file (path, NULL);
 	g_free (path);
 	if (icon) {
diff --git a/control-center/gda-control-center-4.0.desktop.in b/control-center/gda-control-center-4.0.desktop.in
index 6fc08d7..c129839 100644
--- a/control-center/gda-control-center-4.0.desktop.in
+++ b/control-center/gda-control-center-4.0.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Database access control center
 _Comment=Configure your database access environment
-Icon=gda-control-center
+Icon=gda-control-center-4.0
 Exec=gda-control-center-4.0
 Terminal=0
 Type=Application
diff --git a/control-center/gda-control-center-4.0.png b/control-center/gda-control-center-4.0.png
new file mode 120000
index 0000000..4c4f4e9
--- /dev/null
+++ b/control-center/gda-control-center-4.0.png
@@ -0,0 +1 @@
+gda-control-center.png
\ No newline at end of file
diff --git a/control-center/gdaui-dsn-assistant.c b/control-center/gdaui-dsn-assistant.c
index f7b31e5..326b497 100644
--- a/control-center/gdaui-dsn-assistant.c
+++ b/control-center/gdaui-dsn-assistant.c
@@ -416,7 +416,7 @@ gdaui_dsn_assistant_init (GdauiDsnAssistant *assistant,
 	assistant->priv->create_db_op = NULL;
 
 	/* load icons */
-	str = gda_gbr_get_file_path (GDA_DATA_DIR, "pixmaps", "gda-control-center-newcnc.png", NULL);
+	str = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "pixmaps", "gda-control-center-newcnc.png", NULL);
 	assistant->priv->logo = gdk_pixbuf_new_from_file (str, NULL);
 	g_free (str);
 
diff --git a/control-center/main.c b/control-center/main.c
index 086e423..22c9ed3 100644
--- a/control-center/main.c
+++ b/control-center/main.c
@@ -176,7 +176,7 @@ about_cb (GtkAction *action, gpointer user_data)
 		"Kjartan Maraas <kmaraas online no> Norwegian translation\n";
 
 	gchar *path;
-	path = gda_gbr_get_file_path (GDA_DATA_DIR, "pixmaps", "gda-control-center.png", NULL);
+	path = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "pixmaps", "gda-control-center.png", NULL);
 	icon = gdk_pixbuf_new_from_file (path, NULL);
 	g_free (path);
 
@@ -278,7 +278,7 @@ create_main_window (void)
 
 	/* icon */
 	gchar *path;
-	path = gda_gbr_get_file_path (GDA_DATA_DIR, "pixmaps", "gda-control-center.png", NULL);
+	path = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "pixmaps", "gda-control-center.png", NULL);
 	icon = gdk_pixbuf_new_from_file (path, NULL);
 	g_free (path);
 	if (icon) {
diff --git a/tools/browser/.gitignore b/tools/browser/.gitignore
index 1b1762b..51cb8a3 100644
--- a/tools/browser/.gitignore
+++ b/tools/browser/.gitignore
@@ -1,4 +1,4 @@
-gda-browser-4.*
+gda-browser-4.0
 gda-browser-4.*.desktop
 canvas-example
 marshal.c
diff --git a/tools/browser/Makefile.am b/tools/browser/Makefile.am
index 342bd61..b4e1d29 100644
--- a/tools/browser/Makefile.am
+++ b/tools/browser/Makefile.am
@@ -138,11 +138,16 @@ icons_DATA= \
 	gda-browser-reference.png \
 	gda-browser-diagram.png
 
+# app icon
+appiconsdir=$(datadir)/pixmaps
+appicons_DATA= \
+        gda-browser-4.0.png
+
 EXTRA_DIST = \
 	marshal.list \
 	browser-res.rc \
 	gda-browser.ico \
-	$(Desktop_in_files) $(icons_DATA)
+	$(Desktop_in_files) $(icons_DATA) $(appicons_DATA)
 
 DISTCLEANFILES = $(desktop_DATA)
 
diff --git a/tools/browser/gda-browser-4.0.desktop.in b/tools/browser/gda-browser-4.0.desktop.in
index 00e5b08..51fd129 100644
--- a/tools/browser/gda-browser-4.0.desktop.in
+++ b/tools/browser/gda-browser-4.0.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Database browser
 _Comment=Browse your database's contents
-Icon=gda-browser
+Icon=gda-browser-4.0
 Exec=gda-browser-4.0
 Terminal=0
 Type=Application
diff --git a/tools/browser/gda-browser-4.0.png b/tools/browser/gda-browser-4.0.png
new file mode 120000
index 0000000..2d074d0
--- /dev/null
+++ b/tools/browser/gda-browser-4.0.png
@@ -0,0 +1 @@
+gda-browser.png
\ No newline at end of file