Renamed G_STR_EMPTY to EMP_STR_EMPTY.

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

svn path=/trunk/; revision=2249

10 files changed, 26 insertions, 26 deletions

diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 066dac21f..b48d19e53 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -51,7 +51,7 @@ account_widget_entry_focus_cb (GtkWidget     *widget,
 	str = gtk_entry_get_text (GTK_ENTRY (widget));
 	param_name = g_object_get_data (G_OBJECT (widget), "param_name");
 
-	if (G_STR_EMPTY (str)) {
+	if (EMP_STR_EMPTY (str)) {
 		gchar *value = NULL;
 
 		mc_account_unset_param (account, param_name);
@@ -154,7 +154,7 @@ account_widget_password_changed_cb (GtkWidget *entry,
 	const gchar *str;
 
 	str = gtk_entry_get_text (GTK_ENTRY (entry));
-	gtk_widget_set_sensitive (button, !G_STR_EMPTY (str));
+	gtk_widget_set_sensitive (button, !EMP_STR_EMPTY (str));
 }
 
 static void  
@@ -445,7 +445,7 @@ empathy_account_widget_add_forget_button (McAccount   *account,
 	entry_password = glade_xml_get_widget (glade, entry);
 
 	mc_account_get_param_string (account, "password", &password);
-	gtk_widget_set_sensitive (button_forget, !G_STR_EMPTY (password));
+	gtk_widget_set_sensitive (button_forget, !EMP_STR_EMPTY (password));
 	g_free (password);
 
 	g_signal_connect (button_forget, "clicked",
diff --git a/libempathy-gtk/empathy-chat-text-view.c b/libempathy-gtk/empathy-chat-text-view.c
index a3d14a07d..afd158f57 100644
--- a/libempathy-gtk/empathy-chat-text-view.c
+++ b/libempathy-gtk/empathy-chat-text-view.c
@@ -323,7 +323,7 @@ chat_text_view_populate_popup (EmpathyChatTextView *view,
 						    &start, &end, FALSE);
 	    }
 	
-	if (G_STR_EMPTY (str)) {
+	if (EMP_STR_EMPTY (str)) {
 		g_free (str);
 		return;
 	}
@@ -762,7 +762,7 @@ chat_text_view_append_event (EmpathyChatView *view,
 
 
 	g_return_if_fail (EMPATHY_IS_CHAT_TEXT_VIEW (view));
-	g_return_if_fail (!G_STR_EMPTY (str));
+	g_return_if_fail (!EMP_STR_EMPTY (str));
 
 	bottom = chat_text_view_is_scrolled_down (text_view);
 	chat_text_view_maybe_trim_buffer (EMPATHY_CHAT_TEXT_VIEW (view));
@@ -856,7 +856,7 @@ chat_text_view_find_previous (EmpathyChatView *view,
 	
 	buffer = priv->buffer;
 	
-	if (G_STR_EMPTY (search_criteria)) {
+	if (EMP_STR_EMPTY (search_criteria)) {
 		if (priv->find_mark_previous) {
 			gtk_text_buffer_get_start_iter (buffer, &iter_at_mark);
 			
@@ -971,7 +971,7 @@ chat_text_view_find_next (EmpathyChatView *view,
 	
 	buffer = priv->buffer;
 	
-	if (G_STR_EMPTY (search_criteria)) {
+	if (EMP_STR_EMPTY (search_criteria)) {
 		if (priv->find_mark_next) {
 			gtk_text_buffer_get_start_iter (buffer, &iter_at_mark);
 			
@@ -1142,7 +1142,7 @@ chat_text_view_highlight (EmpathyChatView *view,
 					    &iter_start,
 					    &iter_end);
 	
-	if (G_STR_EMPTY (text)) {
+	if (EMP_STR_EMPTY (text)) {
 		return;
 	}
 	
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index bb7db87da..453209ee3 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -352,7 +352,7 @@ chat_send (EmpathyChat  *chat,
 
 	priv = GET_PRIV (chat);
 
-	if (G_STR_EMPTY (msg)) {
+	if (EMP_STR_EMPTY (msg)) {
 		return;
 	}
 
@@ -543,7 +543,7 @@ chat_property_changed_cb (EmpathyTpChat *tp_chat,
 		priv->subject = g_value_dup_string (value);
 		g_object_notify (G_OBJECT (chat), "subject");
 
-		if (G_STR_EMPTY (priv->subject)) {
+		if (EMP_STR_EMPTY (priv->subject)) {
 			gtk_widget_hide (priv->hbox_topic);
 		} else {
 			gtk_label_set_text (GTK_LABEL (priv->label_topic), priv->subject);
@@ -552,7 +552,7 @@ chat_property_changed_cb (EmpathyTpChat *tp_chat,
 		if (priv->block_events_timeout_id == 0) {
 			gchar *str;
 
-			if (!G_STR_EMPTY (priv->subject)) {
+			if (!EMP_STR_EMPTY (priv->subject)) {
 				str = g_strdup_printf (_("Topic set to: %s"), priv->subject);
 			} else {
 				str = g_strdup (_("No topic defined"));
@@ -987,7 +987,7 @@ chat_input_populate_popup_cb (GtkTextView *view,
 	/* Add the Send menu item. */
 	gtk_text_buffer_get_bounds (buffer, &start, &end);
 	str = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-	if (!G_STR_EMPTY (str)) {
+	if (!EMP_STR_EMPTY (str)) {
 		item = gtk_menu_item_new_with_mnemonic (_("_Send"));
 		g_signal_connect (G_OBJECT (item), "activate",
 				  G_CALLBACK (chat_text_send_cb), chat);
@@ -1012,7 +1012,7 @@ chat_input_populate_popup_cb (GtkTextView *view,
 		str = gtk_text_buffer_get_text (buffer,
 						&start, &end, FALSE);
 	}
-	if (!G_STR_EMPTY (str)) {
+	if (!EMP_STR_EMPTY (str)) {
 		chat_spell = chat_spell_new (chat, str, start, end);
 		g_object_set_data_full (G_OBJECT (menu),
 					"chat_spell", chat_spell,
diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c
index d4946e4a7..e7982f3aa 100644
--- a/libempathy-gtk/empathy-contact-list-store.c
+++ b/libempathy-gtk/empathy-contact-list-store.c
@@ -853,7 +853,7 @@ contact_list_store_add_contact (EmpathyContactListStore *store,
 
 	priv = GET_PRIV (store);
 	
-	if (G_STR_EMPTY (empathy_contact_get_name (contact)) ||
+	if (EMP_STR_EMPTY (empathy_contact_get_name (contact)) ||
 	    (!priv->show_offline && !empathy_contact_is_online (contact))) {
 		return;
 	}
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index 6dfb20eb9..0083102f2 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -792,7 +792,7 @@ contact_list_view_row_has_child_toggled_cb (GtkTreeModel          *model,
 			    EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
 			    -1);
 
-	if (!is_group || G_STR_EMPTY (name)) {
+	if (!is_group || EMP_STR_EMPTY (name)) {
 		g_free (name);
 		return;
 	}
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index b3fbe334b..07058e4bc 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -703,7 +703,7 @@ contact_widget_change_contact (EmpathyContactWidget *information)
       const gchar *id;
 
       id = gtk_entry_get_text (GTK_ENTRY (information->widget_id));
-      if (G_STR_EMPTY (id))
+      if (EMP_STR_EMPTY (id))
           return;
 
       contact = empathy_contact_factory_get_from_id (information->factory,
@@ -979,7 +979,7 @@ contact_widget_model_find_name (EmpathyContactWidget *information,
   GtkTreeModel *model;
   FindName data;
 
-  if (G_STR_EMPTY (name))
+  if (EMP_STR_EMPTY (name))
       return FALSE;
 
   data.information = information;
@@ -1091,7 +1091,7 @@ contact_widget_entry_group_changed_cb (GtkEditable *editable,
       gtk_widget_set_sensitive (GTK_WIDGET (information->button_group), FALSE);
   else
       gtk_widget_set_sensitive (GTK_WIDGET (information->button_group),
-          !G_STR_EMPTY (group));
+          !EMP_STR_EMPTY (group));
 }
 
 static void
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 5f704a3be..24633e565 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -290,7 +290,7 @@ log_window_entry_find_changed_cb (GtkWidget       *entry,
 
 	str = gtk_entry_get_text (GTK_ENTRY (window->entry_find));
 
-	is_sensitive &= !G_STR_EMPTY (str);
+	is_sensitive &= !EMP_STR_EMPTY (str);
 	is_sensitive &= 
 		!window->last_find || 
 		(window->last_find && strcmp (window->last_find, str) != 0);
@@ -400,7 +400,7 @@ log_window_find_populate (EmpathyLogWindow *window,
 
 	gtk_list_store_clear (store);
 
-	if (G_STR_EMPTY (search_criteria)) {
+	if (EMP_STR_EMPTY (search_criteria)) {
 		/* Just clear the search. */
 		return;
 	}
diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index d0d99bc3e..9127e2919 100644
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -175,7 +175,7 @@ new_message_dialog_response_cb (GtkWidget               *widget,
 
 	account = empathy_account_chooser_get_account (EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser));
 	id = gtk_entry_get_text (GTK_ENTRY (dialog->entry_id));
-	if (!account || G_STR_EMPTY (id)) {
+	if (!account || EMP_STR_EMPTY (id)) {
 		if (account) {
 			g_object_unref (account);
 		}
@@ -209,7 +209,7 @@ new_message_change_state_button_cb  (GtkEditable             *editable,
 	gboolean     sensitive;
 
 	id = gtk_entry_get_text (GTK_ENTRY (editable));
-	sensitive = !G_STR_EMPTY (id);
+	sensitive = !EMP_STR_EMPTY (id);
 	
 	gtk_widget_set_sensitive (dialog->button_chat, sensitive);
 	gtk_widget_set_sensitive (dialog->button_call, sensitive);
diff --git a/libempathy-gtk/empathy-smiley-manager.c b/libempathy-gtk/empathy-smiley-manager.c
index 451fc6937..ca8a770b2 100644
--- a/libempathy-gtk/empathy-smiley-manager.c
+++ b/libempathy-gtk/empathy-smiley-manager.c
@@ -242,8 +242,8 @@ empathy_smiley_manager_add (EmpathySmileyManager *manager,
 	va_list    var_args;
 
 	g_return_if_fail (EMPATHY_IS_SMILEY_MANAGER (manager));
-	g_return_if_fail (!G_STR_EMPTY (icon_name));
-	g_return_if_fail (!G_STR_EMPTY (first_str));
+	g_return_if_fail (!EMP_STR_EMPTY (icon_name));
+	g_return_if_fail (!EMP_STR_EMPTY (first_str));
 
 	smiley = empathy_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
 	if (smiley) {
@@ -264,7 +264,7 @@ empathy_smiley_manager_add_from_pixbuf (EmpathySmileyManager *manager,
 
 	g_return_if_fail (EMPATHY_IS_SMILEY_MANAGER (manager));
 	g_return_if_fail (GDK_IS_PIXBUF (smiley));
-	g_return_if_fail (!G_STR_EMPTY (first_str));
+	g_return_if_fail (!EMP_STR_EMPTY (first_str));
 
 	va_start (var_args, first_str);
 	smiley_manager_add_valist (manager, smiley, first_str, var_args);
diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index d615611a7..a67536fb4 100644
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -355,7 +355,7 @@ theme_manager_ensure_theme_exists (const gchar *name)
 {
 	gint i;
 
-	if (G_STR_EMPTY (name)) {
+	if (EMP_STR_EMPTY (name)) {
 		return FALSE;
 	}