summaryrefslogtreecommitdiff
path: root/mate-session/gsm-manager.c
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-11-14 02:15:43 -0800
committerStefano Karapetsas <[email protected]>2012-11-14 02:15:43 -0800
commit6b16710b19e25ddb05f5b99f48cd4bf03d46e56a (patch)
treef96d65ab4c9c2bbd8040e62f77a0bb9bc6ad9c74 /mate-session/gsm-manager.c
parent933f891732a533179682015e1d194a40293f6c9b (diff)
parentdee0e9ab8f63d1b022a7ac011a921db48acc1cd7 (diff)
downloadmate-session-manager-6b16710b19e25ddb05f5b99f48cd4bf03d46e56a.tar.bz2
mate-session-manager-6b16710b19e25ddb05f5b99f48cd4bf03d46e56a.tar.xz
Merge pull request #11 from sbalneav/master
All warnings fixed. Clean compile.
Diffstat (limited to 'mate-session/gsm-manager.c')
-rw-r--r--mate-session/gsm-manager.c23
1 files changed, 15 insertions, 8 deletions
diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c
index 54f7ee2..8b2e024 100644
--- a/mate-session/gsm-manager.c
+++ b/mate-session/gsm-manager.c
@@ -89,6 +89,12 @@
#define IS_STRING_EMPTY(x) ((x)==NULL||(x)[0]=='\0')
+#ifdef __GNUC__
+#define UNUSED_VARIABLE __attribute__ ((unused))
+#else
+#define UNUSED_VARIABLE
+#endif
+
typedef enum
{
GSM_MANAGER_LOGOUT_NONE,
@@ -288,12 +294,11 @@ app_condition_changed (GsmApp *app,
if (condition) {
if (!gsm_app_is_running (app) && client == NULL) {
- GError *error;
- gboolean res;
+ GError *error = NULL;
+ gboolean UNUSED_VARIABLE res;
g_debug ("GsmManager: starting app '%s'", gsm_app_peek_id (app));
- error = NULL;
res = gsm_app_start (app, &error);
if (error != NULL) {
g_warning ("Not able to start app from its condition: %s",
@@ -305,7 +310,7 @@ app_condition_changed (GsmApp *app,
}
} else {
GError *error;
- gboolean res;
+ gboolean UNUSED_VARIABLE res;
if (client != NULL) {
/* Kill client in case condition if false and make sure it won't
@@ -1473,7 +1478,7 @@ _disconnect_client (GsmManager *manager,
gboolean is_condition_client;
GsmApp *app;
GError *error;
- gboolean res;
+ gboolean UNUSED_VARIABLE res;
const char *app_id;
const char *startup_id;
gboolean app_restart;
@@ -1632,7 +1637,7 @@ static void
remove_inhibitors_for_connection (GsmManager *manager,
const char *service_name)
{
- guint n_removed;
+ guint UNUSED_VARIABLE n_removed;
RemoveClientData data;
data.service_name = service_name;
@@ -2304,10 +2309,12 @@ on_gsettings_key_changed (GSettings *settings,
delay = g_settings_get_int (settings, key);
gsm_presence_set_idle_timeout (manager->priv->presence, delay * 60000);
} else if (g_strcmp0 (key, KEY_LOCK_DISABLE) == 0) {
- gboolean disabled;
+ /* ??? */
+ gboolean UNUSED_VARIABLE disabled;
disabled = g_settings_get_boolean (settings, key);
} else if (g_strcmp0 (key, KEY_USER_SWITCH_DISABLE) == 0) {
- gboolean disabled;
+ /* ??? */
+ gboolean UNUSED_VARIABLE disabled;
disabled = g_settings_get_boolean (settings, key);
} else {
g_debug ("Config key not handled: %s", key);