GNOME.org
 

devhelp r1181 - in trunk: . src

Author: rhult
Date: Thu Oct  9 18:39:14 2008
New Revision: 1181
URL: http://svn.gnome.org/viewvc/devhelp?rev=1181&view=rev

Log:
2008-10-09  Richard Hult  <richard imendio com>

	* src/dh-util.c (dh_util_build_data_filename): Don't include the
	"devhelp" directory component.

	* src/dh-assistant-view.c (dh_assistant_view_set_link): Add
	"devhelp" component here.


Modified:
   trunk/ChangeLog
   trunk/src/dh-assistant-view.c
   trunk/src/dh-util.c

Modified: trunk/src/dh-assistant-view.c
==============================================================================
--- trunk/src/dh-assistant-view.c	(original)
+++ trunk/src/dh-assistant-view.c	Thu Oct  9 18:39:14 2008
@@ -367,8 +367,14 @@
                         }
                 }
 
-                stylesheet = dh_util_build_data_filename ("assistant", "assistant.css", NULL);
-                javascript = dh_util_build_data_filename ("assistant", "assistant.js", NULL);
+                stylesheet = dh_util_build_data_filename ("devhelp",
+                                                          "assistant",
+                                                          "assistant.css",
+                                                          NULL);
+                javascript = dh_util_build_data_filename ("devhelp",
+                                                          "assistant",
+                                                          "assistant.js",
+                                                          NULL);
                 
                 html = g_strdup_printf (
                         "<html>"

Modified: trunk/src/dh-util.c
==============================================================================
--- trunk/src/dh-util.c	(original)
+++ trunk/src/dh-util.c	Thu Oct  9 18:39:14 2008
@@ -132,12 +132,11 @@
                 datadir = DATADIR;
         }
 
-        /* 3 = two initial components + terminating NULL element. */
-        strv = g_malloc (sizeof (gchar *) * 3);
+        /* 2 = 1 initial component + terminating NULL element. */
+        strv = g_malloc (sizeof (gchar *) * 2);
         strv[0] = (gchar *) datadir;
-        strv[1] = "devhelp";
 
-        i = 2;
+        i = 1;
         for (part = first_part; part; part = va_arg (args, char *), i++) {
                 /* +2 = 1 new element + terminating NULL element. */
                 strv = g_realloc (strv, sizeof (gchar*) * (i + 2));
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]