GNOME.org
 

glib r7897 - in trunk: . gio glib gobject

Author: matthiasc
Date: Mon Feb 23 04:30:06 2009
New Revision: 7897
URL: http://svn.gnome.org/viewvc/glib?rev=7897&view=rev

Log:
        * Fix "it's" vs "its" confusion throughout the source. Patch
        by Will Thompson.



Modified:
   trunk/ChangeLog
   trunk/gio/gdatainputstream.c
   trunk/gio/gdesktopappinfo.c
   trunk/gio/gdrive.c
   trunk/gio/gfileinfo.c
   trunk/gio/gfileinfo.h
   trunk/gio/giomodule.c
   trunk/gio/gioscheduler.c
   trunk/gio/glocalfile.c
   trunk/gio/glocalfileinfo.c
   trunk/gio/gunionvolumemonitor.c
   trunk/gio/gunixmounts.c
   trunk/gio/gvolumemonitor.c
   trunk/glib/gbase64.c
   trunk/glib/gchecksum.c
   trunk/gobject/gclosure.c
   trunk/gobject/genums.h
   trunk/gobject/glib-genmarshal.c
   trunk/gobject/gobject.c
   trunk/gobject/gparam.c
   trunk/gobject/gparam.h
   trunk/gobject/gtype.c

Modified: trunk/gio/gdatainputstream.c
==============================================================================
--- trunk/gio/gdatainputstream.c	(original)
+++ trunk/gio/gdatainputstream.c	Mon Feb 23 04:30:06 2009
@@ -315,7 +315,7 @@
 	}
     }
   
-  /* This should always succeed, since its in the buffer */
+  /* This should always succeed, since it's in the buffer */
   res = g_input_stream_read (G_INPUT_STREAM (stream),
 			     buffer, size,
 			     NULL, NULL);

Modified: trunk/gio/gdesktopappinfo.c
==============================================================================
--- trunk/gio/gdesktopappinfo.c	(original)
+++ trunk/gio/gdesktopappinfo.c	Mon Feb 23 04:30:06 2009
@@ -1300,7 +1300,7 @@
 	        list[i++] = g_strdup (old_list[j]);
 	      else if (add_non_default)
 		{
-		  /* If adding as non-default, and its already in,
+		  /* If adding as non-default, and it's already in,
 		     don't change order of desktop ids */
 		  add_non_default = FALSE;
 		  list[i++] = g_strdup (old_list[j]);

Modified: trunk/gio/gdrive.c
==============================================================================
--- trunk/gio/gdrive.c	(original)
+++ trunk/gio/gdrive.c	Mon Feb 23 04:30:06 2009
@@ -36,7 +36,7 @@
  * @include: gio/gio.h
  * 
  * #GDrive - this represent a piece of hardware connected to the machine.
- * Its generally only created for removable hardware or hardware with
+ * It's generally only created for removable hardware or hardware with
  * removable media. 
  *
  * #GDrive is a container class for #GVolume objects that stem from

Modified: trunk/gio/gfileinfo.c
==============================================================================
--- trunk/gio/gfileinfo.c	(original)
+++ trunk/gio/gfileinfo.c	Mon Feb 23 04:30:06 2009
@@ -410,7 +410,7 @@
 {
   int min, max, med;
   GFileAttribute *attrs;
-  /* Binary search for the place where attribute would be, if its
+  /* Binary search for the place where attribute would be, if it's
      in the array */
 
   min = 0;

Modified: trunk/gio/gfileinfo.h
==============================================================================
--- trunk/gio/gfileinfo.h	(original)
+++ trunk/gio/gfileinfo.h	Mon Feb 23 04:30:06 2009
@@ -129,7 +129,7 @@
  * G_FILE_ATTRIBUTE_STANDARD_COPY_NAME:
  *
  * A key in the "standard" namespace for getting the copy name of the file.
- * The copy name is an optional version of the name. If availible its always
+ * The copy name is an optional version of the name. If available it's always
  * in UTF8, and corresponds directly to the original filename (only transcoded to
  * UTF8). This is useful if you want to copy the file to another filesystem that
  * might have a different encoding. If the filename is not a valid string in the

Modified: trunk/gio/giomodule.c
==============================================================================
--- trunk/gio/giomodule.c	(original)
+++ trunk/gio/giomodule.c	Mon Feb 23 04:30:06 2009
@@ -593,7 +593,7 @@
       return NULL;
     }      
 
-  /* Its safe to register the same type multiple times */
+  /* It's safe to register the same type multiple times */
   for (l = extension_point->extensions; l != NULL; l = l->next)
     {
       extension = l->data;

Modified: trunk/gio/gioscheduler.c
==============================================================================
--- trunk/gio/gioscheduler.c	(original)
+++ trunk/gio/gioscheduler.c	Mon Feb 23 04:30:06 2009
@@ -110,7 +110,7 @@
 	  g_thread_pool_set_sort_function (job_thread_pool,
 					   g_io_job_compare,
 					   NULL);
-	  /* Its kinda weird that this is a global setting
+	  /* It's kinda weird that this is a global setting
 	   * instead of per threadpool. However, we really
 	   * want to cache some threads, but not keep around
 	   * those threads forever. */

Modified: trunk/gio/glocalfile.c
==============================================================================
--- trunk/gio/glocalfile.c	(original)
+++ trunk/gio/glocalfile.c	Mon Feb 23 04:30:06 2009
@@ -619,6 +619,7 @@
 static const char *
 get_fs_type (long f_type)
 {
+  g_print ("get fstype for %ld\n", f_type);
 
   /* filesystem ids taken from linux manpage */
   switch (f_type) 
@@ -635,6 +636,8 @@
       return "befs";
     case 0x1BADFACE:
       return "bfs";
+    case 0x9123683E:
+      return "btrfs";
     case 0xFF534D42:
       return "cifs";
     case 0x73757245:
@@ -693,6 +696,8 @@
       return "romfs";
     case 0x517B:
       return "smb";
+    case 0x73717368:
+      return "squashfs";
     case 0x012FF7B6:
       return "sysv2";
     case 0x012FF7B5:
@@ -942,6 +947,7 @@
 #endif
   GFileAttributeMatcher *attribute_matcher;
 	
+  g_print ("g_local_file_query_filesystem_info\n");
   no_size = FALSE;
   
 #ifdef USE_STATFS
@@ -1022,8 +1028,10 @@
 #ifdef USE_STATFS
 #if defined(HAVE_STRUCT_STATFS_F_FSTYPENAME)
   fstype = g_strdup(statfs_buffer.f_fstypename);
+  g_print ("using f_fstypename %s\n", fstype);
 #else
   fstype = get_fs_type (statfs_buffer.f_type);
+  g_print ("using f_type %s\n", fstype);
 #endif
 
 #elif defined(USE_STATVFS) && defined(HAVE_STRUCT_STATVFS_F_BASETYPE)
@@ -1340,7 +1348,7 @@
       int errsv = errno;
 
       /* Posix allows EEXIST too, but the more sane error
-	 is G_IO_ERROR_NOT_FOUND, and its what nautilus
+	 is G_IO_ERROR_NOT_FOUND, and it's what nautilus
 	 expects */
       if (errsv == EEXIST)
 	errsv = ENOTEMPTY;

Modified: trunk/gio/glocalfileinfo.c
==============================================================================
--- trunk/gio/glocalfileinfo.c	(original)
+++ trunk/gio/glocalfileinfo.c	Mon Feb 23 04:30:06 2009
@@ -825,7 +825,7 @@
 #endif
 	  parent_info->owner = statbuf.st_uid;
 	  parent_info->device = statbuf.st_dev;
-          /* No need to find trash dir if its not writable anyway */
+          /* No need to find trash dir if it's not writable anyway */
           if (parent_info->writable &&
               g_file_attribute_matcher_matches (attribute_matcher, G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH))
             parent_info->has_trash_dir = _g_local_file_has_trash_dir (dir, statbuf.st_dev);

Modified: trunk/gio/gunionvolumemonitor.c
==============================================================================
--- trunk/gio/gunionvolumemonitor.c	(original)
+++ trunk/gio/gunionvolumemonitor.c	Mon Feb 23 04:30:06 2009
@@ -610,14 +610,14 @@
  *
  * If the return value is not %NULL, the caller must associate the
  * returned #GVolume object with the #GMount. This involves returning
- * it in it's g_mount_get_volume() implementation. The caller must
+ * it in its g_mount_get_volume() implementation. The caller must
  * also listen for the "removed" signal on the returned object
- * and give up it's reference when handling that signal
+ * and give up its reference when handling that signal
  * 
  * Similary, if implementing g_volume_monitor_adopt_orphan_mount(),
  * the implementor must take a reference to @mount and return it in
- * it's g_volume_get_mount() implemented. Also, the implementor must
- * listen for the "unmounted" signal on @mount and give up it's
+ * its g_volume_get_mount() implemented. Also, the implementor must
+ * listen for the "unmounted" signal on @mount and give up its
  * reference upon handling that signal.
  *
  * There are two main use cases for this function.
@@ -625,7 +625,7 @@
  * One is when implementing a user space file system driver that reads
  * blocks of a block device that is already represented by the native
  * volume monitor (for example a CD Audio file system driver). Such
- * a driver will generate it's own #GMount object that needs to be
+ * a driver will generate its own #GMount object that needs to be
  * assoicated with the #GVolume object that represents the volume.
  *
  * The other is for implementing a #GVolumeMonitor whose sole purpose

Modified: trunk/gio/gunixmounts.c
==============================================================================
--- trunk/gio/gunixmounts.c	(original)
+++ trunk/gio/gunixmounts.c	Mon Feb 23 04:30:06 2009
@@ -369,7 +369,7 @@
        *
        * We do this to avoid being fooled by --bind mounts, since
        * these have the same device as the location they bind to.
-       * Its not an ideal solution to the problem, but it's likely that
+       * It's not an ideal solution to the problem, but it's likely that
        * the most important mountpoint is first and the --bind ones after
        * that aren't as important. So it should work.
        *

Modified: trunk/gio/gvolumemonitor.c
==============================================================================
--- trunk/gio/gvolumemonitor.c	(original)
+++ trunk/gio/gvolumemonitor.c	Mon Feb 23 04:30:06 2009
@@ -329,7 +329,7 @@
  * @volume_monitor: a #GVolumeMonitor.
  * @uuid: the UUID to look for
  * 
- * Finds a #GVolume object by it's UUID (see g_volume_get_uuid())
+ * Finds a #GVolume object by its UUID (see g_volume_get_uuid())
  * 
  * Returns: a #GVolume or %NULL if no such volume is available.
  *     Free the returned object with g_object_unref().
@@ -353,7 +353,7 @@
  * @volume_monitor: a #GVolumeMonitor.
  * @uuid: the UUID to look for
  * 
- * Finds a #GMount object by it's UUID (see g_mount_get_uuid())
+ * Finds a #GMount object by its UUID (see g_mount_get_uuid())
  * 
  * Returns: a #GMount or %NULL if no such mount is available.
  *     Free the returned object with g_object_unref().

Modified: trunk/glib/gbase64.c
==============================================================================
--- trunk/glib/gbase64.c	(original)
+++ trunk/glib/gbase64.c	Mon Feb 23 04:30:06 2009
@@ -45,7 +45,7 @@
  * @state: Saved state between steps, initialize to 0
  * @save: Saved state between steps, initialize to 0
  *
- * Incrementally encode a sequence of binary data into it's Base-64 stringified
+ * Incrementally encode a sequence of binary data into its Base-64 stringified
  * representation. By calling this function multiple times you can convert 
  * data in chunks to avoid having to have the full encoded data in memory.
  *

Modified: trunk/glib/gchecksum.c
==============================================================================
--- trunk/glib/gchecksum.c	(original)
+++ trunk/glib/gchecksum.c	Mon Feb 23 04:30:06 2009
@@ -1123,7 +1123,7 @@
  * g_checksum_reset:
  * @checksum: the #GChecksum to reset
  *
- * Resets the state of the @checksum back to it's initial state.
+ * Resets the state of the @checksum back to its initial state.
  *
  * Since: 2.18
  **/

Modified: trunk/gobject/gclosure.c
==============================================================================
--- trunk/gobject/gclosure.c	(original)
+++ trunk/gobject/gclosure.c	Mon Feb 23 04:30:06 2009
@@ -76,7 +76,7 @@
  * <listitem><para>
  * The reference counting of #GClosure makes it easy to handle reentrancy
  * right; if a callback is removed while it is being invoked, the closure
- * and it's parameters won't be freed until the invocation finishes.
+ * and its parameters won't be freed until the invocation finishes.
  * </para></listitem>
  * <listitem><para>
  * g_closure_invalidate() and invalidation notifiers allow callbacks to be
@@ -538,7 +538,7 @@
  * g_closure_invalidate:
  * @closure: GClosure to invalidate
  *
- * Sets a flag on the closure to indicate that it's calling
+ * Sets a flag on the closure to indicate that its calling
  * environment has become invalid, and thus causes any future
  * invocations of g_closure_invoke() on this @closure to be
  * ignored. Also, invalidation notifiers installed on the closure will
@@ -684,7 +684,7 @@
   g_return_if_fail (closure != NULL);
   g_return_if_fail (notify_func != NULL);
 
-  if (closure->is_invalid && closure->in_inotify && /* account removal of notify_func() while its called */
+  if (closure->is_invalid && closure->in_inotify && /* account removal of notify_func() while it's called */
       ((gpointer) closure->marshal) == ((gpointer) notify_func) &&
       closure->data == notify_data)
     closure->marshal = NULL;
@@ -712,7 +712,7 @@
   g_return_if_fail (closure != NULL);
   g_return_if_fail (notify_func != NULL);
 
-  if (closure->is_invalid && !closure->in_inotify && /* account removal of notify_func() while its called */
+  if (closure->is_invalid && !closure->in_inotify && /* account removal of notify_func() while it's called */
       ((gpointer) closure->marshal) == ((gpointer) notify_func) &&
       closure->data == notify_data)
     closure->marshal = NULL;

Modified: trunk/gobject/genums.h
==============================================================================
--- trunk/gobject/genums.h	(original)
+++ trunk/gobject/genums.h	Mon Feb 23 04:30:06 2009
@@ -190,7 +190,7 @@
  * @value_name: the name of the value
  * @value_nick: the nickname of the value
  * 
- * A structure which contains a single enum value, it's name, and it's
+ * A structure which contains a single enum value, its name, and its
  * nickname.
  */
 struct _GEnumValue
@@ -205,7 +205,7 @@
  * @value_name: the name of the value
  * @value_nick: the nickname of the value
  * 
- * A structure which contains a single flags value, it's name, and it's
+ * A structure which contains a single flags value, its name, and its
  * nickname.
  */
 struct _GFlagsValue

Modified: trunk/gobject/glib-genmarshal.c
==============================================================================
--- trunk/gobject/glib-genmarshal.c	(original)
+++ trunk/gobject/glib-genmarshal.c	Mon Feb 23 04:30:06 2009
@@ -679,7 +679,7 @@
       /* parse & process file */
       g_scanner_input_file (scanner, fd);
 
-      /* scanning loop, we parse the input untill it's end is reached,
+      /* scanning loop, we parse the input until its end is reached,
        * or our sub routine came across invalid syntax
        */
       do

Modified: trunk/gobject/gobject.c
==============================================================================
--- trunk/gobject/gobject.c	(original)
+++ trunk/gobject/gobject.c	Mon Feb 23 04:30:06 2009
@@ -2512,7 +2512,7 @@
  *
  * This function gets back user data pointers stored via
  * g_object_set_qdata() and removes the @data from object
- * without invoking it's destroy() function (if any was
+ * without invoking its destroy() function (if any was
  * set).
  * Usually, calling this function is only required to update
  * user data pointers with a destroy notifier, for example:

Modified: trunk/gobject/gparam.c
==============================================================================
--- trunk/gobject/gparam.c	(original)
+++ trunk/gobject/gparam.c	Mon Feb 23 04:30:06 2009
@@ -527,7 +527,7 @@
  * @quark: a #GQuark, naming the user data pointer
  *
  * Gets back user data pointers stored via g_param_spec_set_qdata()
- * and removes the @data from @pspec without invoking it's destroy()
+ * and removes the @data from @pspec without invoking its destroy()
  * function (if any was set).  Usually, calling this function is only
  * required to update user data pointers with a destroy notifier.
  *

Modified: trunk/gobject/gparam.h
==============================================================================
--- trunk/gobject/gparam.h	(original)
+++ trunk/gobject/gparam.h	Mon Feb 23 04:30:06 2009
@@ -334,7 +334,7 @@
  * required to initialize and destruct (finalize) a parameter's class and
  * instances thereof.
  * The initialized structure is passed to the g_param_type_register_static() 
- * The type system will perform a deep copy of this structure, so it's memory 
+ * The type system will perform a deep copy of this structure, so its memory 
  * does not need to be persistent across invocation of 
  * g_param_type_register_static().
  */

Modified: trunk/gobject/gtype.c
==============================================================================
--- trunk/gobject/gtype.c	(original)
+++ trunk/gobject/gtype.c	Mon Feb 23 04:30:06 2009
@@ -1178,7 +1178,7 @@
       {
 	/* this can happen in two cases:
          * - our parent type already conformed to iface_type and node
-         *   got it's own holder info. here, our children already have
+         *   got its own holder info. here, our children already have
          *   entries and NULL vtables, since this will only work for
          *   uninitialized classes.
 	 * - an interface type is added to an ancestor after it was
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]