devhelp r1147 - in trunk: . src

[rhult svn gnome org]

Author: rhult
Date: Mon Oct  6 16:54:07 2008
New Revision: 1147
URL: http://svn.gnome.org/viewvc/devhelp?rev=1147&view=rev

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

	* src/dh-link.[ch]: (dh_link_new): Don't care about id/base for
	links other than books. Update copyright to reflect reality (the
	orignal code has all been replaced).


Modified:
   trunk/ChangeLog
   trunk/src/dh-link.c
   trunk/src/dh-link.h

Modified: trunk/src/dh-link.c
==============================================================================
--- trunk/src/dh-link.c	(original)
+++ trunk/src/dh-link.c	Mon Oct  6 16:54:07 2008
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 2001-2002 CodeFactory AB
  * Copyright (C) 2001-2002 Mikael Hallendal <micke imendio com>
+ * Copyright (C) 2008      Imendio AB
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -98,14 +98,17 @@
                 g_return_val_if_fail (book != NULL, NULL);
                 g_return_val_if_fail (page != NULL, NULL);
         }
-        
+
 	link = g_slice_new0 (DhLink);
 
 	link->ref_count = 1;
 	link->type = type;
 
-	link->base = g_strdup (base);
-	link->id = g_strdup (id);
+        if (type == DH_LINK_TYPE_BOOK) {
+                link->base = g_strdup (base);
+                link->id = g_strdup (id);
+        }
+
 	link->name = g_strdup (name);
 	link->uri = g_strdup (uri);
 
@@ -120,8 +123,8 @@
 }
 
 gint
-dh_link_compare  (gconstpointer a,
-                  gconstpointer b)
+dh_link_compare (gconstpointer a,
+                 gconstpointer b)
 {
         DhLink *la = (DhLink *) a;
         DhLink *lb = (DhLink *) b;

Modified: trunk/src/dh-link.h
==============================================================================
--- trunk/src/dh-link.h	(original)
+++ trunk/src/dh-link.h	Mon Oct  6 16:54:07 2008
@@ -1,6 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 2002 CodeFactory AB
  * Copyright (C) 2002 Mikael Hallendal <micke imendio com>
  * Copyright (C) 2008 Imendio AB
  *