Hi, Here are a few small cleanups for libipoddevice, let me know if this patch is OK to commit, or if there are some parts of it that you'd rather not apply. Cheers, Christophe
? cleanup.diff
? cleanups.diff
? guint64.diff
? ipod-device-guint64.diff
? libipoddevice-artwork.diff
? libipoddevice.diff
? mkinstalldirs
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libipoddevice/ChangeLog,v
retrieving revision 1.45
diff -u -r1.45 ChangeLog
--- ChangeLog 5 Nov 2005 18:49:49 -0000 1.45
+++ ChangeLog 6 Nov 2005 17:46:24 -0000
@@ -1,3 +1,13 @@
+2005-11-06 Christophe Fergeau <teuf gnome org>
+
+ * src/hal-common.c:
+ * src/hal-common.h: moved static variable from header to C file
+ * src/ipod-device-test.c: include missing hal-common.h, get rid of
+ #ifdef DEVBUILD since it doesn't seem to be used/defined anywhere else
+ * src/ipod-device.c: (ipod_device_new):
+ * src/ipod-device.h: marked ipod_device_new argument as const, and add
+ missing G_END_DECLS
+
2005-11-05 Christophe Fergeau <teuf gnome org>
* src/ipod-device.c: (ipod_device_debug): added information about
Index: src/hal-common.c
===================================================================
RCS file: /cvs/gnome/libipoddevice/src/hal-common.c,v
retrieving revision 1.8
diff -u -r1.8 hal-common.c
--- src/hal-common.c 4 Aug 2005 06:35:44 -0000 1.8
+++ src/hal-common.c 6 Nov 2005 17:46:24 -0000
@@ -23,8 +23,11 @@
#include <dbus/dbus.h>
#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
#include "hal-common.h"
+
+static GMainContext *ipod_device_global_main_context = NULL;
dbus_bool_t
hal_mainloop_integration(LibHalContext *ctx, DBusError *error)
Index: src/hal-common.h
===================================================================
RCS file: /cvs/gnome/libipoddevice/src/hal-common.h,v
retrieving revision 1.3
diff -u -r1.3 hal-common.h
--- src/hal-common.h 12 Jul 2005 00:17:02 -0000 1.3
+++ src/hal-common.h 6 Nov 2005 17:46:24 -0000
@@ -31,8 +31,6 @@
#include <dbus/dbus.h>
#include <dbus/dbus-glib.h>
-static GMainContext *ipod_device_global_main_context = NULL;
-
dbus_bool_t hal_mainloop_integration(LibHalContext *ctx, DBusError *error);
void ipod_device_set_global_main_context(GMainContext *ctx);
Index: src/ipod-device-test.c
===================================================================
RCS file: /cvs/gnome/libipoddevice/src/ipod-device-test.c,v
retrieving revision 1.5
diff -u -r1.5 ipod-device-test.c
--- src/ipod-device-test.c 24 Aug 2005 16:41:21 -0000 1.5
+++ src/ipod-device-test.c 6 Nov 2005 17:46:24 -0000
@@ -21,13 +21,13 @@
* USA
*/
-#ifdef DEVBUILD
-# include "ipod-device.h"
-# include "ipod-device-event-listener.h"
-#else
-# include <ipod-device.h>
-# include <ipod-device-event-listener.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
#endif
+
+#include "ipod-device.h"
+#include "ipod-device-event-listener.h"
+#include "hal-common.h"
#include <glib.h>
#include <glib/gstdio.h>
#include <stdlib.h>
Index: src/ipod-device.c
===================================================================
RCS file: /cvs/gnome/libipoddevice/src/ipod-device.c,v
retrieving revision 1.42
diff -u -r1.42 ipod-device.c
--- src/ipod-device.c 5 Nov 2005 18:49:49 -0000 1.42
+++ src/ipod-device.c 6 Nov 2005 17:46:24 -0000
@@ -1336,7 +1336,7 @@
/* PUBLIC METHODS */
IpodDevice *
-ipod_device_new(gchar *hal_volume_id)
+ipod_device_new(const gchar *hal_volume_id)
{
IpodDevice *device = g_object_new(TYPE_IPOD_DEVICE,
"hal-volume-id", hal_volume_id, NULL);
Index: src/ipod-device.h
===================================================================
RCS file: /cvs/gnome/libipoddevice/src/ipod-device.h,v
retrieving revision 1.17
diff -u -r1.17 ipod-device.h
--- src/ipod-device.h 5 Nov 2005 18:36:10 -0000 1.17
+++ src/ipod-device.h 6 Nov 2005 17:46:24 -0000
@@ -136,7 +136,7 @@
GType ipod_device_get_type();
-IpodDevice *ipod_device_new(gchar *mount_point);
+IpodDevice *ipod_device_new(const gchar *mount_point);
gboolean ipod_device_rescan_disk(IpodDevice *device);
guint ipod_device_eject(IpodDevice *device, GError **error);
guint ipod_device_reboot(IpodDevice *device, GError **error_out);
@@ -144,5 +144,7 @@
gboolean ipod_device_save(IpodDevice *device, GError **error);
GList *ipod_device_list_devices();
GList *ipod_device_list_device_udis();
+
+G_END_DECLS
#endif /* IPOD_DEVICE_H */
Attachment:
signature.asc
Description: Ceci est une partie de message =?ISO-8859-1?Q?num=E9riquement?= =?ISO-8859-1?Q?_sign=E9e?=