gedit r6696 - in branches/win32: . gedit

[icq svn gnome org]

Author: icq
Date: Tue Dec 23 17:49:58 2008
New Revision: 6696
URL: http://svn.gnome.org/viewvc/gedit?rev=6696&view=rev

Log:
2008-12-23  Ignacio Casal Quinteiro  <nacho resa gmail com>

        * gedit/gedit-commands-help.c:
        * gedit/Makefile.am:
        Manage the logo with the dir funcs.



Modified:
   branches/win32/ChangeLog
   branches/win32/gedit/Makefile.am
   branches/win32/gedit/gedit-commands-help.c

Modified: branches/win32/gedit/Makefile.am
==============================================================================
--- branches/win32/gedit/Makefile.am	(original)
+++ branches/win32/gedit/Makefile.am	Tue Dec 23 17:49:58 2008
@@ -14,7 +14,6 @@
 	$(DISABLE_DEPRECATED_CFLAGS)					\
 	-DDATADIR=\""$(datadir)"\"					\
 	-DLIBDIR=\""$(libdir)"\"					\
-	-DGEDIT_DATADIR=\""$(datadir)/gedit-2"\"			\
 	-DGEDIT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"		\
 	-DGEDIT_ICONDIR=\""$(datadir)/gedit-2/icons"\"
 

Modified: branches/win32/gedit/gedit-commands-help.c
==============================================================================
--- branches/win32/gedit/gedit-commands-help.c	(original)
+++ branches/win32/gedit/gedit-commands-help.c	Tue Dec 23 17:49:58 2008
@@ -40,6 +40,7 @@
 #include "gedit-commands.h"
 #include "gedit-debug.h"
 #include "gedit-help.h"
+#include "gedit-dirs.h"
 
 void
 _gedit_cmd_help_contents (GtkAction   *action,
@@ -81,11 +82,19 @@
 		   "GNOME Desktop");
 
 	GdkPixbuf *logo;
+	gchar *data_dir;
+	gchar *logo_file;
 
 	gedit_debug (DEBUG_COMMANDS);
 
-	logo = gdk_pixbuf_new_from_file (GEDIT_DATADIR "/logo/gedit-logo.png",
-					 NULL);
+	data_dir = gedit_dirs_get_gedit_data_dir ();
+	logo_file = g_build_filename (data_dir,
+				      "logo",
+				      "gedit-logo.png",
+				      NULL);
+	g_free (data_dir);
+	logo = gdk_pixbuf_new_from_file (logo_file, NULL);
+	g_free (logo_file);
 
 	gtk_show_about_dialog (GTK_WINDOW (window),
 			       "program-name", "gedit",