Don't mask "time" with the "time" argument.

2006-05-22  Emmanuele Bassi  <ebassi@gnome.org>

	* gtk/gtkrecentmanager.h:
	* gtk/gtkrecentmanager.c
	(gtk_recent_info_get_application_info): Don't mask "time" with
	the "time" argument.

diff --git a/ChangeLog b/ChangeLog
index 328651028ebf20e874f5da9d9a0336fa6b17eb3d..560206d4380fa49163f91bc9bb67901382e3d626 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-22  Emmanuele Bassi  <ebassi@gnome.org>
+
+       * gtk/gtkrecentmanager.h:
+       * gtk/gtkrecentmanager.c
+       (gtk_recent_info_get_application_info): Don't mask "time" with
+       the "time" argument.
+
 2006-05-22  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/gdkcolor.h: gdk_color_parse returns boolean, not int.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 328651028ebf20e874f5da9d9a0336fa6b17eb3d..560206d4380fa49163f91bc9bb67901382e3d626 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2006-05-22  Emmanuele Bassi  <ebassi@gnome.org>
+
+       * gtk/gtkrecentmanager.h:
+       * gtk/gtkrecentmanager.c
+       (gtk_recent_info_get_application_info): Don't mask "time" with
+       the "time" argument.
+
 2006-05-22  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/gdkcolor.h: gdk_color_parse returns boolean, not int.

diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index 67e0617a8c0ab72566cfdb31e7447c0fa4f70d3c..e047f29bc241952b53757091467a057a475c355e 100644 (file)
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -1743,7 +1743,7 @@ recent_app_info_free (RecentAppInfo *app_info)
  * @app_name: the name of the application that has registered this item
  * @app_exec: return location for the string containing the command line
  * @count: return location for the number of times this item was registered
- * @time: return location for the timestamp this item was last registered
+ * @time_: return location for the timestamp this item was last registered
  *    for this application
  *
  * Gets the data regarding the application that has registered the resource
@@ -1763,7 +1763,7 @@ gtk_recent_info_get_application_info (GtkRecentInfo  *info,
                                      const gchar    *app_name,
                                      gchar         **app_exec,
                                      guint          *count,
-                                     time_t         *time)
+                                     time_t         *time_)
 {
   RecentAppInfo *ai;
   
@@ -1788,7 +1788,7 @@ gtk_recent_info_get_application_info (GtkRecentInfo  *info,
     *count = ai->count;
   
   if (time)
-    *time = ai->stamp;
+    *time_ = ai->stamp;
 
   return TRUE;
 }

diff --git a/gtk/gtkrecentmanager.h b/gtk/gtkrecentmanager.h
index c09deb286516d5c290ea6c17a1ba4803a31ec357..1d21870c3d59ff19c801bb757937ede691d654e1 100644 (file)
--- a/gtk/gtkrecentmanager.h
+++ b/gtk/gtkrecentmanager.h
@@ -182,7 +182,7 @@ gboolean              gtk_recent_info_get_application_info (GtkRecentInfo  *info
                                                            const gchar    *app_name,
                                                            gchar         **app_exec,
                                                            guint          *count,
-                                                           time_t         *time);
+                                                           time_t         *time_);
 gchar **              gtk_recent_info_get_applications     (GtkRecentInfo  *info,
                                                            gsize          *length) G_GNUC_MALLOC;
 gchar *               gtk_recent_info_last_application     (GtkRecentInfo  *info) G_GNUC_MALLOC;