diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-accounts-dialog.c | 2 | ||||
| -rw-r--r-- | src/empathy-chat-window.c | 2 | ||||
| -rw-r--r-- | src/empathy-event-manager.c | 2 | ||||
| -rw-r--r-- | src/empathy-new-chatroom-dialog.c | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index 984b55db7..cc68c1bc3 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -658,7 +658,7 @@ accounts_dialog_account_added_cb (EmpathyAccountManager *manager, * parameter for CM that have it. */ current_name = mc_account_get_display_name (account); mc_account_get_param_string (account, "account", &account_param); - if (!G_STR_EMPTY (account_param)) { + if (!EMP_STR_EMPTY (account_param)) { McProfile *profile; const gchar *profile_name; gchar *new_name; diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index f032bbdab..0ce90ac4a 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -1556,7 +1556,7 @@ empathy_chat_window_find_chat (McAccount *account, GList *l; g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL); - g_return_val_if_fail (!G_STR_EMPTY (id), NULL); + g_return_val_if_fail (!EMP_STR_EMPTY (id), NULL); for (l = chat_windows; l; l = l->next) { EmpathyChatWindowPriv *priv; diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index f5ef3e2e2..8527a16fe 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -541,7 +541,7 @@ event_manager_pendings_changed_cb (EmpathyContactList *list, g_string_printf (str, _("Subscription requested by %s"), empathy_contact_get_name (contact)); - if (!G_STR_EMPTY (message)) + if (!EMP_STR_EMPTY (message)) g_string_append_printf (str, _("\nMessage: %s"), message); event_manager_add (manager, contact, GTK_STOCK_DIALOG_QUESTION, str->str, diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c index 9c9a9a4cd..0d2452b65 100644 --- a/src/empathy-new-chatroom-dialog.c +++ b/src/empathy-new-chatroom-dialog.c @@ -332,7 +332,7 @@ new_chatroom_dialog_update_widgets (EmpathyNewChatroomDialog *dialog) } room = gtk_entry_get_text (GTK_ENTRY (dialog->entry_room)); - gtk_widget_set_sensitive (dialog->button_join, !G_STR_EMPTY (room)); + gtk_widget_set_sensitive (dialog->button_join, !EMP_STR_EMPTY (room)); /* Final set up of the dialog */ gtk_widget_grab_focus (dialog->entry_room); @@ -500,7 +500,7 @@ new_chatroom_dialog_join (EmpathyNewChatroomDialog *dialog) account_chooser = EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser); account = empathy_account_chooser_get_account (account_chooser); - if (!G_STR_EMPTY (server)) { + if (!EMP_STR_EMPTY (server)) { room_name = g_strconcat (room, "@", server, NULL); } else { room_name = g_strdup (room); @@ -520,7 +520,7 @@ new_chatroom_dialog_entry_changed_cb (GtkWidget *entry, const gchar *room; room = gtk_entry_get_text (GTK_ENTRY (dialog->entry_room)); - gtk_widget_set_sensitive (dialog->button_join, !G_STR_EMPTY (room)); + gtk_widget_set_sensitive (dialog->button_join, !EMP_STR_EMPTY (room)); /* FIXME: Select the room in the list */ } } |