gtranslator r3741 - in trunk/src: . dialogs

[icq svn gnome org]

Author: icq
Date: Mon Sep 22 09:46:05 2008
New Revision: 3741
URL: http://svn.gnome.org/viewvc/gtranslator?rev=3741&view=rev

Log:
2008-08-28  Ignacio Casal Quinteiro  <nacho resa gmail com>

	* Makefile.am:
	* application.c (gtranslator_application_init):
	* dialogs/Makefile.am:
	* dialogs/comment-dialog.c (gtranslator_comment_dialog_init):
	* dialogs/header-dialog.c (gtranslator_header_dialog_init):
	* dialogs/preferences-dialog.c
	(gtranslator_preferences_dialog_init):
	* dialogs/profile-dialog.c (gtranslator_profile_dialog_init):
	* dialogs/search-dialog.c (gtranslator_search_dialog_init):
	* utils.c (gtranslator_utils_help_display):
	* view.c (gtranslator_view_init):
	* window.c (gtranslator_window_layout_load),
	(gtranslator_window_draw):
	Changed DATADIR to PKGDATADIR.

Modified:
   trunk/src/ChangeLog
   trunk/src/Makefile.am
   trunk/src/application.c
   trunk/src/dialogs/Makefile.am
   trunk/src/dialogs/comment-dialog.c
   trunk/src/dialogs/header-dialog.c
   trunk/src/dialogs/preferences-dialog.c
   trunk/src/dialogs/profile-dialog.c
   trunk/src/dialogs/search-dialog.c
   trunk/src/utils.c
   trunk/src/view.c
   trunk/src/window.c

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Sep 22 09:46:05 2008
@@ -20,7 +20,7 @@
 	-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\"	\
 	-DPREFIX=\""$(prefix)"\"                                \
 	-DSYSCONFDIR=\""$(sysconfdir)"\"                        \
-	-DDATADIR=\""$(pkgdatadir)"\"                              \
+	-DPKGDATADIR=\""$(pkgdatadir)"\"                        \
 	-DLIBDIR=\""$(libdir)"\"                                \
 	$(GTRANSLATOR_CFLAGS)                                   \
 	$(GTKSPELL_CFLAGS)                                      \

Modified: trunk/src/application.c
==============================================================================
--- trunk/src/application.c	(original)
+++ trunk/src/application.c	Mon Sep 22 09:46:05 2008
@@ -190,7 +190,7 @@
 						"gtr-toolbar.xml",
 						NULL);
 
-	filename = g_build_filename (DATADIR,
+	filename = g_build_filename (PKGDATADIR,
 				     "gtr-toolbar.xml",
 				     NULL);
 

Modified: trunk/src/dialogs/Makefile.am
==============================================================================
--- trunk/src/dialogs/Makefile.am	(original)
+++ trunk/src/dialogs/Makefile.am	Mon Sep 22 09:46:05 2008
@@ -4,7 +4,7 @@
         -I$(top_srcdir)/src                                     \
         -I$(top_builddir)/src                                   \
 	-I$(top_srcdir)/src/plugin-system			\
-	-DDATADIR=\""$(pkgdatadir)"\"				\
+	-DPKGDATADIR=\""$(pkgdatadir)"\"			\
 	-DPIXMAPSDIR=\""$(datadir)"/pixmaps/gtranslator\"	\
         $(GTRANSLATOR_CFLAGS)                                   \
         $(WARN_CFLAGS)                                          \

Modified: trunk/src/dialogs/comment-dialog.c
==============================================================================
--- trunk/src/dialogs/comment-dialog.c	(original)
+++ trunk/src/dialogs/comment-dialog.c	Mon Sep 22 09:46:05 2008
@@ -107,7 +107,7 @@
 			  NULL);
 	
 	/*Glade*/
-	ret = gtranslator_utils_get_glade_widgets(DATADIR "/comment-dialog.glade",
+	ret = gtranslator_utils_get_glade_widgets(PKGDATADIR "/comment-dialog.glade",
 		"main_box",
 		&error_widget,
 		

Modified: trunk/src/dialogs/header-dialog.c
==============================================================================
--- trunk/src/dialogs/header-dialog.c	(original)
+++ trunk/src/dialogs/header-dialog.c	Mon Sep 22 09:46:05 2008
@@ -247,7 +247,7 @@
 			  G_CALLBACK (gtk_widget_destroy),
 			  NULL);
 	
-	ret = gtranslator_utils_get_glade_widgets(DATADIR"/header-dialog.glade",
+	ret = gtranslator_utils_get_glade_widgets(PKGDATADIR"/header-dialog.glade",
 		"main_box",
 		&error_widget,
 		"main_box", &dlg->priv->main_box,

Modified: trunk/src/dialogs/preferences-dialog.c
==============================================================================
--- trunk/src/dialogs/preferences-dialog.c	(original)
+++ trunk/src/dialogs/preferences-dialog.c	Mon Sep 22 09:46:05 2008
@@ -1122,7 +1122,7 @@
 	
 	/*Glade*/
 	
-	ret = gtranslator_utils_get_glade_widgets(DATADIR "/preferences-dialog.glade",
+	ret = gtranslator_utils_get_glade_widgets(PKGDATADIR "/preferences-dialog.glade",
 		"notebook",
 		&error_widget,
 		

Modified: trunk/src/dialogs/profile-dialog.c
==============================================================================
--- trunk/src/dialogs/profile-dialog.c	(original)
+++ trunk/src/dialogs/profile-dialog.c	Mon Sep 22 09:46:05 2008
@@ -329,7 +329,7 @@
 	gtk_container_set_border_width (GTK_CONTAINER (dlg), 5);
 	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dlg)->vbox), 2);
 
-	ret = gtranslator_utils_get_glade_widgets(DATADIR"/profile-dialog.glade",
+	ret = gtranslator_utils_get_glade_widgets(PKGDATADIR"/profile-dialog.glade",
 		"profiles_dialog",
 		&error_widget,
 		"profiles_dialog", &dlg->priv->main_box,

Modified: trunk/src/dialogs/search-dialog.c
==============================================================================
--- trunk/src/dialogs/search-dialog.c	(original)
+++ trunk/src/dialogs/search-dialog.c	Mon Sep 22 09:46:05 2008
@@ -369,7 +369,7 @@
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 5);
 	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dlg)->action_area), 6);
 
-	ret = gtranslator_utils_get_glade_widgets (DATADIR"/search-dialog.glade",
+	ret = gtranslator_utils_get_glade_widgets (PKGDATADIR"/search-dialog.glade",
 					     "search_dialog_content",
 					     &error_widget,
 					     "search_dialog_content", &content,

Modified: trunk/src/utils.c
==============================================================================
--- trunk/src/utils.c	(original)
+++ trunk/src/utils.c	Mon Sep 22 09:46:05 2008
@@ -760,7 +760,7 @@
 		if (strchr (lang, '.'))
 			continue;
 
-		uri = g_build_filename (DATADIR, "/gnome/help/", doc_id,
+		uri = g_build_filename (PKGDATADIR, "/gnome/help/", doc_id,
 					lang, file_name, NULL);
 
 		if (g_file_test (uri, G_FILE_TEST_EXISTS)) {

Modified: trunk/src/view.c
==============================================================================
--- trunk/src/view.c	(original)
+++ trunk/src/view.c	Mon Sep 22 09:46:05 2008
@@ -112,7 +112,7 @@
 	    ++temp)
 		g_ptr_array_add(dirs, g_strdup(*temp));
 		
-	g_ptr_array_add(dirs, g_strdup(DATADIR));
+	g_ptr_array_add(dirs, g_strdup(PKGDATADIR));
 	g_ptr_array_add(dirs, NULL);
 	langs = (gchar **)g_ptr_array_free(dirs, FALSE);
 

Modified: trunk/src/window.c
==============================================================================
--- trunk/src/window.c	(original)
+++ trunk/src/window.c	Mon Sep 22 09:46:05 2008
@@ -342,7 +342,7 @@
 	{
 		gchar *filename;
 		
-		filename = g_build_filename (DATADIR"/layout.xml", NULL);
+		filename = g_build_filename (PKGDATADIR"/layout.xml", NULL);
 		//DEBUG_PRINT ("Layout = %s", filename);
 		if (!gdl_dock_layout_load_from_file (window->priv->layout_manager,
 						     filename))
@@ -1323,7 +1323,7 @@
 
 
 	if (!gtk_ui_manager_add_ui_from_file (priv->ui_manager,
-					      DATADIR"/gtranslator-ui.xml",
+					      PKGDATADIR"/gtranslator-ui.xml",
 					      &error)) {
 		g_warning ("building menus failed: %s", error->message);
 		g_error_free (error);