diff options
Diffstat (limited to 'devel/glib2/patches/patch-ba')
| -rw-r--r-- | devel/glib2/patches/patch-ba | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/devel/glib2/patches/patch-ba b/devel/glib2/patches/patch-ba index d553cf643c3..7e017530a11 100644 --- a/devel/glib2/patches/patch-ba +++ b/devel/glib2/patches/patch-ba @@ -1,20 +1,20 @@ -$NetBSD: patch-ba,v 1.9 2012/03/01 15:06:20 ryoon Exp $ +$NetBSD: patch-ba,v 1.10 2012/04/30 13:53:48 drochner Exp $ http://bugzilla.gnome.org/show_bug.cgi?id=583330 ---- gio/gunixmounts.c.orig 2011-11-11 17:56:52.000000000 +0000 +--- gio/gunixmounts.c.orig 2012-03-18 02:35:25.000000000 +0000 +++ gio/gunixmounts.c -@@ -153,6 +153,9 @@ struct _GUnixMountMonitor { - +@@ -155,6 +155,9 @@ struct _GUnixMountMonitor { GFileMonitor *fstab_monitor; GFileMonitor *mtab_monitor; -+ + + guint mount_poller_source; + GList *mount_poller_mounts; ++ + GSource *proc_mounts_watch_source; }; - struct _GUnixMountMonitorClass { -@@ -164,6 +167,8 @@ static GUnixMountMonitor *the_mount_moni +@@ -167,6 +170,8 @@ static GUnixMountMonitor *the_mount_moni static GList *_g_get_unix_mounts (void); static GList *_g_get_unix_mount_points (void); @@ -23,7 +23,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330 G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT); #define MOUNT_POLL_INTERVAL 4000 -@@ -190,6 +195,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix +@@ -193,6 +198,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix #endif #if (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H) @@ -31,7 +31,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330 #include <sys/ucred.h> #include <sys/mount.h> #include <fstab.h> -@@ -240,22 +246,30 @@ g_unix_is_mount_path_system_internal (co +@@ -243,22 +249,30 @@ g_unix_is_mount_path_system_internal (co "/", /* we already have "Filesystem root" in Nautilus */ "/bin", "/boot", @@ -62,7 +62,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330 "/var", "/var/crash", "/var/local", -@@ -595,7 +609,7 @@ get_mtab_monitor_file (void) +@@ -602,7 +616,7 @@ get_mtab_monitor_file (void) static GList * _g_get_unix_mounts (void) { @@ -71,7 +71,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330 struct statvfs *mntent = NULL; #elif defined(HAVE_GETFSSTAT) struct statfs *mntent = NULL; -@@ -608,7 +622,7 @@ _g_get_unix_mounts (void) +@@ -615,7 +629,7 @@ _g_get_unix_mounts (void) GList *return_list; /* Pass NOWAIT to avoid blocking trying to update NFS mounts. */ @@ -80,7 +80,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330 num_mounts = getvfsstat (NULL, 0, ST_NOWAIT); #elif defined(HAVE_GETFSSTAT) num_mounts = getfsstat (NULL, 0, MNT_NOWAIT); -@@ -618,7 +632,7 @@ _g_get_unix_mounts (void) +@@ -625,7 +639,7 @@ _g_get_unix_mounts (void) bufsize = num_mounts * sizeof (*mntent); mntent = g_malloc (bufsize); @@ -89,7 +89,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330 num_mounts = getvfsstat (mntent, bufsize, ST_NOWAIT); #elif defined(HAVE_GETFSSTAT) num_mounts = getfsstat (mntent, bufsize, MNT_NOWAIT); -@@ -634,9 +648,15 @@ _g_get_unix_mounts (void) +@@ -641,9 +655,15 @@ _g_get_unix_mounts (void) mount_entry->mount_path = g_strdup (mntent[i].f_mntonname); mount_entry->device_path = g_strdup (mntent[i].f_mntfromname); @@ -106,7 +106,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330 #elif defined(HAVE_GETFSSTAT) if (mntent[i].f_flags & MNT_RDONLY) #endif -@@ -1111,6 +1131,10 @@ get_mounts_timestamp (void) +@@ -1122,6 +1142,10 @@ get_mounts_timestamp (void) if (stat (monitor_file, &buf) == 0) return (guint64)buf.st_mtime; } @@ -117,7 +117,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330 return 0; } -@@ -1253,6 +1277,13 @@ g_unix_mount_monitor_finalize (GObject * +@@ -1267,6 +1291,13 @@ g_unix_mount_monitor_finalize (GObject * g_object_unref (monitor->mtab_monitor); } @@ -131,8 +131,8 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330 the_mount_monitor = NULL; G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object); -@@ -1333,6 +1364,51 @@ mtab_file_changed (GFileMonitor *mo - g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0); +@@ -1358,6 +1389,51 @@ proc_mounts_changed (GIOChannel *chann + return TRUE; } +static gboolean @@ -157,15 +157,15 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330 + for (i = 0; i < g_list_length (current_mounts); i++) + { + GUnixMountEntry *m1; -+ GUnixMountEntry *m2; ++ GUnixMountEntry *m2; + -+ m1 = (GUnixMountEntry *)g_list_nth_data (current_mounts, i); -+ m2 = (GUnixMountEntry *)g_list_nth_data (mount_monitor->mount_poller_mounts, i); ++ m1 = (GUnixMountEntry *)g_list_nth_data (current_mounts, i); ++ m2 = (GUnixMountEntry *)g_list_nth_data (mount_monitor->mount_poller_mounts, i); + if (! has_changed && g_unix_mount_compare (m1, m2) != 0) + has_changed = TRUE; + -+ g_unix_mount_free (m2); -+ } ++ g_unix_mount_free (m2); ++ } + } + + g_list_free (mount_monitor->mount_poller_mounts); @@ -183,9 +183,9 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330 static void g_unix_mount_monitor_init (GUnixMountMonitor *monitor) { -@@ -1355,6 +1431,12 @@ g_unix_mount_monitor_init (GUnixMountMon - - g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor); +@@ -1412,6 +1488,12 @@ g_unix_mount_monitor_init (GUnixMountMon + g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor); + } } + else + { |