giounix.c: s/g_main_poll_add/g_main_remove_add/g

Wed Dec 16 22:32:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>

        * glib.h:
          giounix.c: s/g_main_poll_add/g_main_remove_add/g
                     s/g_main_poll_remove/g_main_remove_poll/g
                     s/g_main_poll_add_unlocking/g_main_add_unlocking_poll/g
          (from Tim Janik)

        * gthread-posix.c: use g_free in mutex_free (from Tim Janik)

diff --git a/ChangeLog b/ChangeLog
index 4af8d85..8998e11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Dec 16 22:32:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * glib.h:
+         giounix.c: s/g_main_poll_add/g_main_remove_add/g
+                     s/g_main_poll_remove/g_main_remove_poll/g
+                     s/g_main_poll_add_unlocking/g_main_add_unlocking_poll/g
+          (from Tim Janik)
+
 Wed Dec 16 20:04:10 PST 1998 Manish Singh <yosh@gimp.org>
 
        * configure.in: check for pthread_attr_init in all cases, du4

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 4af8d85..8998e11 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Wed Dec 16 22:32:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * glib.h:
+         giounix.c: s/g_main_poll_add/g_main_remove_add/g
+                     s/g_main_poll_remove/g_main_remove_poll/g
+                     s/g_main_poll_add_unlocking/g_main_add_unlocking_poll/g
+          (from Tim Janik)
+
 Wed Dec 16 20:04:10 PST 1998 Manish Singh <yosh@gimp.org>
 
        * configure.in: check for pthread_attr_init in all cases, du4

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4af8d85..8998e11 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Wed Dec 16 22:32:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * glib.h:
+         giounix.c: s/g_main_poll_add/g_main_remove_add/g
+                     s/g_main_poll_remove/g_main_remove_poll/g
+                     s/g_main_poll_add_unlocking/g_main_add_unlocking_poll/g
+          (from Tim Janik)
+
 Wed Dec 16 20:04:10 PST 1998 Manish Singh <yosh@gimp.org>
 
        * configure.in: check for pthread_attr_init in all cases, du4

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 4af8d85..8998e11 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+Wed Dec 16 22:32:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * glib.h:
+         giounix.c: s/g_main_poll_add/g_main_remove_add/g
+                     s/g_main_poll_remove/g_main_remove_poll/g
+                     s/g_main_poll_add_unlocking/g_main_add_unlocking_poll/g
+          (from Tim Janik)
+
 Wed Dec 16 20:04:10 PST 1998 Manish Singh <yosh@gimp.org>
 
        * configure.in: check for pthread_attr_init in all cases, du4

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4af8d85..8998e11 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Wed Dec 16 22:32:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * glib.h:
+         giounix.c: s/g_main_poll_add/g_main_remove_add/g
+                     s/g_main_poll_remove/g_main_remove_poll/g
+                     s/g_main_poll_add_unlocking/g_main_add_unlocking_poll/g
+          (from Tim Janik)
+
 Wed Dec 16 20:04:10 PST 1998 Manish Singh <yosh@gimp.org>
 
        * configure.in: check for pthread_attr_init in all cases, du4

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4af8d85..8998e11 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Wed Dec 16 22:32:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * glib.h:
+         giounix.c: s/g_main_poll_add/g_main_remove_add/g
+                     s/g_main_poll_remove/g_main_remove_poll/g
+                     s/g_main_poll_add_unlocking/g_main_add_unlocking_poll/g
+          (from Tim Janik)
+
 Wed Dec 16 20:04:10 PST 1998 Manish Singh <yosh@gimp.org>
 
        * configure.in: check for pthread_attr_init in all cases, du4

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4af8d85..8998e11 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Wed Dec 16 22:32:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * glib.h:
+         giounix.c: s/g_main_poll_add/g_main_remove_add/g
+                     s/g_main_poll_remove/g_main_remove_poll/g
+                     s/g_main_poll_add_unlocking/g_main_add_unlocking_poll/g
+          (from Tim Janik)
+
 Wed Dec 16 20:04:10 PST 1998 Manish Singh <yosh@gimp.org>
 
        * configure.in: check for pthread_attr_init in all cases, du4

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4af8d85..8998e11 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Wed Dec 16 22:32:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * glib.h:
+         giounix.c: s/g_main_poll_add/g_main_remove_add/g
+                     s/g_main_poll_remove/g_main_remove_poll/g
+                     s/g_main_poll_add_unlocking/g_main_add_unlocking_poll/g
+          (from Tim Janik)
+
 Wed Dec 16 20:04:10 PST 1998 Manish Singh <yosh@gimp.org>
 
        * configure.in: check for pthread_attr_init in all cases, du4

diff --git a/giounix.c b/giounix.c
index 72239c7..8f0b8ed 100644 (file)
--- a/giounix.c
+++ b/giounix.c
@@ -131,7 +131,7 @@ g_io_unix_destroy (gpointer source_data)
 {
   GIOUnixWatch *data = source_data;
 
-  g_main_poll_remove (&data->pollfd);
+  g_main_remove_poll (&data->pollfd);
   g_io_channel_unref (data->channel);
   g_free (data);
 }
@@ -276,7 +276,7 @@ g_io_unix_add_watch (GIOChannel    *channel,
   watch->pollfd.fd = unix_channel->fd;
   watch->pollfd.events = condition;
 
-  g_main_poll_add (priority, &watch->pollfd);
+  g_main_add_poll (priority, &watch->pollfd);
 
   return g_source_add (priority, TRUE, &unix_watch_funcs, watch, user_data, notify);
 }

diff --git a/glib.h b/glib.h
index 2494ca2..4f2c680 100644 (file)
--- a/glib.h
+++ b/glib.h
@@ -2472,9 +2472,9 @@ struct _GPollFD
   gushort      revents;
 };
 
-void        g_main_poll_add          (gint        priority,
+void        g_main_add_poll          (gint        priority,
                                      GPollFD    *fd);
-void        g_main_poll_remove       (GPollFD    *fd);
+void        g_main_remove_poll       (GPollFD    *fd);
 void        g_main_set_poll_func     (GPollFunc   func);
 
 GIOChannel* g_io_channel_unix_new    (int         fd);

diff --git a/glib/giounix.c b/glib/giounix.c
index 72239c7..8f0b8ed 100644 (file)
--- a/glib/giounix.c
+++ b/glib/giounix.c
@@ -131,7 +131,7 @@ g_io_unix_destroy (gpointer source_data)
 {
   GIOUnixWatch *data = source_data;
 
-  g_main_poll_remove (&data->pollfd);
+  g_main_remove_poll (&data->pollfd);
   g_io_channel_unref (data->channel);
   g_free (data);
 }
@@ -276,7 +276,7 @@ g_io_unix_add_watch (GIOChannel    *channel,
   watch->pollfd.fd = unix_channel->fd;
   watch->pollfd.events = condition;
 
-  g_main_poll_add (priority, &watch->pollfd);
+  g_main_add_poll (priority, &watch->pollfd);
 
   return g_source_add (priority, TRUE, &unix_watch_funcs, watch, user_data, notify);
 }

diff --git a/glib/glib.h b/glib/glib.h
index 2494ca2..4f2c680 100644 (file)
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -2472,9 +2472,9 @@ struct _GPollFD
   gushort      revents;
 };
 
-void        g_main_poll_add          (gint        priority,
+void        g_main_add_poll          (gint        priority,
                                      GPollFD    *fd);
-void        g_main_poll_remove       (GPollFD    *fd);
+void        g_main_remove_poll       (GPollFD    *fd);
 void        g_main_set_poll_func     (GPollFunc   func);
 
 GIOChannel* g_io_channel_unix_new    (int         fd);

diff --git a/glib/gmain.c b/glib/gmain.c
index 4462730..71f6039 100644 (file)
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -79,7 +79,7 @@ struct _GPollRec
 static void     g_main_poll               (gint      timeout,
                                           gboolean  use_priority, 
                                           gint      priority);
-static void     g_main_poll_add_unlocking (gint      priority,
+static void     g_main_add_unlocking_poll (gint      priority,
                                           GPollFD  *fd);
 
 static gboolean g_timeout_prepare      (gpointer  source_data, 
@@ -604,7 +604,7 @@ g_main_poll (gint timeout, gboolean use_priority, gint priority)
 
       wake_up_rec.fd = wake_up_pipe[0];
       wake_up_rec.events = G_IO_IN;
-      g_main_poll_add_unlocking (0, &wake_up_rec);
+      g_main_add_unlocking_poll (0, &wake_up_rec);
     }
   
   pollrec = poll_records;
@@ -647,17 +647,17 @@ g_main_poll (gint timeout, gboolean use_priority, gint priority)
 }
 
 void 
-g_main_poll_add (gint     priority,
+g_main_add_poll (gint     priority,
                 GPollFD *fd)
 {
   G_LOCK (main_loop);
-  g_main_poll_add_unlocking (priority, fd);
+  g_main_add_unlocking_poll (priority, fd);
   G_UNLOCK (main_loop);
 }
 
 /* HOLDS: main_loop_lock */
 static void 
-g_main_poll_add_unlocking (gint     priority,
+g_main_add_unlocking_poll (gint     priority,
                           GPollFD *fd)
 {
   GPollRec *lastrec, *pollrec, *newrec;
@@ -695,7 +695,7 @@ g_main_poll_add_unlocking (gint     priority,
 }
 
 void 
-g_main_poll_remove (GPollFD *fd)
+g_main_remove_poll (GPollFD *fd)
 {
   GPollRec *pollrec, *lastrec;
 

diff --git a/gmain.c b/gmain.c
index 4462730..71f6039 100644 (file)
--- a/gmain.c
+++ b/gmain.c
@@ -79,7 +79,7 @@ struct _GPollRec
 static void     g_main_poll               (gint      timeout,
                                           gboolean  use_priority, 
                                           gint      priority);
-static void     g_main_poll_add_unlocking (gint      priority,
+static void     g_main_add_unlocking_poll (gint      priority,
                                           GPollFD  *fd);
 
 static gboolean g_timeout_prepare      (gpointer  source_data, 
@@ -604,7 +604,7 @@ g_main_poll (gint timeout, gboolean use_priority, gint priority)
 
       wake_up_rec.fd = wake_up_pipe[0];
       wake_up_rec.events = G_IO_IN;
-      g_main_poll_add_unlocking (0, &wake_up_rec);
+      g_main_add_unlocking_poll (0, &wake_up_rec);
     }
   
   pollrec = poll_records;
@@ -647,17 +647,17 @@ g_main_poll (gint timeout, gboolean use_priority, gint priority)
 }
 
 void 
-g_main_poll_add (gint     priority,
+g_main_add_poll (gint     priority,
                 GPollFD *fd)
 {
   G_LOCK (main_loop);
-  g_main_poll_add_unlocking (priority, fd);
+  g_main_add_unlocking_poll (priority, fd);
   G_UNLOCK (main_loop);
 }
 
 /* HOLDS: main_loop_lock */
 static void 
-g_main_poll_add_unlocking (gint     priority,
+g_main_add_unlocking_poll (gint     priority,
                           GPollFD *fd)
 {
   GPollRec *lastrec, *pollrec, *newrec;
@@ -695,7 +695,7 @@ g_main_poll_add_unlocking (gint     priority,
 }
 
 void 
-g_main_poll_remove (GPollFD *fd)
+g_main_remove_poll (GPollFD *fd)
 {
   GPollRec *pollrec, *lastrec;
 

diff --git a/gthread/ChangeLog b/gthread/ChangeLog
index 77e9b3c..08509b8 100644 (file)
--- a/gthread/ChangeLog
+++ b/gthread/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec 16 22:21:33 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * gthread-posix.c: use g_free in mutex_free (from Tim Janik)
+
 Thu Dec 17 03:38:57 1998  Tim Janik  <timj@gtk.org>
 
        * Makefile.am: -DG_LOG_DOMAIN="GThread", we don't need an extern

diff --git a/gthread/gthread-posix.c b/gthread/gthread-posix.c
index 4af7591..b2c293c 100644 (file)
--- a/gthread/gthread-posix.c
+++ b/gthread/gthread-posix.c
@@ -51,7 +51,7 @@ static void
 g_mutex_free_posix_impl (GMutex * mutex)
 {
   posix_check_for_error (pthread_mutex_destroy ((pthread_mutex_t *) mutex));
-  free (mutex);
+  g_free (mutex);
 }
 
 /* NOTE: the functions g_mutex_lock and g_mutex_unlock may not use