From 7eae2e49e62834cfff13cc2ee10b37eaff38a6fb Mon Sep 17 00:00:00 2001 From: Marco Barisione Date: Fri, 10 May 2013 16:58:34 +0100 Subject: tpaw-utils: move EMP_STR_EMPTY to tp-aw and rename it https://bugzilla.gnome.org/show_bug.cgi?id=699492 --- src/empathy-chat-window.c | 7 ++++--- src/empathy-debug-window.c | 7 ++++--- src/empathy-event-manager.c | 3 ++- src/empathy-import-pidgin.c | 3 ++- src/empathy-import-utils.c | 3 ++- src/empathy-new-chatroom-dialog.c | 5 +++-- src/empathy-status-icon.c | 2 +- 7 files changed, 18 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index aa9811ef8..609b52c2e 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -30,6 +30,7 @@ #include #include +#include #include "empathy-about-dialog.h" #include "empathy-chat-manager.h" @@ -962,10 +963,10 @@ chat_window_update_chat_tab_full (EmpathyChat *chat, g_free (tmp); } - if (!EMP_STR_EMPTY (status)) + if (!TPAW_STR_EMPTY (status)) append_markup_printf (tooltip, "\n%s", status); - if (!EMP_STR_EMPTY (subject)) + if (!TPAW_STR_EMPTY (subject)) append_markup_printf (tooltip, "\n%s %s", _("Topic:"), subject); @@ -2783,7 +2784,7 @@ empathy_chat_window_find_chat (TpAccount *account, { GList *l; - g_return_val_if_fail (!EMP_STR_EMPTY (id), NULL); + g_return_val_if_fail (!TPAW_STR_EMPTY (id), NULL); for (l = chat_windows; l; l = l->next) { diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c index 4522c6a02..fcf5804d4 100644 --- a/src/empathy-debug-window.c +++ b/src/empathy-debug-window.c @@ -24,6 +24,7 @@ #include #include +#include #include "empathy-geometry.h" #include "empathy-ui-utils.h" @@ -1005,7 +1006,7 @@ debug_window_name_owner_changed_cb (TpDBusDaemon *proxy, return; } - if (EMP_STR_EMPTY (arg1) && !EMP_STR_EMPTY (arg2)) + if (TPAW_STR_EMPTY (arg1) && !TPAW_STR_EMPTY (arg2)) { GtkTreeIter *found_at_iter = NULL; gchar *display_name; @@ -1085,7 +1086,7 @@ debug_window_name_owner_changed_cb (TpDBusDaemon *proxy, g_free (display_name); } - else if (!EMP_STR_EMPTY (arg1) && EMP_STR_EMPTY (arg2)) + else if (!TPAW_STR_EMPTY (arg1) && TPAW_STR_EMPTY (arg2)) { /* A service died */ GtkTreeIter *iter = NULL; @@ -1297,7 +1298,7 @@ debug_window_menu_copy_activate_cb (GtkMenuItem *menu_item, message = tp_debug_message_get_message (msg); - if (EMP_STR_EMPTY (message)) + if (TPAW_STR_EMPTY (message)) { DEBUG ("Log message is empty"); return; diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index f2d197580..e973ef3be 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -24,6 +24,7 @@ #include #include +#include #include "empathy-call-utils.h" #include "empathy-connection-aggregator.h" @@ -1110,7 +1111,7 @@ check_publish_state (EmpathyEventManager *self, message = tp_contact_get_publish_request (tp_contact); - if (!EMP_STR_EMPTY (message)) + if (!TPAW_STR_EMPTY (message)) event_msg = g_strdup_printf (_("\nMessage: %s"), message); else event_msg = NULL; diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c index 92adb861e..bd05753c0 100644 --- a/src/empathy-import-pidgin.c +++ b/src/empathy-import-pidgin.c @@ -24,6 +24,7 @@ #include #include +#include #include "empathy-import-utils.h" #include "empathy-utils.h" @@ -356,7 +357,7 @@ empathy_import_pidgin_load (void) * http://bugzilla.gnome.org/show_bug.cgi?id=579992 */ if (!tp_strdiff (data->protocol, "jabber")) { - if (EMP_STR_EMPTY (tp_asv_get_string (data->settings, "server"))) + if (TPAW_STR_EMPTY (tp_asv_get_string (data->settings, "server"))) { g_hash_table_remove (data->settings, "port"); g_hash_table_remove (data->settings, "server"); diff --git a/src/empathy-import-utils.c b/src/empathy-import-utils.c index d95326bc2..ab7847c3f 100644 --- a/src/empathy-import-utils.c +++ b/src/empathy-import-utils.c @@ -23,6 +23,7 @@ #include "empathy-import-utils.h" #include +#include #include "empathy-import-pidgin.h" #include "empathy-utils.h" @@ -32,7 +33,7 @@ empathy_import_account_data_new (const gchar *source) { EmpathyImportAccountData *data; - g_return_val_if_fail (!EMP_STR_EMPTY (source), NULL); + g_return_val_if_fail (!TPAW_STR_EMPTY (source), NULL); data = g_slice_new0 (EmpathyImportAccountData); data->settings = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c index ad44d2122..7f46cb4f1 100644 --- a/src/empathy-new-chatroom-dialog.c +++ b/src/empathy-new-chatroom-dialog.c @@ -26,6 +26,7 @@ #include #include +#include #include "empathy-account-chooser.h" #include "empathy-gsettings.h" @@ -114,7 +115,7 @@ new_chatroom_dialog_join (EmpathyNewChatroomDialog *self) account_chooser = EMPATHY_ACCOUNT_CHOOSER (self->priv->account_chooser); account = empathy_account_chooser_get_account (account_chooser); - if (!EMP_STR_EMPTY (server)) + if (!TPAW_STR_EMPTY (server)) room_name = g_strconcat (room, "@", server, NULL); else room_name = g_strdup (room); @@ -289,7 +290,7 @@ update_join_button_sensitivity (EmpathyNewChatroomDialog *self) room = gtk_entry_get_text (GTK_ENTRY (self->priv->entry_room)); protocol = tp_account_get_protocol_name (self->priv->account); - if (EMP_STR_EMPTY (room)) + if (TPAW_STR_EMPTY (room)) goto out; if (!tp_strdiff (protocol, "irc") && diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c index 6d273cc03..2f71fa13d 100644 --- a/src/empathy-status-icon.c +++ b/src/empathy-status-icon.c @@ -83,7 +83,7 @@ status_icon_update_tooltip (EmpathyStatusIcon *icon) type = tp_account_manager_get_most_available_presence ( priv->account_manager, NULL, &msg); - if (!EMP_STR_EMPTY (msg)) { + if (!TPAW_STR_EMPTY (msg)) { gtk_status_icon_set_tooltip_text (priv->icon, msg); } else { -- cgit v1.2.3