[gvfs/mtp-backend: 15/64] MTP: Tidy up.

[Philip Langdale <philipl src gnome org>]

commit 43e7c902d762a3930200124dd6f4b521151d1b5b
Author: Philip Langdale <philipl overt org>
Date:   Sun Aug 5 21:06:23 2012 -0700

    MTP: Tidy up.

 monitor/mtp/gmtpvolume.c                |    8 ++++----
 monitor/mtp/gmtpvolume.h                |   21 ++++++++++-----------
 monitor/mtp/gmtpvolumemonitor.c         |    8 ++++----
 monitor/mtp/gmtpvolumemonitor.h         |   11 +++++------
 monitor/mtp/mtp-volume-monitor-daemon.c |    9 ++-------
 5 files changed, 25 insertions(+), 32 deletions(-)
---
diff --git a/monitor/mtp/gmtpvolume.c b/monitor/mtp/gmtpvolume.c
index 2bb87aa..0c9fbd3 100644
--- a/monitor/mtp/gmtpvolume.c
+++ b/monitor/mtp/gmtpvolume.c
@@ -1,7 +1,9 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /* GIO - GLib Input, Output and Streaming Library
+ *   Volume Monitor for MTP Backend
  *
- * Copyright (C) 2006-2007 Red Hat, Inc.
+ * Copyright (C) 2012 Philip Langdale <philipl overt org>
+ * - Based on ggphoto2volume.c
+ *   - Copyright (C) 2006-2007 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,8 +19,6 @@
  * Public License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz redhat com>
  */
 
 #include <config.h>
diff --git a/monitor/mtp/gmtpvolume.h b/monitor/mtp/gmtpvolume.h
index 5c2ea82..304dd1b 100644
--- a/monitor/mtp/gmtpvolume.h
+++ b/monitor/mtp/gmtpvolume.h
@@ -1,6 +1,7 @@
 /* GIO - GLib Input, Output and Streaming Library
- * 
- * Copyright (C) 2006-2007 Red Hat, Inc.
+ *   Volume Monitor for MTP Backend
+ *
+ * Copyright (C) 2012 Philip Langdale <philipl overt org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -16,8 +17,6 @@
  * Public License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz redhat com>
  */
 
 #ifndef __G_MTP_VOLUME_H__
@@ -45,15 +44,15 @@ struct _GMtpVolumeClass {
 
 GType g_mtp_volume_get_type (void) G_GNUC_CONST;
 
-GMtpVolume *g_mtp_volume_new            (GVolumeMonitor   *volume_monitor,
-                                                 GUdevDevice      *device,
-                                                 GUdevClient      *gudev_client,
-                                                 GFile            *activation_root);
+GMtpVolume *g_mtp_volume_new      (GVolumeMonitor   *volume_monitor,
+                                   GUdevDevice      *device,
+                                   GUdevClient      *gudev_client,
+                                   GFile            *activation_root);
 
-gboolean    g_mtp_volume_has_path       (GMtpVolume       *volume,
-                                             const char       *path);
+gboolean    g_mtp_volume_has_path (GMtpVolume       *volume,
+                                   const char       *path);
 
-void        g_mtp_volume_removed        (GMtpVolume       *volume);
+void        g_mtp_volume_removed  (GMtpVolume       *volume);
 
 G_END_DECLS
 
diff --git a/monitor/mtp/gmtpvolumemonitor.c b/monitor/mtp/gmtpvolumemonitor.c
index 0499627..7a5916a 100644
--- a/monitor/mtp/gmtpvolumemonitor.c
+++ b/monitor/mtp/gmtpvolumemonitor.c
@@ -1,7 +1,9 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /* GIO - GLib Input, Output and Streaming Library
+ *   Volume Monitor for MTP Backend
  *
- * Copyright (C) 2006-2007 Red Hat, Inc.
+ * Copyright (C) 2012 Philip Langdale <philipl overt org>
+ * - Based on ggphoto2volume.c
+ *   - Copyright (C) 2006-2007 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,8 +19,6 @@
  * Public License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz redhat com>
  */
 
 #include <config.h>
diff --git a/monitor/mtp/gmtpvolumemonitor.h b/monitor/mtp/gmtpvolumemonitor.h
index fcf0140..0a36a9b 100644
--- a/monitor/mtp/gmtpvolumemonitor.h
+++ b/monitor/mtp/gmtpvolumemonitor.h
@@ -1,6 +1,7 @@
 /* GIO - GLib Input, Output and Streaming Library
- * 
- * Copyright (C) 2006-2007 Red Hat, Inc.
+ *   Volume Monitor for MTP Backend
+ *
+ * Copyright (C) 2012 Philip Langdale <philipl overt org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -16,8 +17,6 @@
  * Public License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz redhat com>
  */
 
 #ifndef __G_MTP_VOLUME_MONITOR_H__
@@ -46,8 +45,8 @@ struct _GMtpVolumeMonitorClass {
 
 GType g_mtp_volume_monitor_get_type (void) G_GNUC_CONST;
 
-GVolumeMonitor *g_mtp_volume_monitor_new                          (void);
-void            g_mtp_volume_monitor_force_update                 (GMtpVolumeMonitor *monitor);
+GVolumeMonitor *g_mtp_volume_monitor_new          (void);
+void            g_mtp_volume_monitor_force_update (GMtpVolumeMonitor *monitor);
 
 G_END_DECLS
 
diff --git a/monitor/mtp/mtp-volume-monitor-daemon.c b/monitor/mtp/mtp-volume-monitor-daemon.c
index 0b61a59..2019940 100644
--- a/monitor/mtp/mtp-volume-monitor-daemon.c
+++ b/monitor/mtp/mtp-volume-monitor-daemon.c
@@ -1,5 +1,5 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* gvfs - extensions for gio
+/* GIO - GLib Input, Output and Streaming Library
+ *   Volume Monitor for MTP Backend
  *
  * Copyright (C) 2012 Philip Langdale <philipl overt org>
  *
@@ -21,11 +21,6 @@
 
 #include <config.h>
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-#include <gmodule.h>
-#include <gio/gio.h>
-
 #include <gvfsproxyvolumemonitordaemon.h>
 
 #include "gmtpvolumemonitor.h"