libmm-glib: unconditionally define autoptr support for all types

As we now depend on glib 2.48

39 files changed, 0 insertions, 140 deletions

diff --git a/libmm-glib/mm-bearer-ip-config.h b/libmm-glib/mm-bearer-ip-config.h
index 861b9f7b..4b88790c 100644
--- a/libmm-glib/mm-bearer-ip-config.h
+++ b/libmm-glib/mm-bearer-ip-config.h
@@ -54,10 +54,7 @@ struct _MMBearerIpConfigClass {
 };
 
 GType mm_bearer_ip_config_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMBearerIpConfig, g_object_unref)
-#endif
 
 MMBearerIpMethod   mm_bearer_ip_config_get_method  (MMBearerIpConfig *self);
 const gchar       *mm_bearer_ip_config_get_address (MMBearerIpConfig *self);
diff --git a/libmm-glib/mm-bearer-properties.h b/libmm-glib/mm-bearer-properties.h
index 8d8f0006..751185d9 100644
--- a/libmm-glib/mm-bearer-properties.h
+++ b/libmm-glib/mm-bearer-properties.h
@@ -54,10 +54,7 @@ struct _MMBearerPropertiesClass {
 };
 
 GType mm_bearer_properties_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMBearerProperties, g_object_unref)
-#endif
 
 MMBearerProperties *mm_bearer_properties_new (void);
 
diff --git a/libmm-glib/mm-bearer-stats.h b/libmm-glib/mm-bearer-stats.h
index 0883b55b..dceb5aeb 100644
--- a/libmm-glib/mm-bearer-stats.h
+++ b/libmm-glib/mm-bearer-stats.h
@@ -56,10 +56,7 @@ struct _MMBearerStatsClass {
 };
 
 GType mm_bearer_stats_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMBearerStats, g_object_unref)
-#endif
 
 guint   mm_bearer_stats_get_duration (MMBearerStats *self);
 guint64 mm_bearer_stats_get_rx_bytes (MMBearerStats *self);
diff --git a/libmm-glib/mm-bearer.h b/libmm-glib/mm-bearer.h
index 99bf363d..65bb5292 100644
--- a/libmm-glib/mm-bearer.h
+++ b/libmm-glib/mm-bearer.h
@@ -66,10 +66,7 @@ struct _MMBearerClass {
 };
 
 GType mm_bearer_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMBearer, g_object_unref)
-#endif
 
 const gchar  *mm_bearer_get_path        (MMBearer *self);
 gchar        *mm_bearer_dup_path        (MMBearer *self);
diff --git a/libmm-glib/mm-call-audio-format.h b/libmm-glib/mm-call-audio-format.h
index 05378840..b20c4e54 100644
--- a/libmm-glib/mm-call-audio-format.h
+++ b/libmm-glib/mm-call-audio-format.h
@@ -54,10 +54,7 @@ struct _MMCallAudioFormatClass {
 };
 
 GType mm_call_audio_format_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMCallAudioFormat, g_object_unref)
-#endif
 
 const gchar *mm_call_audio_format_get_encoding   (MMCallAudioFormat *self);
 const gchar *mm_call_audio_format_get_resolution (MMCallAudioFormat *self);
diff --git a/libmm-glib/mm-call-properties.h b/libmm-glib/mm-call-properties.h
index e0b821b5..deeab522 100644
--- a/libmm-glib/mm-call-properties.h
+++ b/libmm-glib/mm-call-properties.h
@@ -54,10 +54,7 @@ struct _MMCallPropertiesClass {
 };
 
 GType mm_call_properties_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMCallProperties, g_object_unref)
-#endif
 
 MMCallProperties *mm_call_properties_new        (void);
 void              mm_call_properties_set_number (MMCallProperties *self,
diff --git a/libmm-glib/mm-call.h b/libmm-glib/mm-call.h
index 3ae5a775..ee69b030 100644
--- a/libmm-glib/mm-call.h
+++ b/libmm-glib/mm-call.h
@@ -59,10 +59,7 @@ struct _MMCallClass {
 };
 
 GType mm_call_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMCall, g_object_unref)
-#endif
 
 const gchar       *mm_call_get_path         (MMCall *self);
 gchar             *mm_call_dup_path         (MMCall *self);
diff --git a/libmm-glib/mm-cdma-manual-activation-properties.h b/libmm-glib/mm-cdma-manual-activation-properties.h
index 3e8c9a4f..066ee698 100644
--- a/libmm-glib/mm-cdma-manual-activation-properties.h
+++ b/libmm-glib/mm-cdma-manual-activation-properties.h
@@ -54,10 +54,7 @@ struct _MMCdmaManualActivationPropertiesClass {
 };
 
 GType mm_cdma_manual_activation_properties_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMCdmaManualActivationProperties, g_object_unref)
-#endif
 
 MMCdmaManualActivationProperties *mm_cdma_manual_activation_properties_new (void);
 
diff --git a/libmm-glib/mm-common-helpers.h b/libmm-glib/mm-common-helpers.h
index 5af58422..e910d8c0 100644
--- a/libmm-glib/mm-common-helpers.h
+++ b/libmm-glib/mm-common-helpers.h
@@ -182,27 +182,4 @@ gboolean  mm_utils_ishexstr   (const gchar *hex);
 
 gboolean  mm_utils_check_for_single_value (guint32 value);
 
-#if GLIB_CHECK_VERSION(2, 44, 0)
-#define mm_autoptr g_autoptr
-#else
-
-/* Re-implement for those glib that don't have it */
-#define _MM_AUTOPTR_FUNC_NAME(TypeName) mm_autoptr_cleanup_##TypeName
-#define _MM_AUTOPTR_TYPENAME(TypeName)  TypeName##_autoptr
-#define _MM_CLEANUP(func)               __attribute__((cleanup(func)))
-
-#define _MM_DEFINE_AUTOPTR_CLEANUP_FUNCS(TypeName, cleanup) \
-  typedef TypeName *_MM_AUTOPTR_TYPENAME(TypeName);                                 \
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS                                                  \
-  static G_GNUC_UNUSED inline void _MM_AUTOPTR_FUNC_NAME(TypeName) (TypeName **_ptr) \
-    { if (_ptr && *_ptr) (cleanup) (*_ptr); }                                                 \
-  G_GNUC_END_IGNORE_DEPRECATIONS
-
-#define mm_autoptr(TypeName) _MM_CLEANUP(_MM_AUTOPTR_FUNC_NAME(TypeName)) _MM_AUTOPTR_TYPENAME(TypeName)
-
-_MM_DEFINE_AUTOPTR_CLEANUP_FUNCS(GRegex, g_regex_unref)
-_MM_DEFINE_AUTOPTR_CLEANUP_FUNCS(GMatchInfo, g_match_info_unref)
-
-#endif
-
 #endif /* MM_COMMON_HELPERS_H */
diff --git a/libmm-glib/mm-firmware-properties.h b/libmm-glib/mm-firmware-properties.h
index 49195601..200a212e 100644
--- a/libmm-glib/mm-firmware-properties.h
+++ b/libmm-glib/mm-firmware-properties.h
@@ -54,10 +54,7 @@ struct _MMFirmwarePropertiesClass {
 };
 
 GType mm_firmware_properties_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMFirmwareProperties, g_object_unref)
-#endif
 
 const gchar         *mm_firmware_properties_get_unique_id  (MMFirmwareProperties *self);
 MMFirmwareImageType  mm_firmware_properties_get_image_type (MMFirmwareProperties *self);
diff --git a/libmm-glib/mm-firmware-update-settings.h b/libmm-glib/mm-firmware-update-settings.h
index da8cb311..40940a2e 100644
--- a/libmm-glib/mm-firmware-update-settings.h
+++ b/libmm-glib/mm-firmware-update-settings.h
@@ -54,10 +54,7 @@ struct _MMFirmwareUpdateSettingsClass {
 };
 
 GType mm_firmware_update_settings_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMFirmwareUpdateSettings, g_object_unref)
-#endif
 
 MMModemFirmwareUpdateMethod mm_firmware_update_settings_get_method (MMFirmwareUpdateSettings *self);
 
diff --git a/libmm-glib/mm-kernel-event-properties.h b/libmm-glib/mm-kernel-event-properties.h
index 903fc6bc..66dc551c 100644
--- a/libmm-glib/mm-kernel-event-properties.h
+++ b/libmm-glib/mm-kernel-event-properties.h
@@ -54,10 +54,7 @@ struct _MMKernelEventPropertiesClass {
 };
 
 GType mm_kernel_event_properties_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMKernelEventProperties, g_object_unref)
-#endif
 
 MMKernelEventProperties *mm_kernel_event_properties_new (void);
 
diff --git a/libmm-glib/mm-location-3gpp.h b/libmm-glib/mm-location-3gpp.h
index a630974b..bac7a39f 100644
--- a/libmm-glib/mm-location-3gpp.h
+++ b/libmm-glib/mm-location-3gpp.h
@@ -54,10 +54,7 @@ struct _MMLocation3gppClass {
 };
 
 GType mm_location_3gpp_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMLocation3gpp, g_object_unref)
-#endif
 
 guint  mm_location_3gpp_get_mobile_country_code (MMLocation3gpp *self);
 guint  mm_location_3gpp_get_mobile_network_code (MMLocation3gpp *self);
diff --git a/libmm-glib/mm-location-cdma-bs.h b/libmm-glib/mm-location-cdma-bs.h
index 02d5b3f8..6e8371b0 100644
--- a/libmm-glib/mm-location-cdma-bs.h
+++ b/libmm-glib/mm-location-cdma-bs.h
@@ -56,10 +56,7 @@ struct _MMLocationCdmaBsClass {
 };
 
 GType mm_location_cdma_bs_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMLocationCdmaBs, g_object_unref)
-#endif
 
 gdouble mm_location_cdma_bs_get_longitude (MMLocationCdmaBs *self);
 gdouble mm_location_cdma_bs_get_latitude  (MMLocationCdmaBs *self);
diff --git a/libmm-glib/mm-location-gps-nmea.h b/libmm-glib/mm-location-gps-nmea.h
index ba90788c..e584c82a 100644
--- a/libmm-glib/mm-location-gps-nmea.h
+++ b/libmm-glib/mm-location-gps-nmea.h
@@ -54,10 +54,7 @@ struct _MMLocationGpsNmeaClass {
 };
 
 GType mm_location_gps_nmea_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMLocationGpsNmea, g_object_unref)
-#endif
 
 const gchar  *mm_location_gps_nmea_get_trace  (MMLocationGpsNmea *self,
                                                const gchar       *trace_type);
diff --git a/libmm-glib/mm-location-gps-raw.h b/libmm-glib/mm-location-gps-raw.h
index 97783774..20fb3dc8 100644
--- a/libmm-glib/mm-location-gps-raw.h
+++ b/libmm-glib/mm-location-gps-raw.h
@@ -56,10 +56,7 @@ struct _MMLocationGpsRawClass {
 };
 
 GType mm_location_gps_raw_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMLocationGpsRaw, g_object_unref)
-#endif
 
 const gchar *mm_location_gps_raw_get_utc_time  (MMLocationGpsRaw *self);
 gdouble      mm_location_gps_raw_get_longitude (MMLocationGpsRaw *self);
diff --git a/libmm-glib/mm-manager.h b/libmm-glib/mm-manager.h
index c215cfd9..c1f514e1 100644
--- a/libmm-glib/mm-manager.h
+++ b/libmm-glib/mm-manager.h
@@ -66,10 +66,7 @@ struct _MMManagerClass {
 };
 
 GType mm_manager_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMManager, g_object_unref)
-#endif
 
 void mm_manager_new (
     GDBusConnection               *connection,
diff --git a/libmm-glib/mm-modem-3gpp-ussd.h b/libmm-glib/mm-modem-3gpp-ussd.h
index 0fda4e53..c1e480f9 100644
--- a/libmm-glib/mm-modem-3gpp-ussd.h
+++ b/libmm-glib/mm-modem-3gpp-ussd.h
@@ -62,10 +62,7 @@ struct _MMModem3gppUssdClass {
 };
 
 GType mm_modem_3gpp_ussd_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMModem3gppUssd, g_object_unref)
-#endif
 
 const gchar *mm_modem_3gpp_ussd_get_path (MMModem3gppUssd *self);
 gchar       *mm_modem_3gpp_ussd_dup_path (MMModem3gppUssd *self);
diff --git a/libmm-glib/mm-modem-3gpp.h b/libmm-glib/mm-modem-3gpp.h
index 241ea9ca..e3a506dc 100644
--- a/libmm-glib/mm-modem-3gpp.h
+++ b/libmm-glib/mm-modem-3gpp.h
@@ -64,10 +64,7 @@ struct _MMModem3gppClass {
 };
 
 GType mm_modem_3gpp_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMModem3gpp, g_object_unref)
-#endif
 
 const gchar *mm_modem_3gpp_get_path (MMModem3gpp *self);
 gchar       *mm_modem_3gpp_dup_path (MMModem3gpp *self);
@@ -125,10 +122,7 @@ const gchar                    *mm_modem_3gpp_network_get_operator_short    (con
 const gchar                    *mm_modem_3gpp_network_get_operator_code     (const MMModem3gppNetwork *network);
 MMModemAccessTechnology         mm_modem_3gpp_network_get_access_technology (const MMModem3gppNetwork *network);
 void                            mm_modem_3gpp_network_free                  (MMModem3gppNetwork *network);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMModem3gppNetwork, mm_modem_3gpp_network_free)
-#endif
 
 void   mm_modem_3gpp_scan        (MMModem3gpp *self,
                                   GCancellable *cancellable,
diff --git a/libmm-glib/mm-modem-cdma.h b/libmm-glib/mm-modem-cdma.h
index 3a78a156..931428ee 100644
--- a/libmm-glib/mm-modem-cdma.h
+++ b/libmm-glib/mm-modem-cdma.h
@@ -63,10 +63,7 @@ struct _MMModemCdmaClass {
 };
 
 GType mm_modem_cdma_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMModemCdma, g_object_unref)
-#endif
 
 const gchar *mm_modem_cdma_get_path (MMModemCdma *self);
 gchar       *mm_modem_cdma_dup_path (MMModemCdma *self);
diff --git a/libmm-glib/mm-modem-firmware.h b/libmm-glib/mm-modem-firmware.h
index 301dba97..bbd66a02 100644
--- a/libmm-glib/mm-modem-firmware.h
+++ b/libmm-glib/mm-modem-firmware.h
@@ -65,10 +65,7 @@ struct _MMModemFirmwareClass {
 };
 
 GType mm_modem_firmware_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMModemFirmware, g_object_unref)
-#endif
 
 const gchar *mm_modem_firmware_get_path (MMModemFirmware *self);
 gchar       *mm_modem_firmware_dup_path (MMModemFirmware *self);
diff --git a/libmm-glib/mm-modem-location.h b/libmm-glib/mm-modem-location.h
index 5a1d675c..7cd69461 100644
--- a/libmm-glib/mm-modem-location.h
+++ b/libmm-glib/mm-modem-location.h
@@ -66,10 +66,7 @@ struct _MMModemLocationClass {
 };
 
 GType mm_modem_location_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMModemLocation, g_object_unref)
-#endif
 
 const gchar *mm_modem_location_get_path (MMModemLocation *self);
 gchar       *mm_modem_location_dup_path (MMModemLocation *self);
diff --git a/libmm-glib/mm-modem-messaging.h b/libmm-glib/mm-modem-messaging.h
index 2f87c4f1..d80193e9 100644
--- a/libmm-glib/mm-modem-messaging.h
+++ b/libmm-glib/mm-modem-messaging.h
@@ -65,10 +65,7 @@ struct _MMModemMessagingClass {
 };
 
 GType mm_modem_messaging_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMModemMessaging, g_object_unref)
-#endif
 
 const gchar *mm_modem_messaging_get_path (MMModemMessaging *self);
 gchar       *mm_modem_messaging_dup_path (MMModemMessaging *self);
diff --git a/libmm-glib/mm-modem-oma.h b/libmm-glib/mm-modem-oma.h
index f0289f08..ee670942 100644
--- a/libmm-glib/mm-modem-oma.h
+++ b/libmm-glib/mm-modem-oma.h
@@ -63,10 +63,7 @@ struct _MMModemOmaClass {
 };
 
 GType mm_modem_oma_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMModemOma, g_object_unref)
-#endif
 
 const gchar *mm_modem_oma_get_path (MMModemOma *self);
 gchar       *mm_modem_oma_dup_path (MMModemOma *self);
diff --git a/libmm-glib/mm-modem-signal.h b/libmm-glib/mm-modem-signal.h
index dd5fe2b6..63b82ab9 100644
--- a/libmm-glib/mm-modem-signal.h
+++ b/libmm-glib/mm-modem-signal.h
@@ -63,10 +63,7 @@ struct _MMModemSignalClass {
 };
 
 GType mm_modem_signal_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMModemSignal, g_object_unref)
-#endif
 
 const gchar *mm_modem_signal_get_path (MMModemSignal *self);
 gchar       *mm_modem_signal_dup_path (MMModemSignal *self);
diff --git a/libmm-glib/mm-modem-simple.h b/libmm-glib/mm-modem-simple.h
index f5512407..366c317d 100644
--- a/libmm-glib/mm-modem-simple.h
+++ b/libmm-glib/mm-modem-simple.h
@@ -65,10 +65,7 @@ struct _MMModemSimpleClass {
 };
 
 GType mm_modem_simple_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMModemSimple, g_object_unref)
-#endif
 
 const gchar *mm_modem_simple_get_path (MMModemSimple *self);
 gchar       *mm_modem_simple_dup_path (MMModemSimple *self);
diff --git a/libmm-glib/mm-modem-time.h b/libmm-glib/mm-modem-time.h
index 025d1a57..8c520654 100644
--- a/libmm-glib/mm-modem-time.h
+++ b/libmm-glib/mm-modem-time.h
@@ -64,10 +64,7 @@ struct _MMModemTimeClass {
 };
 
 GType mm_modem_time_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMModemTime, g_object_unref)
-#endif
 
 const gchar *mm_modem_time_get_path (MMModemTime *self);
 gchar       *mm_modem_time_dup_path (MMModemTime *self);
diff --git a/libmm-glib/mm-modem-voice.h b/libmm-glib/mm-modem-voice.h
index d3a8fc94..b5f3dbd1 100644
--- a/libmm-glib/mm-modem-voice.h
+++ b/libmm-glib/mm-modem-voice.h
@@ -65,10 +65,7 @@ struct _MMModemVoiceClass {
 };
 
 GType mm_modem_voice_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMModemVoice, g_object_unref)
-#endif
 
 const gchar *mm_modem_voice_get_path           (MMModemVoice *self);
 gchar       *mm_modem_voice_dup_path           (MMModemVoice *self);
diff --git a/libmm-glib/mm-modem.h b/libmm-glib/mm-modem.h
index e494ced6..0820361d 100644
--- a/libmm-glib/mm-modem.h
+++ b/libmm-glib/mm-modem.h
@@ -67,10 +67,7 @@ struct _MMModemClass {
 };
 
 GType mm_modem_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMModem, g_object_unref)
-#endif
 
 const gchar *mm_modem_get_path (MMModem *self);
 gchar       *mm_modem_dup_path (MMModem *self);
diff --git a/libmm-glib/mm-network-timezone.h b/libmm-glib/mm-network-timezone.h
index 29b4d2ee..f2b639a7 100644
--- a/libmm-glib/mm-network-timezone.h
+++ b/libmm-glib/mm-network-timezone.h
@@ -72,10 +72,7 @@ struct _MMNetworkTimezoneClass {
 };
 
 GType mm_network_timezone_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMNetworkTimezone, g_object_unref)
-#endif
 
 gint32 mm_network_timezone_get_offset       (MMNetworkTimezone *self);
 gint32 mm_network_timezone_get_dst_offset   (MMNetworkTimezone *self);
diff --git a/libmm-glib/mm-object.h b/libmm-glib/mm-object.h
index e342fadf..92f43c75 100644
--- a/libmm-glib/mm-object.h
+++ b/libmm-glib/mm-object.h
@@ -74,10 +74,7 @@ struct _MMObjectClass {
 };
 
 GType mm_object_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMObject, g_object_unref)
-#endif
 
 const gchar *mm_object_get_path (MMObject *self);
 gchar       *mm_object_dup_path (MMObject *self);
diff --git a/libmm-glib/mm-pco.h b/libmm-glib/mm-pco.h
index 7e7d4e56..e276e3b9 100644
--- a/libmm-glib/mm-pco.h
+++ b/libmm-glib/mm-pco.h
@@ -54,10 +54,7 @@ struct _MMPcoClass {
 };
 
 GType mm_pco_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMPco, g_object_unref)
-#endif
 
 guint32       mm_pco_get_session_id (MMPco *self);
 gboolean      mm_pco_is_complete    (MMPco *self);
diff --git a/libmm-glib/mm-signal.h b/libmm-glib/mm-signal.h
index 73fe7986..e970e729 100644
--- a/libmm-glib/mm-signal.h
+++ b/libmm-glib/mm-signal.h
@@ -63,10 +63,7 @@ struct _MMSignalClass {
 };
 
 GType mm_signal_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMSignal, g_object_unref)
-#endif
 
 gdouble  mm_signal_get_rssi (MMSignal *self);
 gdouble  mm_signal_get_rscp (MMSignal *self);
diff --git a/libmm-glib/mm-sim.h b/libmm-glib/mm-sim.h
index 90b49b55..eee4bc49 100644
--- a/libmm-glib/mm-sim.h
+++ b/libmm-glib/mm-sim.h
@@ -62,10 +62,7 @@ struct _MMSimClass {
 };
 
 GType mm_sim_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMSim, g_object_unref)
-#endif
 
 const gchar *mm_sim_get_path                (MMSim *self);
 gchar       *mm_sim_dup_path                (MMSim *self);
diff --git a/libmm-glib/mm-simple-connect-properties.h b/libmm-glib/mm-simple-connect-properties.h
index e466f6bf..c8f24efa 100644
--- a/libmm-glib/mm-simple-connect-properties.h
+++ b/libmm-glib/mm-simple-connect-properties.h
@@ -56,10 +56,7 @@ struct _MMSimpleConnectPropertiesClass {
 };
 
 GType mm_simple_connect_properties_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMSimpleConnectProperties, g_object_unref)
-#endif
 
 MMSimpleConnectProperties *mm_simple_connect_properties_new (void);
 
diff --git a/libmm-glib/mm-simple-status.h b/libmm-glib/mm-simple-status.h
index ae1f5f6d..38587413 100644
--- a/libmm-glib/mm-simple-status.h
+++ b/libmm-glib/mm-simple-status.h
@@ -54,10 +54,7 @@ struct _MMSimpleStatusClass {
 };
 
 GType mm_simple_status_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMSimpleStatus, g_object_unref)
-#endif
 
 MMModemState                  mm_simple_status_get_state               (MMSimpleStatus *self);
 guint32                       mm_simple_status_get_signal_quality      (MMSimpleStatus *self,
diff --git a/libmm-glib/mm-sms-properties.h b/libmm-glib/mm-sms-properties.h
index 0def66ed..14f4f1bb 100644
--- a/libmm-glib/mm-sms-properties.h
+++ b/libmm-glib/mm-sms-properties.h
@@ -54,10 +54,7 @@ struct _MMSmsPropertiesClass {
 };
 
 GType mm_sms_properties_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMSmsProperties, g_object_unref)
-#endif
 
 MMSmsProperties *mm_sms_properties_new (void);
 
diff --git a/libmm-glib/mm-sms.h b/libmm-glib/mm-sms.h
index d0a09c25..58eeb41e 100644
--- a/libmm-glib/mm-sms.h
+++ b/libmm-glib/mm-sms.h
@@ -62,10 +62,7 @@ struct _MMSmsClass {
 };
 
 GType mm_sms_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMSms, g_object_unref)
-#endif
 
 const gchar *mm_sms_get_path                     (MMSms *self);
 gchar       *mm_sms_dup_path                     (MMSms *self);
diff --git a/libmm-glib/mm-unlock-retries.h b/libmm-glib/mm-unlock-retries.h
index 279c7f4d..4d76edcd 100644
--- a/libmm-glib/mm-unlock-retries.h
+++ b/libmm-glib/mm-unlock-retries.h
@@ -63,10 +63,7 @@ struct _MMUnlockRetriesClass {
 };
 
 GType mm_unlock_retries_get_type (void);
-
-#if GLIB_CHECK_VERSION(2, 44, 0)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMUnlockRetries, g_object_unref)
-#endif
 
 guint mm_unlock_retries_get (MMUnlockRetries *self,
                              MMModemLock lock);