gdbus-tool: simplify some logic

[platform/upstream/glib.git] / gio / inotify / inotify-sub.c

diff --git a/gio/inotify/inotify-sub.c b/gio/inotify/inotify-sub.c
index f67a563..85b3411 100644 (file)
--- a/gio/inotify/inotify-sub.c
+++ b/gio/inotify/inotify-sub.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: 
                 John McCutchan <john@johnmccutchan.com>
@@ -33,34 +32,40 @@ static gboolean is_debug_enabled = FALSE;
 #define IS_W if (is_debug_enabled) g_warning
 
 static gchar*
-dup_dirname(const gchar* dirname)
+dup_dirname (const gchar *dirname)
 {
-  gchar* d_dirname = g_strdup (dirname);
+  gchar *d_dirname = g_strdup (dirname);
   size_t len = strlen (d_dirname);
   
-  if (d_dirname[len] == '/')
-    d_dirname[len] = '\0';
+  if (d_dirname[len - 1] == '/')
+    d_dirname[len - 1] = '\0';
   
   return d_dirname;
 }
 
 inotify_sub*
-_ih_sub_new (const gchar* dirname, const gchar* filename, gpointer user_data)
+_ih_sub_new (const gchar *dirname, 
+             const gchar *filename,
+             gboolean     pair_moves,
+             gboolean     watch_hardlinks,
+             gpointer     user_data)
 {
-  inotify_sub* sub = NULL;
+  inotify_sub *sub = NULL;
   
   sub = g_new0 (inotify_sub, 1);
   sub->dirname = dup_dirname (dirname);
   sub->filename = g_strdup (filename);
+  sub->pair_moves = pair_moves;
+  sub->hardlinks = watch_hardlinks;
   sub->user_data = user_data;
-  
+
   IS_W ("new subscription for %s being setup\n", sub->dirname);
   
   return sub;
 }
 
 void
-_ih_sub_free (inotify_sub* sub)
+_ih_sub_free (inotify_sub *sub)
 {
   g_free (sub->dirname);
   g_free (sub->filename);