Add g_return_if_fail macros to all the liblightdm-gobject methods

diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c
index 9d3c81736cce32dbaf7c9add6f5462b7c935bfa4..b56f4f48f94472684d8b7068f996e9c5c5363933 100644 (file)
--- a/liblightdm-gobject/greeter.c
+++ b/liblightdm-gobject/greeter.c
@@ -356,7 +356,7 @@ ldm_greeter_connect_to_server (LdmGreeter *greeter)
     const gchar *bus_address, *fd;
     GBusType bus_type = G_BUS_TYPE_SYSTEM;
 
-    g_return_val_if_fail (greeter != NULL, FALSE);
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE);
 
     greeter->priv->system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
     if (!greeter->priv->system_bus)
@@ -426,7 +426,7 @@ ldm_greeter_connect_to_server (LdmGreeter *greeter)
 const gchar *
 ldm_greeter_get_hostname (LdmGreeter *greeter)
 {
-    g_return_val_if_fail (greeter != NULL, NULL);
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL);
 
     if (!greeter->priv->hostname)
     {
@@ -447,7 +447,7 @@ ldm_greeter_get_hostname (LdmGreeter *greeter)
 const gchar *
 ldm_greeter_get_theme (LdmGreeter *greeter)
 {
-    g_return_val_if_fail (greeter != NULL, NULL);
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL);
     return greeter->priv->theme;
 }
 
@@ -478,7 +478,8 @@ ldm_greeter_get_string_property (LdmGreeter *greeter, const gchar *name)
     GError *error = NULL;
     gchar *result;
 
-    g_return_val_if_fail (greeter != NULL, NULL);
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL);
+    g_return_val_if_fail (name != NULL, NULL);
 
     load_theme (greeter);
 
@@ -503,7 +504,8 @@ ldm_greeter_get_integer_property (LdmGreeter *greeter, const gchar *name)
     GError *error = NULL;
     gint result;
 
-    g_return_val_if_fail (greeter != NULL, 0);
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), 0);
+    g_return_val_if_fail (name != NULL, 0);
 
     load_theme (greeter);
 
@@ -528,7 +530,8 @@ ldm_greeter_get_boolean_property (LdmGreeter *greeter, const gchar *name)
     GError *error = NULL;
     gboolean result;
 
-    g_return_val_if_fail (greeter != NULL, FALSE);
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE);
+    g_return_val_if_fail (name != NULL, FALSE);
 
     load_theme (greeter);
 
@@ -596,7 +599,7 @@ update_users (LdmGreeter *greeter)
 gint
 ldm_greeter_get_num_users (LdmGreeter *greeter)
 {
-    g_return_val_if_fail (greeter != NULL, 0);
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), 0);
     update_users (greeter);
     return g_list_length (greeter->priv->users);
 }
@@ -613,7 +616,7 @@ ldm_greeter_get_num_users (LdmGreeter *greeter)
 const GList *
 ldm_greeter_get_users (LdmGreeter *greeter)
 {
-    g_return_val_if_fail (greeter != NULL, NULL);
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL);
     update_users (greeter);
     return greeter->priv->users;
 }
@@ -676,7 +679,7 @@ update_languages (LdmGreeter *greeter)
 const gchar *
 ldm_greeter_get_default_language (LdmGreeter *greeter)
 {
-    g_return_val_if_fail (greeter != NULL, NULL);
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL);
     return getenv ("LANG");
 }
 
@@ -691,7 +694,7 @@ ldm_greeter_get_default_language (LdmGreeter *greeter)
 const GList *
 ldm_greeter_get_languages (LdmGreeter *greeter)
 {
-    g_return_val_if_fail (greeter != NULL, NULL);
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL);
     update_languages (greeter);
     return greeter->priv->languages;
 }
@@ -699,7 +702,7 @@ ldm_greeter_get_languages (LdmGreeter *greeter)
 const gchar *
 ldm_greeter_get_default_layout (LdmGreeter *greeter)
 {
-    g_return_val_if_fail (greeter != NULL, NULL);
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL);
     return greeter->priv->default_layout;
 }
 
@@ -746,7 +749,7 @@ ldm_greeter_get_layouts (LdmGreeter *greeter)
 {
     XklConfigRegistry *registry;
 
-    g_return_val_if_fail (greeter != NULL, NULL);
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL);
 
     if (greeter->priv->have_layouts)
         return greeter->priv->layouts;
@@ -804,7 +807,7 @@ ldm_greeter_set_layout (LdmGreeter *greeter, const gchar *layout)
 const gchar *
 ldm_greeter_get_layout (LdmGreeter *greeter)
 {
-    g_return_val_if_fail (greeter != NULL, NULL);
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL);
     setup_xkl (greeter);
     return greeter->priv->layout;
 }
@@ -896,7 +899,7 @@ update_sessions (LdmGreeter *greeter)
 const GList *
 ldm_greeter_get_sessions (LdmGreeter *greeter)
 {
-    g_return_val_if_fail (greeter != NULL, NULL);
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL);
     update_sessions (greeter);
     return greeter->priv->sessions;
 }
@@ -912,7 +915,7 @@ ldm_greeter_get_sessions (LdmGreeter *greeter)
 const gchar *
 ldm_greeter_get_default_session (LdmGreeter *greeter)
 {
-    g_return_val_if_fail (greeter != NULL, NULL);
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL);
     return greeter->priv->default_session;
 }
 
@@ -927,7 +930,7 @@ ldm_greeter_get_default_session (LdmGreeter *greeter)
 const gchar *
 ldm_greeter_get_timed_login_user (LdmGreeter *greeter)
 {
-    g_return_val_if_fail (greeter != NULL, NULL);
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL);
     return greeter->priv->timed_user;
 }
 
@@ -942,7 +945,7 @@ ldm_greeter_get_timed_login_user (LdmGreeter *greeter)
 gint
 ldm_greeter_get_timed_login_delay (LdmGreeter *greeter)
 {
-    g_return_val_if_fail (greeter != NULL, 0);
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), 0);
     return greeter->priv->login_delay;
 }
 
@@ -1028,7 +1031,7 @@ ldm_greeter_cancel_authentication (LdmGreeter *greeter)
 gboolean
 ldm_greeter_get_in_authentication (LdmGreeter *greeter)
 {
-    g_return_val_if_fail (greeter != NULL, FALSE);
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE);
     return greeter->priv->in_authentication;
 }
 
@@ -1043,7 +1046,7 @@ ldm_greeter_get_in_authentication (LdmGreeter *greeter)
 gboolean
 ldm_greeter_get_is_authenticated (LdmGreeter *greeter)
 {
-    g_return_val_if_fail (greeter != NULL, FALSE);
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE);
     return greeter->priv->is_authenticated;
 }
 
@@ -1058,7 +1061,7 @@ ldm_greeter_get_is_authenticated (LdmGreeter *greeter)
 const gchar *
 ldm_greeter_get_authentication_user (LdmGreeter *greeter)
 {
-    g_return_val_if_fail (greeter != NULL, NULL);
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL);
     return greeter->priv->authentication_user;
 }
 
@@ -1102,7 +1105,6 @@ ldm_greeter_login_with_defaults (LdmGreeter *greeter, const gchar *username)
 {
     g_return_if_fail (LDM_IS_GREETER (greeter));
     g_return_if_fail (username != NULL);
-
     ldm_greeter_login (greeter, username, NULL, NULL);
 }
 
@@ -1114,8 +1116,6 @@ upower_call_function (LdmGreeter *greeter, const gchar *function, gboolean has_r
     GError *error = NULL;
     gboolean function_result = FALSE;
 
-    g_return_val_if_fail (greeter != NULL, FALSE);
-
     proxy = g_dbus_proxy_new_sync (greeter->priv->system_bus,
                                    G_DBUS_PROXY_FLAGS_NONE,
                                    NULL,
@@ -1156,6 +1156,7 @@ upower_call_function (LdmGreeter *greeter, const gchar *function, gboolean has_r
 gboolean
 ldm_greeter_get_can_suspend (LdmGreeter *greeter)
 {
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE);
     return upower_call_function (greeter, "SuspendAllowed", TRUE);
 }
 
@@ -1168,6 +1169,7 @@ ldm_greeter_get_can_suspend (LdmGreeter *greeter)
 void
 ldm_greeter_suspend (LdmGreeter *greeter)
 {
+    g_return_if_fail (LDM_IS_GREETER (greeter));
     upower_call_function (greeter, "Suspend", FALSE);
 }
 
@@ -1182,6 +1184,7 @@ ldm_greeter_suspend (LdmGreeter *greeter)
 gboolean
 ldm_greeter_get_can_hibernate (LdmGreeter *greeter)
 {
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE);
     return upower_call_function (greeter, "HibernateAllowed", TRUE);
 }
 
@@ -1194,6 +1197,7 @@ ldm_greeter_get_can_hibernate (LdmGreeter *greeter)
 void
 ldm_greeter_hibernate (LdmGreeter *greeter)
 {
+    g_return_if_fail (LDM_IS_GREETER (greeter));
     upower_call_function (greeter, "Hibernate", FALSE);
 }
 
@@ -1205,8 +1209,6 @@ ck_call_function (LdmGreeter *greeter, const gchar *function, gboolean has_resul
     GError *error = NULL;
     gboolean function_result = FALSE;
 
-    g_return_val_if_fail (greeter != NULL, FALSE);
-
     proxy = g_dbus_proxy_new_sync (greeter->priv->system_bus,
                                    G_DBUS_PROXY_FLAGS_NONE,
                                    NULL,
@@ -1247,6 +1249,7 @@ ck_call_function (LdmGreeter *greeter, const gchar *function, gboolean has_resul
 gboolean
 ldm_greeter_get_can_restart (LdmGreeter *greeter)
 {
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE);
     return ck_call_function (greeter, "CanRestart", TRUE);
 }
 
@@ -1259,6 +1262,7 @@ ldm_greeter_get_can_restart (LdmGreeter *greeter)
 void
 ldm_greeter_restart (LdmGreeter *greeter)
 {
+    g_return_if_fail (LDM_IS_GREETER (greeter));
     ck_call_function (greeter, "Restart", FALSE);
 }
 
@@ -1273,6 +1277,7 @@ ldm_greeter_restart (LdmGreeter *greeter)
 gboolean
 ldm_greeter_get_can_shutdown (LdmGreeter *greeter)
 {
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE);
     return ck_call_function (greeter, "CanStop", TRUE);
 }
 
@@ -1285,6 +1290,7 @@ ldm_greeter_get_can_shutdown (LdmGreeter *greeter)
 void
 ldm_greeter_shutdown (LdmGreeter *greeter)
 {
+    g_return_if_fail (LDM_IS_GREETER (greeter));
     ck_call_function (greeter, "Stop", FALSE);
 }
 
@@ -1305,6 +1311,9 @@ ldm_greeter_get_user_defaults (LdmGreeter *greeter, const gchar *username, gchar
     GVariant *result;
     gboolean got_defaults = FALSE;
 
+    g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE);
+    g_return_val_if_fail (username != NULL, FALSE);
+
     result = g_dbus_proxy_call_sync (greeter->priv->user_proxy,
                                      "GetUserDefaults",
                                      g_variant_new ("(s)", username),

diff --git a/liblightdm-gobject/language.c b/liblightdm-gobject/language.c
index e8fda4d0b66ff23697c6096b46d4e0d836b7e0a0..bcceaca5bb3b2a63aad44c2155488b4ed4cbb343 100644 (file)
--- a/liblightdm-gobject/language.c
+++ b/liblightdm-gobject/language.c
@@ -55,6 +55,7 @@ ldm_language_new (const gchar *code)
 const gchar *
 ldm_language_get_code (LdmLanguage *language)
 {
+    g_return_val_if_fail (LDM_IS_LANGUAGE (language), NULL);
     return language->priv->code;
 }
 
@@ -69,6 +70,8 @@ ldm_language_get_code (LdmLanguage *language)
 const gchar *
 ldm_language_get_name (LdmLanguage *language)
 {
+    g_return_val_if_fail (LDM_IS_LANGUAGE (language), NULL);
+
     if (!language->priv->name)
     {
         char *current = setlocale(LC_ALL, NULL);
@@ -91,6 +94,8 @@ ldm_language_get_name (LdmLanguage *language)
 const gchar *
 ldm_language_get_territory (LdmLanguage *language)
 {
+    g_return_val_if_fail (LDM_IS_LANGUAGE (language), NULL);
+
     if (!language->priv->territory)
     {
         char *current = setlocale(LC_ALL, NULL);
@@ -120,6 +125,9 @@ is_utf8 (const gchar *code)
 gboolean
 ldm_language_matches (LdmLanguage *language, const gchar *code)
 {
+    g_return_val_if_fail (LDM_IS_LANGUAGE (language), FALSE);
+    g_return_val_if_fail (code != NULL, FALSE);
+
     /* Handle the fact the UTF-8 is specified both as '.utf8' and '.UTF-8' */
     if (is_utf8 (language->priv->code) && is_utf8 (code))
     {

diff --git a/liblightdm-gobject/layout.c b/liblightdm-gobject/layout.c
index c5b41bcccea3c02feabd90e57cd456c0f769d106..36db7c2e2deb6c032822372fbc3d2adfec6b7ceb 100644 (file)
--- a/liblightdm-gobject/layout.c
+++ b/liblightdm-gobject/layout.c
@@ -54,6 +54,7 @@ ldm_layout_new (const gchar *name, const gchar *short_description, const gchar *
 const gchar *
 ldm_layout_get_name (LdmLayout *layout)
 {
+    g_return_val_if_fail (LDM_IS_LAYOUT (layout), NULL);
     return layout->priv->name;
 }
 
@@ -68,6 +69,7 @@ ldm_layout_get_name (LdmLayout *layout)
 const gchar *
 ldm_layout_get_short_description (LdmLayout *layout)
 {
+    g_return_val_if_fail (LDM_IS_LAYOUT (layout), NULL);
     return layout->priv->short_description;
 }
 
@@ -82,6 +84,7 @@ ldm_layout_get_short_description (LdmLayout *layout)
 const gchar *
 ldm_layout_get_description (LdmLayout *layout)
 {
+    g_return_val_if_fail (LDM_IS_LAYOUT (layout), NULL);
     return layout->priv->description;
 }
 

diff --git a/liblightdm-gobject/session.c b/liblightdm-gobject/session.c
index 826c51032d52e8cdb3f8cd965acd686330af6628..40a04a4dd5eab25567997031723a70becf234f70 100644 (file)
--- a/liblightdm-gobject/session.c
+++ b/liblightdm-gobject/session.c
@@ -54,6 +54,7 @@ ldm_session_new (const gchar *key, const gchar *name, const gchar *comment)
 const gchar *
 ldm_session_get_key (LdmSession *session)
 {
+    g_return_val_if_fail (LDM_IS_SESSION (session), NULL);
     return session->priv->key;
 }
 
@@ -68,6 +69,7 @@ ldm_session_get_key (LdmSession *session)
 const gchar *
 ldm_session_get_name (LdmSession *session)
 {
+    g_return_val_if_fail (LDM_IS_SESSION (session), NULL);
     return session->priv->name;
 }
 
@@ -82,6 +84,7 @@ ldm_session_get_name (LdmSession *session)
 const gchar *
 ldm_session_get_comment (LdmSession *session)
 {
+    g_return_val_if_fail (LDM_IS_SESSION (session), NULL);
     return session->priv->comment;
 }
 

diff --git a/liblightdm-gobject/user.c b/liblightdm-gobject/user.c
index d62244dc3dae62fad0e2d1dd12f648b1f6658085..dcd674196ca60f146b0999e8fdf27bed500a00d5 100644 (file)
--- a/liblightdm-gobject/user.c
+++ b/liblightdm-gobject/user.c
@@ -70,6 +70,7 @@ ldm_user_new (LdmGreeter *greeter, const gchar *name, const gchar *real_name, co
 const gchar *
 ldm_user_get_name (LdmUser *user)
 {
+    g_return_val_if_fail (LDM_IS_USER (user), NULL);
     return user->priv->name;
 }
 
@@ -84,6 +85,7 @@ ldm_user_get_name (LdmUser *user)
 const gchar *
 ldm_user_get_real_name (LdmUser *user)
 {
+    g_return_val_if_fail (LDM_IS_USER (user), NULL);
     return user->priv->real_name;
 }
 
@@ -98,6 +100,8 @@ ldm_user_get_real_name (LdmUser *user)
 const gchar *
 ldm_user_get_display_name (LdmUser *user)
 {
+    g_return_val_if_fail (LDM_IS_USER (user), NULL);
+
     if (user->priv->real_name[0] != '\0')
         return user->priv->real_name;
     else
@@ -115,6 +119,7 @@ ldm_user_get_display_name (LdmUser *user)
 const gchar *
 ldm_user_get_image (LdmUser *user)
 {
+    g_return_val_if_fail (LDM_IS_USER (user), NULL);
     return user->priv->image;
 }
 
@@ -139,6 +144,7 @@ get_defaults (LdmUser *user)
 const gchar *
 ldm_user_get_language (LdmUser *user)
 {
+    g_return_val_if_fail (LDM_IS_USER (user), NULL);
     get_defaults (user);
     return user->priv->language;
 }
@@ -154,6 +160,7 @@ ldm_user_get_language (LdmUser *user)
 const gchar *
 ldm_user_get_layout (LdmUser *user)
 {
+    g_return_val_if_fail (LDM_IS_USER (user), NULL);
     get_defaults (user);
     return user->priv->layout;
 }
@@ -169,6 +176,7 @@ ldm_user_get_layout (LdmUser *user)
 const gchar *
 ldm_user_get_session (LdmUser *user)
 {
+    g_return_val_if_fail (LDM_IS_USER (user), NULL);
     get_defaults (user);
     return user->priv->session; 
 }
@@ -184,6 +192,7 @@ ldm_user_get_session (LdmUser *user)
 gboolean
 ldm_user_get_logged_in (LdmUser *user)
 {
+    g_return_val_if_fail (LDM_IS_USER (user), FALSE);
     return user->priv->logged_in;
 }