Adjust to changed parameter names.

	* glib/gtimer.c (g_time_val_add): Adjust to changed parameter names.

	* glib/gutils.c (g_get_application_name): Mark as 2.2. addition.

	* glib/gstrfuncs.c (g_ascii_strtoull): Mark as 2.0.7 addition.

	* glib/tmpl/main.sgml: Write something about GSourceDummyMarshal.

	* glib/tmpl/date.sgml:
	* glib/tmpl/string_utils.sgml: Remove redundant docs.

	* glib/glib-sections.txt: Add g_ascii_strtoull and
	g_get_application_name.

diff --git a/ChangeLog b/ChangeLog
index 2b0c109..e740a9a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-11-29  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gtimer.c (g_time_val_add): Adjust to changed parameter names.
+
+       * glib/gutils.c (g_get_application_name): Mark as 2.2. addition.
+
+       * glib/gstrfuncs.c (g_ascii_strtoull): Mark as 2.0.7 addition. 
+
 2002-11-28  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gutils.c:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2b0c109..e740a9a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2002-11-29  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gtimer.c (g_time_val_add): Adjust to changed parameter names.
+
+       * glib/gutils.c (g_get_application_name): Mark as 2.2. addition.
+
+       * glib/gstrfuncs.c (g_ascii_strtoull): Mark as 2.0.7 addition. 
+
 2002-11-28  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gutils.c:

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 2b0c109..e740a9a 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+2002-11-29  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gtimer.c (g_time_val_add): Adjust to changed parameter names.
+
+       * glib/gutils.c (g_get_application_name): Mark as 2.2. addition.
+
+       * glib/gstrfuncs.c (g_ascii_strtoull): Mark as 2.0.7 addition. 
+
 2002-11-28  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gutils.c:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2b0c109..e740a9a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2002-11-29  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gtimer.c (g_time_val_add): Adjust to changed parameter names.
+
+       * glib/gutils.c (g_get_application_name): Mark as 2.2. addition.
+
+       * glib/gstrfuncs.c (g_ascii_strtoull): Mark as 2.0.7 addition. 
+
 2002-11-28  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gutils.c:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2b0c109..e740a9a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2002-11-29  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gtimer.c (g_time_val_add): Adjust to changed parameter names.
+
+       * glib/gutils.c (g_get_application_name): Mark as 2.2. addition.
+
+       * glib/gstrfuncs.c (g_ascii_strtoull): Mark as 2.0.7 addition. 
+
 2002-11-28  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gutils.c:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2b0c109..e740a9a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2002-11-29  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gtimer.c (g_time_val_add): Adjust to changed parameter names.
+
+       * glib/gutils.c (g_get_application_name): Mark as 2.2. addition.
+
+       * glib/gstrfuncs.c (g_ascii_strtoull): Mark as 2.0.7 addition. 
+
 2002-11-28  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gutils.c:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2b0c109..e740a9a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2002-11-29  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gtimer.c (g_time_val_add): Adjust to changed parameter names.
+
+       * glib/gutils.c (g_get_application_name): Mark as 2.2. addition.
+
+       * glib/gstrfuncs.c (g_ascii_strtoull): Mark as 2.0.7 addition. 
+
 2002-11-28  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gutils.c:

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 30882f1..0d73e2c 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,13 @@
+2002-11-29  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/tmpl/main.sgml: Write something about GSourceDummyMarshal.
+
+       * glib/tmpl/date.sgml: 
+       * glib/tmpl/string_utils.sgml: Remove redundant docs.
+
+       * glib/glib-sections.txt: Add g_ascii_strtoull and 
+       g_get_application_name.
+
 2002-11-28  Matthias Clasen  <maclas@gmx.de>
 
        * glib/tmpl/strings.sgml: 

diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index c2a2bca..8980fe3 100644 (file)
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -951,6 +951,7 @@ g_strncasecmp
 g_strreverse
 
 <SUBSECTION>
+g_ascii_strtoull
 G_ASCII_DTOSTR_BUF_SIZE
 g_ascii_strtod
 g_ascii_dtostr
@@ -1141,6 +1142,7 @@ g_hook_destroy_link
 <SECTION>
 <TITLE>Miscellaneous Utility Functions</TITLE>
 <FILE>misc_utils</FILE>
+g_get_application_name
 g_get_prgname
 g_set_prgname
 g_getenv

diff --git a/docs/reference/glib/tmpl/date.sgml b/docs/reference/glib/tmpl/date.sgml
index 6fcec99..43756dd 100644 (file)
--- a/docs/reference/glib/tmpl/date.sgml
+++ b/docs/reference/glib/tmpl/date.sgml
@@ -83,8 +83,6 @@ Represents a precise time, with seconds and microseconds. Same as the
 
 <!-- ##### FUNCTION g_get_current_time ##### -->
 <para>
-Equivalent to <function>gettimeofday()</function>, but also works on
-Win32. Returns the current time.
 </para>
 
 @result: 

diff --git a/docs/reference/glib/tmpl/main.sgml b/docs/reference/glib/tmpl/main.sgml
index 79d938c..67d68ad 100644 (file)
--- a/docs/reference/glib/tmpl/main.sgml
+++ b/docs/reference/glib/tmpl/main.sgml
@@ -628,7 +628,8 @@ an event source.
 
 <!-- ##### USER_FUNCTION GSourceDummyMarshal ##### -->
 <para>
-
+This is just a placeholder for #GClosureMarshal, which cannot be used here
+for dependency reasons.
 </para>
 
 

diff --git a/docs/reference/glib/tmpl/misc_utils.sgml b/docs/reference/glib/tmpl/misc_utils.sgml
index d8a4b5c..3b10f85 100644 (file)
--- a/docs/reference/glib/tmpl/misc_utils.sgml
+++ b/docs/reference/glib/tmpl/misc_utils.sgml
@@ -14,6 +14,14 @@ These are portable utility functions.
 
 </para>
 
+<!-- ##### FUNCTION g_get_application_name ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
 <!-- ##### FUNCTION g_get_prgname ##### -->
 <para>
 Gets the name of the program. This name should NOT be localized,

diff --git a/docs/reference/glib/tmpl/string_utils.sgml b/docs/reference/glib/tmpl/string_utils.sgml
index 8ea8345..06d7de7 100644 (file)
--- a/docs/reference/glib/tmpl/string_utils.sgml
+++ b/docs/reference/glib/tmpl/string_utils.sgml
@@ -50,14 +50,10 @@ nul-terminated.
 
 <!-- ##### FUNCTION g_strdupv ##### -->
 <para>
-Copies a %NULL-terminated array of strings. The result consists of a
-%NULL-terminated array, with one malloc block holding the array of strings, and
-each string itself allocated. The simplest way to free the result is with
-g_strfreev() which frees each string in a vector, then the vector itself.
 </para>
 
-@str_array: array to copy
-@Returns: a new array
+@str_array: 
+@Returns: 
 
 
 <!-- ##### FUNCTION g_strnfill ##### -->
@@ -617,6 +613,17 @@ Note that g_strreverse() doesn't work on UTF-8 strings containing multibyte char
 @Returns: the same pointer passed in as @string.
 
 
+<!-- ##### FUNCTION g_ascii_strtoull ##### -->
+<para>
+
+</para>
+
+@nptr: 
+@endptr: 
+@base: 
+@Returns: 
+
+
 <!-- ##### MACRO G_ASCII_DTOSTR_BUF_SIZE ##### -->
 <para>
 A good size for a buffer to be passed into g_ascii_dtostr().

diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 1c83934..a34c877 100644 (file)
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -603,6 +603,8 @@ g_ascii_formatd (gchar       *buffer,
  * is returned, and %ERANGE is stored in %errno.
  *
  * Return value: the #guint64 value.
+ *
+ * Since: 2.0.7
  **/
 guint64
 g_ascii_strtoull (const gchar *nptr,

diff --git a/glib/gtimer.c b/glib/gtimer.c
index f06d5bb..30e249e 100644 (file)
--- a/glib/gtimer.c
+++ b/glib/gtimer.c
@@ -226,36 +226,36 @@ g_usleep (gulong microseconds)
 
 /**
  * g_time_val_add:
- * @time: a #GTimeVal
+ * @time_: a #GTimeVal
  * @microseconds: number of microseconds to add to @time
  *
- * Adds the given number of microseconds to @time. @microseconds can
- * also be negative to decrease the value of @time.
+ * Adds the given number of microseconds to @time_. @microseconds can
+ * also be negative to decrease the value of @time_.
  **/
 void 
-g_time_val_add (GTimeVal *time, glong microseconds)
+g_time_val_add (GTimeVal *time_, glong microseconds)
 {
-  g_return_if_fail (time->tv_usec >= 0 && time->tv_usec < G_USEC_PER_SEC);
+  g_return_if_fail (time_->tv_usec >= 0 && time_->tv_usec < G_USEC_PER_SEC);
 
   if (microseconds >= 0)
     {
-      time->tv_usec += microseconds % G_USEC_PER_SEC;
-      time->tv_sec += microseconds / G_USEC_PER_SEC;
-      if (time->tv_usec >= G_USEC_PER_SEC)
+      time_->tv_usec += microseconds % G_USEC_PER_SEC;
+      time_->tv_sec += microseconds / G_USEC_PER_SEC;
+      if (time_->tv_usec >= G_USEC_PER_SEC)
        {
-         time->tv_usec -= G_USEC_PER_SEC;
-         time->tv_sec++;
+         time_->tv_usec -= G_USEC_PER_SEC;
+         time_->tv_sec++;
        }
     }
   else
     {
       microseconds *= -1;
-      time->tv_usec -= microseconds % G_USEC_PER_SEC;
-      time->tv_sec -= microseconds / G_USEC_PER_SEC;
-      if (time->tv_usec < 0)
+      time_->tv_usec -= microseconds % G_USEC_PER_SEC;
+      time_->tv_sec -= microseconds / G_USEC_PER_SEC;
+      if (time_->tv_usec < 0)
        {
-         time->tv_usec += G_USEC_PER_SEC;
-         time->tv_sec--;
+         time_->tv_usec += G_USEC_PER_SEC;
+         time_->tv_sec--;
        }      
     }
 }

diff --git a/glib/gutils.c b/glib/gutils.c
index 060d279..71761cb 100644 (file)
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -976,6 +976,8 @@ static gchar *g_application_name = NULL;
  * been called).
  * 
  * Return value: human-readable application name. may return %NULL
+ *
+ * Since: 2.2
  **/
 G_CONST_RETURN gchar*
 g_get_application_name (void)