diff options
| -rw-r--r-- | libmatemixer/matemixer-app-info.c | 4 | ||||
| -rw-r--r-- | libmatemixer/matemixer-context.c | 12 | ||||
| -rw-r--r-- | libmatemixer/matemixer-device.c | 8 | ||||
| -rw-r--r-- | libmatemixer/matemixer-types.h | 3 |
4 files changed, 15 insertions, 12 deletions
diff --git a/libmatemixer/matemixer-app-info.c b/libmatemixer/matemixer-app-info.c index 0a32325..1be6610 100644 --- a/libmatemixer/matemixer-app-info.c +++ b/libmatemixer/matemixer-app-info.c @@ -199,6 +199,8 @@ _mate_mixer_app_info_copy (MateMixerAppInfo *info) { MateMixerAppInfo *info2; + g_return_val_if_fail (info != NULL, NULL); + info2 = _mate_mixer_app_info_new (); info2->name = g_strdup (info->name); info2->id = g_strdup (info->id); @@ -217,6 +219,8 @@ _mate_mixer_app_info_copy (MateMixerAppInfo *info) void _mate_mixer_app_info_free (MateMixerAppInfo *info) { + g_return_if_fail (info != NULL); + g_free (info->name); g_free (info->id); g_free (info->version); diff --git a/libmatemixer/matemixer-context.c b/libmatemixer/matemixer-context.c index 88b4bf6..bf31eb3 100644 --- a/libmatemixer/matemixer-context.c +++ b/libmatemixer/matemixer-context.c @@ -263,7 +263,7 @@ mate_mixer_context_class_init (MateMixerContextClass *klass) signals[DEVICE_ADDED] = g_signal_new ("device-added", G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, + G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (MateMixerContextClass, device_added), NULL, NULL, @@ -287,7 +287,7 @@ mate_mixer_context_class_init (MateMixerContextClass *klass) signals[DEVICE_REMOVED] = g_signal_new ("device-removed", G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, + G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (MateMixerContextClass, device_removed), NULL, NULL, @@ -313,7 +313,7 @@ mate_mixer_context_class_init (MateMixerContextClass *klass) signals[STREAM_ADDED] = g_signal_new ("stream-added", G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, + G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (MateMixerContextClass, stream_added), NULL, NULL, @@ -341,7 +341,7 @@ mate_mixer_context_class_init (MateMixerContextClass *klass) signals[STREAM_REMOVED] = g_signal_new ("stream-removed", G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, + G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (MateMixerContextClass, stream_removed), NULL, NULL, @@ -362,7 +362,7 @@ mate_mixer_context_class_init (MateMixerContextClass *klass) signals[STORED_CONTROL_ADDED] = g_signal_new ("stored-control-added", G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, + G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (MateMixerContextClass, stored_control_added), NULL, NULL, @@ -386,7 +386,7 @@ mate_mixer_context_class_init (MateMixerContextClass *klass) signals[STORED_CONTROL_REMOVED] = g_signal_new ("stored-control-removed", G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, + G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (MateMixerContextClass, stored_control_removed), NULL, NULL, diff --git a/libmatemixer/matemixer-device.c b/libmatemixer/matemixer-device.c index 3944af5..9206833 100644 --- a/libmatemixer/matemixer-device.c +++ b/libmatemixer/matemixer-device.c @@ -150,7 +150,7 @@ mate_mixer_device_class_init (MateMixerDeviceClass *klass) signals[STREAM_ADDED] = g_signal_new ("stream-added", G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, + G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (MateMixerDeviceClass, stream_added), NULL, NULL, @@ -174,7 +174,7 @@ mate_mixer_device_class_init (MateMixerDeviceClass *klass) signals[STREAM_REMOVED] = g_signal_new ("stream-removed", G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, + G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (MateMixerDeviceClass, stream_removed), NULL, NULL, @@ -193,7 +193,7 @@ mate_mixer_device_class_init (MateMixerDeviceClass *klass) signals[SWITCH_ADDED] = g_signal_new ("switch-added", G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, + G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (MateMixerDeviceClass, switch_added), NULL, NULL, @@ -217,7 +217,7 @@ mate_mixer_device_class_init (MateMixerDeviceClass *klass) signals[SWITCH_REMOVED] = g_signal_new ("switch-removed", G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, + G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (MateMixerDeviceClass, switch_removed), NULL, NULL, diff --git a/libmatemixer/matemixer-types.h b/libmatemixer/matemixer-types.h index 57a64a1..271009c 100644 --- a/libmatemixer/matemixer-types.h +++ b/libmatemixer/matemixer-types.h @@ -21,9 +21,8 @@ G_BEGIN_DECLS typedef struct _MateMixerAppInfo MateMixerAppInfo; -typedef struct _MateMixerDevice MateMixerDevice; typedef struct _MateMixerContext MateMixerContext; -typedef struct _MateMixerDeviceProfile MateMixerDeviceProfile; +typedef struct _MateMixerDevice MateMixerDevice; typedef struct _MateMixerStoredControl MateMixerStoredControl; typedef struct _MateMixerStream MateMixerStream; typedef struct _MateMixerStreamControl MateMixerStreamControl; |