aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2009-01-23 21:52:40 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-01-23 21:52:40 +0800
commit025c9ec4d13772b1e233a472ea90cc9ed0b27611 (patch)
tree7d6add0c574dd8aa0cab3759716bf903908d02da /libempathy
parent3db2a8f24d7fe902805b64377170f6ce9280a9e8 (diff)
downloadgsoc2013-empathy-025c9ec4d13772b1e233a472ea90cc9ed0b27611.tar
gsoc2013-empathy-025c9ec4d13772b1e233a472ea90cc9ed0b27611.tar.gz
gsoc2013-empathy-025c9ec4d13772b1e233a472ea90cc9ed0b27611.tar.bz2
gsoc2013-empathy-025c9ec4d13772b1e233a472ea90cc9ed0b27611.tar.lz
gsoc2013-empathy-025c9ec4d13772b1e233a472ea90cc9ed0b27611.tar.xz
gsoc2013-empathy-025c9ec4d13772b1e233a472ea90cc9ed0b27611.tar.zst
gsoc2013-empathy-025c9ec4d13772b1e233a472ea90cc9ed0b27611.zip
Renamed G_STR_EMPTY to EMP_STR_EMPTY.
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk> svn path=/trunk/; revision=2249
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-chatroom.c2
-rw-r--r--libempathy/empathy-contact.c12
-rw-r--r--libempathy/empathy-idle.c6
-rw-r--r--libempathy/empathy-log-manager.c6
-rw-r--r--libempathy/empathy-tp-call.c6
-rw-r--r--libempathy/empathy-tp-contact-factory.c8
-rw-r--r--libempathy/empathy-utils.h2
7 files changed, 21 insertions, 21 deletions
diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c
index 16707bd15..ef89994c0 100644
--- a/libempathy/empathy-chatroom.c
+++ b/libempathy/empathy-chatroom.c
@@ -341,7 +341,7 @@ empathy_chatroom_get_name (EmpathyChatroom *chatroom)
priv = GET_PRIV (chatroom);
- if (G_STR_EMPTY (priv->name)) {
+ if (EMP_STR_EMPTY (priv->name)) {
return priv->room;
}
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 0b7a1401d..59d55fd4d 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -381,7 +381,7 @@ contact_is_ready (EmpathyContact *contact, EmpathyContactReady ready)
/* When the name is NULL, empathy_contact_get_name() fallback to the id.
* When the caller want to wait the name to be ready, it also want to wait
* the id to be ready in case of fallback. */
- if ((ready & EMPATHY_CONTACT_READY_NAME) && G_STR_EMPTY (priv->name))
+ if ((ready & EMPATHY_CONTACT_READY_NAME) && EMP_STR_EMPTY (priv->name))
ready |= EMPATHY_CONTACT_READY_ID;
return (priv->ready & ready) == ready;
@@ -508,7 +508,7 @@ empathy_contact_set_id (EmpathyContact *contact,
priv->id = g_strdup (id);
g_object_notify (G_OBJECT (contact), "id");
- if (G_STR_EMPTY (priv->name))
+ if (EMP_STR_EMPTY (priv->name))
g_object_notify (G_OBJECT (contact), "name");
}
contact_set_ready_flag (contact, EMPATHY_CONTACT_READY_ID);
@@ -525,7 +525,7 @@ empathy_contact_get_name (EmpathyContact *contact)
priv = GET_PRIV (contact);
- if (G_STR_EMPTY (priv->name))
+ if (EMP_STR_EMPTY (priv->name))
return empathy_contact_get_id (contact);
return priv->name;
@@ -940,7 +940,7 @@ contact_get_avatar_filename (EmpathyContact *contact,
gchar *token_escaped;
gchar *contact_escaped;
- if (G_STR_EMPTY (priv->id))
+ if (EMP_STR_EMPTY (priv->id))
return NULL;
contact_escaped = tp_escape_as_identifier (priv->id);
@@ -978,7 +978,7 @@ empathy_contact_load_avatar_data (EmpathyContact *contact,
g_return_if_fail (data != NULL);
g_return_if_fail (len > 0);
g_return_if_fail (format != NULL);
- g_return_if_fail (!G_STR_EMPTY (token));
+ g_return_if_fail (!EMP_STR_EMPTY (token));
/* Load and set the avatar */
avatar = empathy_avatar_new (g_memdup (data, len), len, g_strdup (format),
@@ -1013,7 +1013,7 @@ empathy_contact_load_avatar_cache (EmpathyContact *contact,
GError *error = NULL;
g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), FALSE);
- g_return_val_if_fail (!G_STR_EMPTY (token), FALSE);
+ g_return_val_if_fail (!EMP_STR_EMPTY (token), FALSE);
/* Load the avatar from file if it exists */
filename = contact_get_avatar_filename (contact, token);
diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c
index 4a96e2d16..f9dd4fca8 100644
--- a/libempathy/empathy-idle.c
+++ b/libempathy/empathy-idle.c
@@ -95,7 +95,7 @@ idle_presence_changed_cb (MissionControl *mc,
g_free (priv->status);
priv->state = state;
priv->status = NULL;
- if (!G_STR_EMPTY (status)) {
+ if (!EMP_STR_EMPTY (status)) {
priv->status = g_strdup (status);
}
@@ -433,7 +433,7 @@ empathy_idle_init (EmpathyIdle *idle)
g_clear_error (&error);
}
priv->status = mission_control_get_presence_message_actual (priv->mc, &error);
- if (error || G_STR_EMPTY (priv->status)) {
+ if (error || EMP_STR_EMPTY (priv->status)) {
g_free (priv->status);
priv->status = NULL;
@@ -590,7 +590,7 @@ empathy_idle_set_presence (EmpathyIdle *idle,
if (tp_strdiff (priv->status, status)) {
g_free (priv->status);
priv->status = NULL;
- if (!G_STR_EMPTY (status)) {
+ if (!EMP_STR_EMPTY (status)) {
priv->status = g_strdup (status);
}
g_object_notify (G_OBJECT (idle), "status");
diff --git a/libempathy/empathy-log-manager.c b/libempathy/empathy-log-manager.c
index 39dd4f3a2..3d7acb3e0 100644
--- a/libempathy/empathy-log-manager.c
+++ b/libempathy/empathy-log-manager.c
@@ -170,7 +170,7 @@ empathy_log_manager_add_message (EmpathyLogManager *manager,
body_str = empathy_message_get_body (message);
msg_type = empathy_message_get_tptype (message);
- if (G_STR_EMPTY (body_str)) {
+ if (EMP_STR_EMPTY (body_str)) {
return;
}
@@ -384,7 +384,7 @@ empathy_log_manager_get_messages_for_file (EmpathyLogManager *manager,
sender = empathy_contact_new_full (account, sender_id, sender_name);
empathy_contact_set_is_user (sender, is_user);
- if (!G_STR_EMPTY (sender_avatar_token)) {
+ if (!EMP_STR_EMPTY (sender_avatar_token)) {
empathy_contact_load_avatar_cache (sender,
sender_avatar_token);
}
@@ -489,7 +489,7 @@ empathy_log_manager_search_new (EmpathyLogManager *manager,
gchar *text_casefold;
g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
- g_return_val_if_fail (!G_STR_EMPTY (text), NULL);
+ g_return_val_if_fail (!EMP_STR_EMPTY (text), NULL);
text_casefold = g_utf8_casefold (text, -1);
diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c
index b01db859d..c8b96fed2 100644
--- a/libempathy/empathy-tp-call.c
+++ b/libempathy/empathy-tp-call.c
@@ -388,20 +388,20 @@ tp_call_stream_engine_watch_name_owner_cb (TpDBusDaemon *daemon,
{
EmpathyTpCallPriv *priv = GET_PRIV (call);
- /* G_STR_EMPTY(new_owner) means either stream-engine has not started yet or
+ /* EMP_STR_EMPTY(new_owner) means either stream-engine has not started yet or
* has crashed. We want to close the channel if stream-engine has crashed.
* */
DEBUG ("Watch SE: name='%s' SE running='%s' new_owner='%s'",
name, priv->stream_engine_running ? "yes" : "no",
new_owner ? new_owner : "none");
- if (priv->stream_engine_running && G_STR_EMPTY (new_owner))
+ if (priv->stream_engine_running && EMP_STR_EMPTY (new_owner))
{
DEBUG ("Stream engine falled off the bus");
empathy_tp_call_close (call);
return;
}
- priv->stream_engine_running = !G_STR_EMPTY (new_owner);
+ priv->stream_engine_running = !EMP_STR_EMPTY (new_owner);
}
static void
diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c
index c407ea49e..9fe143e43 100644
--- a/libempathy/empathy-tp-contact-factory.c
+++ b/libempathy/empathy-tp-contact-factory.c
@@ -130,7 +130,7 @@ tp_contact_factory_presences_table_foreach (const gchar *state_str,
message_str = g_value_get_string (message);
}
- if (!G_STR_EMPTY (message_str)) {
+ if (!EMP_STR_EMPTY (message_str)) {
empathy_contact_set_presence_message (contact, message_str);
} else {
empathy_contact_set_presence_message (contact, NULL);
@@ -384,7 +384,7 @@ tp_contact_factory_avatar_maybe_update (EmpathyTpContactFactory *tp_factory,
}
/* Check if we have an avatar */
- if (G_STR_EMPTY (token)) {
+ if (EMP_STR_EMPTY (token)) {
empathy_contact_set_avatar (contact, NULL);
return TRUE;
}
@@ -783,12 +783,12 @@ tp_contact_factory_ready (EmpathyTpContactFactory *tp_factory)
handle = empathy_contact_get_handle (contact);
id = empathy_contact_get_id (contact);
if (handle == 0) {
- g_assert (!G_STR_EMPTY (id));
+ g_assert (!EMP_STR_EMPTY (id));
g_array_append_val (handle_needed, id);
handle_needed_contacts = g_list_prepend (handle_needed_contacts,
g_object_ref (contact));
}
- if (G_STR_EMPTY (id)) {
+ if (EMP_STR_EMPTY (id)) {
g_array_append_val (id_needed, handle);
id_needed_contacts = g_list_prepend (id_needed_contacts,
g_object_ref (contact));
diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index 62cd1a81b..dc17353da 100644
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -38,7 +38,7 @@
#include "empathy-contact.h"
#define EMPATHY_GET_PRIV(obj,type) ((type##Priv*) ((type*)obj)->priv)
-#define G_STR_EMPTY(x) ((x) == NULL || (x)[0] == '\0')
+#define EMP_STR_EMPTY(x) ((x) == NULL || (x)[0] == '\0')
G_BEGIN_DECLS