clean up and de-duplicate defines

from https://github.com/GNOME/gnome-session/commit/f415130f0de6cdc13d9433632d5ee1554a242103
and https://github.com/GNOME/gnome-session/commit/378f502047022b263d14bbbec213ad442e5ad822

9 files changed, 4 insertions, 21 deletions

diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c
index e74a8fe..922d6e7 100644
--- a/capplet/gsm-properties-dialog.c
+++ b/capplet/gsm-properties-dialog.c
@@ -37,11 +37,6 @@
 
 #define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate))
 
-#define IS_STRING_EMPTY(x) ((x)==NULL||(x)[0]=='\0')
-
-#define REALLY_IDENTICAL_STRING(a, b)                   \
-        ((a && b && !strcmp (a, b)) || (!a && !b))
-
 #define GTKBUILDER_FILE "session-properties.ui"
 
 #define CAPPLET_TREEVIEW_WIDGET_NAME      "session_properties_treeview"
diff --git a/mate-session/gsm-dbus-client.c b/mate-session/gsm-dbus-client.c
index 8fd2abd..b156fd1 100644
--- a/mate-session/gsm-dbus-client.c
+++ b/mate-session/gsm-dbus-client.c
@@ -36,12 +36,10 @@
 #include "gsm-marshal.h"
 
 #include "gsm-manager.h"
+#include "gsm-util.h"
 
 #define GSM_DBUS_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_DBUS_CLIENT, GsmDBusClientPrivate))
 
-#define IS_STRING_EMPTY(x) ((x)==NULL||(x)[0]=='\0')
-
-
 #define SM_DBUS_NAME                     "org.mate.SessionManager"
 #define SM_DBUS_CLIENT_PRIVATE_INTERFACE "org.mate.SessionManager.ClientPrivate"
 
diff --git a/mate-session/gsm-inhibit-dialog.c b/mate-session/gsm-inhibit-dialog.c
index c24c784..806f9d5 100644
--- a/mate-session/gsm-inhibit-dialog.c
+++ b/mate-session/gsm-inhibit-dialog.c
@@ -45,8 +45,6 @@
 
 #define GSM_INHIBIT_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_INHIBIT_DIALOG, GsmInhibitDialogPrivate))
 
-#define IS_STRING_EMPTY(x) ((x)==NULL||(x)[0]=='\0')
-
 #define GTKBUILDER_FILE "gsm-inhibit-dialog.ui"
 
 #ifndef DEFAULT_ICON_SIZE
diff --git a/mate-session/gsm-inhibitor.c b/mate-session/gsm-inhibitor.c
index 3c67dae..33de12f 100644
--- a/mate-session/gsm-inhibitor.c
+++ b/mate-session/gsm-inhibitor.c
@@ -30,11 +30,10 @@
 
 #include "gsm-inhibitor.h"
 #include "gsm-inhibitor-glue.h"
+#include "gsm-util.h"
 
 static guint32 inhibitor_serial = 1;
 
-#define IS_STRING_EMPTY(x) ((x)==NULL||(x)[0]=='\0')
-
 #define GSM_INHIBITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_INHIBITOR, GsmInhibitorPrivate))
 
 struct GsmInhibitorPrivate
diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c
index 046619f..552307c 100644
--- a/mate-session/gsm-manager.c
+++ b/mate-session/gsm-manager.c
@@ -93,8 +93,6 @@
 #define SCREENSAVER_SCHEMA           "org.mate.screensaver"
 #define KEY_SLEEP_LOCK               "lock-enabled"
 
-#define IS_STRING_EMPTY(x) ((x)==NULL||(x)[0]=='\0')
-
 #ifdef __GNUC__
 #define UNUSED_VARIABLE __attribute__ ((unused))
 #else
diff --git a/mate-session/gsm-presence.c b/mate-session/gsm-presence.c
index f87948d..725e4f3 100644
--- a/mate-session/gsm-presence.c
+++ b/mate-session/gsm-presence.c
@@ -41,8 +41,6 @@
 
 #define MAX_STATUS_TEXT 140
 
-#define IS_STRING_EMPTY(x) ((x)==NULL||(x)[0]=='\0')
-
 #define GSM_PRESENCE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PRESENCE, GsmPresencePrivate))
 
 struct GsmPresencePrivate
diff --git a/mate-session/gsm-util.h b/mate-session/gsm-util.h
index 19c492d..efc980c 100644
--- a/mate-session/gsm-util.h
+++ b/mate-session/gsm-util.h
@@ -26,6 +26,8 @@
 extern "C" {
 #endif
 
+#define IS_STRING_EMPTY(x) ((x)==NULL||(x)[0]=='\0')
+
 char *      gsm_util_find_desktop_file_for_app_name (const char  *app_name,
                                                      char       **dirs);
 
diff --git a/mate-session/gsm-xsmp-client.c b/mate-session/gsm-xsmp-client.c
index ec2db51..9c61497 100644
--- a/mate-session/gsm-xsmp-client.c
+++ b/mate-session/gsm-xsmp-client.c
@@ -40,8 +40,6 @@
 
 #define GsmDesktopFile "_GSM_DesktopFile"
 
-#define IS_STRING_EMPTY(x) ((x)==NULL||(x)[0]=='\0')
-
 #define GSM_XSMP_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_XSMP_CLIENT, GsmXSMPClientPrivate))
 
 struct GsmXSMPClientPrivate
diff --git a/mate-session/main.c b/mate-session/main.c
index a221171..bb46c81 100644
--- a/mate-session/main.c
+++ b/mate-session/main.c
@@ -76,9 +76,6 @@
 
 #define GSM_DBUS_NAME "org.mate.SessionManager"
 
-#define IS_STRING_EMPTY(x) \
-	((x) == NULL || (x)[0] == '\0')
-
 #define KEY_AUTOSAVE "auto-save-session"
 
 static gboolean failsafe = FALSE;