diff --git a/gio/ChangeLog b/gio/ChangeLog index e8057f2b4..f15561274 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,17 @@ +2008-08-11 Sven Neumann + + * gfilenamecompleter.c + * glocaldirectorymonitor.c + * gmountoperation.c + * gunionvolumemonitor.c + * gunixmount.c + * gunixmounts.c + * gunixvolume.c + * gunixvolumemonitor.c + * gvolumemonitor.c + * gwin32mount.c + * gwin32volumemonitor.c: use canonical signal names. + 2008-08-11 Tor Lillqvist * Makefile.am: Put a list of the platform-dependent .la files in diff --git a/gio/gfilenamecompleter.c b/gio/gfilenamecompleter.c index 4c38fd8ba..459e3025b 100644 --- a/gio/gfilenamecompleter.c +++ b/gio/gfilenamecompleter.c @@ -104,7 +104,7 @@ g_filename_completer_class_init (GFilenameCompleterClass *klass) * * Emitted when the file name completion information comes available. **/ - signals[GOT_COMPLETION_DATA] = g_signal_new (I_("got_completion_data"), + signals[GOT_COMPLETION_DATA] = g_signal_new (I_("got-completion-data"), G_TYPE_FILENAME_COMPLETER, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GFilenameCompleterClass, got_completion_data), diff --git a/gio/glocaldirectorymonitor.c b/gio/glocaldirectorymonitor.c index c5d6c8b77..42c2ce0ac 100644 --- a/gio/glocaldirectorymonitor.c +++ b/gio/glocaldirectorymonitor.c @@ -130,7 +130,7 @@ g_local_directory_monitor_constructor (GType type, g_unix_mount_free (mount); local_monitor->mount_monitor = g_unix_mount_monitor_new (); - g_signal_connect_object (local_monitor->mount_monitor, "mounts_changed", + g_signal_connect_object (local_monitor->mount_monitor, "mounts-changed", G_CALLBACK (mounts_changed), local_monitor, 0); #endif } diff --git a/gio/gmountoperation.c b/gio/gmountoperation.c index 96f360c67..8234b8315 100644 --- a/gio/gmountoperation.c +++ b/gio/gmountoperation.c @@ -251,7 +251,7 @@ g_mount_operation_class_init (GMountOperationClass *klass) * Emitted when a mount operation asks the user for a password. */ signals[ASK_PASSWORD] = - g_signal_new (I_("ask_password"), + g_signal_new (I_("ask-password"), G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GMountOperationClass, ask_password), @@ -270,7 +270,7 @@ g_mount_operation_class_init (GMountOperationClass *klass) * choices for the user to choose from. */ signals[ASK_QUESTION] = - g_signal_new (I_("ask_question"), + g_signal_new (I_("ask-question"), G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GMountOperationClass, ask_question), diff --git a/gio/gunionvolumemonitor.c b/gio/gunionvolumemonitor.c index 35d218909..8009262a5 100644 --- a/gio/gunionvolumemonitor.c +++ b/gio/gunionvolumemonitor.c @@ -248,7 +248,7 @@ child_volume_added (GVolumeMonitor *child_monitor, GUnionVolumeMonitor *union_monitor) { g_signal_emit_by_name (union_monitor, - "volume_added", + "volume-added", child_volume); } @@ -258,7 +258,7 @@ child_volume_removed (GVolumeMonitor *child_monitor, GUnionVolumeMonitor *union_monitor) { g_signal_emit_by_name (union_monitor, - "volume_removed", + "volume-removed", child_volume); } @@ -268,7 +268,7 @@ child_volume_changed (GVolumeMonitor *child_monitor, GUnionVolumeMonitor *union_monitor) { g_signal_emit_by_name (union_monitor, - "volume_changed", + "volume-changed", child_volume); } @@ -278,7 +278,7 @@ child_mount_added (GVolumeMonitor *child_monitor, GUnionVolumeMonitor *union_monitor) { g_signal_emit_by_name (union_monitor, - "mount_added", + "mount-added", child_mount); } @@ -288,7 +288,7 @@ child_mount_removed (GVolumeMonitor *child_monitor, GUnionVolumeMonitor *union_monitor) { g_signal_emit_by_name (union_monitor, - "mount_removed", + "mount-removed", child_mount); } @@ -298,7 +298,7 @@ child_mount_pre_unmount (GVolumeMonitor *child_monitor, GUnionVolumeMonitor *union_monitor) { g_signal_emit_by_name (union_monitor, - "mount_pre_unmount", + "mount-pre-unmount", child_mount); } @@ -309,7 +309,7 @@ child_mount_changed (GVolumeMonitor *child_monitor, GUnionVolumeMonitor *union_monitor) { g_signal_emit_by_name (union_monitor, - "mount_changed", + "mount-changed", child_mount); } @@ -319,7 +319,7 @@ child_drive_connected (GVolumeMonitor *child_monitor, GUnionVolumeMonitor *union_monitor) { g_signal_emit_by_name (union_monitor, - "drive_connected", + "drive-connected", child_drive); } @@ -329,7 +329,7 @@ child_drive_disconnected (GVolumeMonitor *child_monitor, GUnionVolumeMonitor *union_monitor) { g_signal_emit_by_name (union_monitor, - "drive_disconnected", + "drive-disconnected", child_drive); } @@ -339,7 +339,7 @@ child_drive_changed (GVolumeMonitor *child_monitor, GUnionVolumeMonitor *union_monitor) { g_signal_emit_by_name (union_monitor, - "drive_changed", + "drive-changed", child_drive); } @@ -349,7 +349,7 @@ child_drive_eject_button (GVolumeMonitor *child_monitor, GUnionVolumeMonitor *union_monitor) { g_signal_emit_by_name (union_monitor, - "drive_eject_button", + "drive-eject-button", child_drive); } @@ -364,17 +364,17 @@ g_union_volume_monitor_add_monitor (GUnionVolumeMonitor *union_monitor, g_list_prepend (union_monitor->monitors, g_object_ref (volume_monitor)); - g_signal_connect (volume_monitor, "volume_added", (GCallback)child_volume_added, union_monitor); - g_signal_connect (volume_monitor, "volume_removed", (GCallback)child_volume_removed, union_monitor); - g_signal_connect (volume_monitor, "volume_changed", (GCallback)child_volume_changed, union_monitor); - g_signal_connect (volume_monitor, "mount_added", (GCallback)child_mount_added, union_monitor); - g_signal_connect (volume_monitor, "mount_removed", (GCallback)child_mount_removed, union_monitor); - g_signal_connect (volume_monitor, "mount_pre_unmount", (GCallback)child_mount_pre_unmount, union_monitor); - g_signal_connect (volume_monitor, "mount_changed", (GCallback)child_mount_changed, union_monitor); - g_signal_connect (volume_monitor, "drive_connected", (GCallback)child_drive_connected, union_monitor); - g_signal_connect (volume_monitor, "drive_disconnected", (GCallback)child_drive_disconnected, union_monitor); - g_signal_connect (volume_monitor, "drive_changed", (GCallback)child_drive_changed, union_monitor); - g_signal_connect (volume_monitor, "drive_eject_button", (GCallback)child_drive_eject_button, union_monitor); + g_signal_connect (volume_monitor, "volume-added", (GCallback)child_volume_added, union_monitor); + g_signal_connect (volume_monitor, "volume-removed", (GCallback)child_volume_removed, union_monitor); + g_signal_connect (volume_monitor, "volume-changed", (GCallback)child_volume_changed, union_monitor); + g_signal_connect (volume_monitor, "mount-added", (GCallback)child_mount_added, union_monitor); + g_signal_connect (volume_monitor, "mount-removed", (GCallback)child_mount_removed, union_monitor); + g_signal_connect (volume_monitor, "mount-pre-unmount", (GCallback)child_mount_pre_unmount, union_monitor); + g_signal_connect (volume_monitor, "mount-changed", (GCallback)child_mount_changed, union_monitor); + g_signal_connect (volume_monitor, "drive-connected", (GCallback)child_drive_connected, union_monitor); + g_signal_connect (volume_monitor, "drive-disconnected", (GCallback)child_drive_disconnected, union_monitor); + g_signal_connect (volume_monitor, "drive-changed", (GCallback)child_drive_changed, union_monitor); + g_signal_connect (volume_monitor, "drive-eject-button", (GCallback)child_drive_eject_button, union_monitor); } static void diff --git a/gio/gunixmount.c b/gio/gunixmount.c index 4f2027c3b..1ab35812c 100644 --- a/gio/gunixmount.c +++ b/gio/gunixmount.c @@ -154,7 +154,7 @@ _g_unix_mount_unset_volume (GUnixMount *mount, /* TODO: Emit changed in idle to avoid locking issues */ g_signal_emit_by_name (mount, "changed"); if (mount->volume_monitor != NULL) - g_signal_emit_by_name (mount->volume_monitor, "mount_changed", mount); + g_signal_emit_by_name (mount->volume_monitor, "mount-changed", mount); } } diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c index a22376746..9e4343c07 100644 --- a/gio/gunixmounts.c +++ b/gio/gunixmounts.c @@ -1149,7 +1149,7 @@ g_unix_mount_monitor_class_init (GUnixMountMonitorClass *klass) * Emitted when the unix mounts have changed. **/ signals[MOUNTS_CHANGED] = - g_signal_new ("mounts_changed", + g_signal_new ("mounts-changed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, @@ -1163,7 +1163,7 @@ g_unix_mount_monitor_class_init (GUnixMountMonitorClass *klass) * Emitted when the unix mount points have changed. **/ signals[MOUNTPOINTS_CHANGED] = - g_signal_new ("mountpoints_changed", + g_signal_new ("mountpoints-changed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, diff --git a/gio/gunixvolume.c b/gio/gunixvolume.c index f03d4a6c5..eb6825702 100644 --- a/gio/gunixvolume.c +++ b/gio/gunixvolume.c @@ -190,7 +190,7 @@ _g_unix_volume_set_mount (GUnixVolume *volume, /* TODO: Emit changed in idle to avoid locking issues */ g_signal_emit_by_name (volume, "changed"); if (volume->volume_monitor != NULL) - g_signal_emit_by_name (volume->volume_monitor, "volume_changed", volume); + g_signal_emit_by_name (volume->volume_monitor, "volume-changed", volume); } /** @@ -209,7 +209,7 @@ _g_unix_volume_unset_mount (GUnixVolume *volume, /* TODO: Emit changed in idle to avoid locking issues */ g_signal_emit_by_name (volume, "changed"); if (volume->volume_monitor != NULL) - g_signal_emit_by_name (volume->volume_monitor, "volume_changed", volume); + g_signal_emit_by_name (volume->volume_monitor, "volume-changed", volume); } } diff --git a/gio/gunixvolumemonitor.c b/gio/gunixvolumemonitor.c index 6fd389e5d..54f101703 100644 --- a/gio/gunixvolumemonitor.c +++ b/gio/gunixvolumemonitor.c @@ -210,11 +210,11 @@ g_unix_volume_monitor_init (GUnixVolumeMonitor *unix_monitor) unix_monitor->mount_monitor = g_unix_mount_monitor_new (); g_signal_connect (unix_monitor->mount_monitor, - "mounts_changed", G_CALLBACK (mounts_changed), + "mounts-changed", G_CALLBACK (mounts_changed), unix_monitor); g_signal_connect (unix_monitor->mount_monitor, - "mountpoints_changed", G_CALLBACK (mountpoints_changed), + "mountpoints-changed", G_CALLBACK (mountpoints_changed), unix_monitor); update_volumes (unix_monitor); @@ -347,7 +347,7 @@ update_volumes (GUnixVolumeMonitor *monitor) { _g_unix_volume_disconnected (volume); monitor->volumes = g_list_remove (monitor->volumes, volume); - g_signal_emit_by_name (monitor, "volume_removed", volume); + g_signal_emit_by_name (monitor, "volume-removed", volume); g_signal_emit_by_name (volume, "removed"); g_object_unref (volume); } @@ -361,7 +361,7 @@ update_volumes (GUnixVolumeMonitor *monitor) if (volume) { monitor->volumes = g_list_prepend (monitor->volumes, volume); - g_signal_emit_by_name (monitor, "volume_added", volume); + g_signal_emit_by_name (monitor, "volume-added", volume); } } @@ -400,7 +400,7 @@ update_mounts (GUnixVolumeMonitor *monitor) { _g_unix_mount_unmounted (mount); monitor->mounts = g_list_remove (monitor->mounts, mount); - g_signal_emit_by_name (monitor, "mount_removed", mount); + g_signal_emit_by_name (monitor, "mount-removed", mount); g_signal_emit_by_name (mount, "unmounted"); g_object_unref (mount); } @@ -417,7 +417,7 @@ update_mounts (GUnixVolumeMonitor *monitor) if (mount) { monitor->mounts = g_list_prepend (monitor->mounts, mount); - g_signal_emit_by_name (monitor, "mount_added", mount); + g_signal_emit_by_name (monitor, "mount-added", mount); } } diff --git a/gio/gvolumemonitor.c b/gio/gvolumemonitor.c index 2e1944311..ed266a1d4 100644 --- a/gio/gvolumemonitor.c +++ b/gio/gvolumemonitor.c @@ -87,7 +87,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass) * * Emitted when a mountable volume is added to the system. **/ - signals[VOLUME_ADDED] = g_signal_new (I_("volume_added"), + signals[VOLUME_ADDED] = g_signal_new (I_("volume-added"), G_TYPE_VOLUME_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GVolumeMonitorClass, volume_added), @@ -102,7 +102,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass) * * Emitted when a mountable volume is removed from the system. **/ - signals[VOLUME_REMOVED] = g_signal_new (I_("volume_removed"), + signals[VOLUME_REMOVED] = g_signal_new (I_("volume-removed"), G_TYPE_VOLUME_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GVolumeMonitorClass, volume_removed), @@ -117,7 +117,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass) * * Emitted when mountable volume is changed. **/ - signals[VOLUME_CHANGED] = g_signal_new (I_("volume_changed"), + signals[VOLUME_CHANGED] = g_signal_new (I_("volume-changed"), G_TYPE_VOLUME_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GVolumeMonitorClass, volume_changed), @@ -132,7 +132,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass) * * Emitted when a mount is added. **/ - signals[MOUNT_ADDED] = g_signal_new (I_("mount_added"), + signals[MOUNT_ADDED] = g_signal_new (I_("mount-added"), G_TYPE_VOLUME_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GVolumeMonitorClass, mount_added), @@ -147,7 +147,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass) * * Emitted when a mount is removed. **/ - signals[MOUNT_REMOVED] = g_signal_new (I_("mount_removed"), + signals[MOUNT_REMOVED] = g_signal_new (I_("mount-removed"), G_TYPE_VOLUME_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GVolumeMonitorClass, mount_removed), @@ -162,7 +162,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass) * * Emitted when a mount is about to be removed. **/ - signals[MOUNT_PRE_UNMOUNT] = g_signal_new (I_("mount_pre_unmount"), + signals[MOUNT_PRE_UNMOUNT] = g_signal_new (I_("mount-pre-unmount"), G_TYPE_VOLUME_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GVolumeMonitorClass, mount_pre_unmount), @@ -177,7 +177,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass) * * Emitted when a mount changes. **/ - signals[MOUNT_CHANGED] = g_signal_new (I_("mount_changed"), + signals[MOUNT_CHANGED] = g_signal_new (I_("mount-changed"), G_TYPE_VOLUME_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GVolumeMonitorClass, mount_changed), @@ -192,7 +192,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass) * * Emitted when a drive is connected to the system. **/ - signals[DRIVE_CONNECTED] = g_signal_new (I_("drive_connected"), + signals[DRIVE_CONNECTED] = g_signal_new (I_("drive-connected"), G_TYPE_VOLUME_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GVolumeMonitorClass, drive_connected), @@ -207,7 +207,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass) * * Emitted when a drive is disconnected from the system. **/ - signals[DRIVE_DISCONNECTED] = g_signal_new (I_("drive_disconnected"), + signals[DRIVE_DISCONNECTED] = g_signal_new (I_("drive-disconnected"), G_TYPE_VOLUME_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GVolumeMonitorClass, drive_disconnected), @@ -222,7 +222,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass) * * Emitted when a drive changes. **/ - signals[DRIVE_CHANGED] = g_signal_new (I_("drive_changed"), + signals[DRIVE_CHANGED] = g_signal_new (I_("drive-changed"), G_TYPE_VOLUME_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GVolumeMonitorClass, drive_changed), @@ -239,7 +239,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass) * * Since: 2.18 **/ - signals[DRIVE_EJECT_BUTTON] = g_signal_new (I_("drive_eject_button"), + signals[DRIVE_EJECT_BUTTON] = g_signal_new (I_("drive-eject-button"), G_TYPE_VOLUME_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GVolumeMonitorClass, drive_eject_button), diff --git a/gio/gwin32mount.c b/gio/gwin32mount.c index 6a528b165..511bd763d 100644 --- a/gio/gwin32mount.c +++ b/gio/gwin32mount.c @@ -177,7 +177,7 @@ _g_win32_mount_unset_volume (GWin32Mount *mount, /* TODO: Emit changed in idle to avoid locking issues */ g_signal_emit_by_name (mount, "changed"); if (mount->volume_monitor != NULL) - g_signal_emit_by_name (mount->volume_monitor, "mount_changed", mount); + g_signal_emit_by_name (mount->volume_monitor, "mount-changed", mount); } } diff --git a/gio/gwin32volumemonitor.c b/gio/gwin32volumemonitor.c index b30ad89fe..858a9ddac 100644 --- a/gio/gwin32volumemonitor.c +++ b/gio/gwin32volumemonitor.c @@ -273,11 +273,11 @@ g_win32_volume_monitor_init (GWin32VolumeMonitor *win32_monitor) unix_monitor->mount_monitor = g_win32_mount_monitor_new (); g_signal_connect (win32_monitor->mount_monitor, - "mounts_changed", G_CALLBACK (mounts_changed), + "mounts-changed", G_CALLBACK (mounts_changed), win32_monitor); g_signal_connect (win32_monitor->mount_monitor, - "mountpoints_changed", G_CALLBACK (mountpoints_changed), + "mountpoints-changed", G_CALLBACK (mountpoints_changed), win32_monitor); update_volumes (win32_monitor);