From 4da463c098708dd0b52a82195bad5ac537a9197b Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 24 Jul 2009 13:18:06 +0200 Subject: Little coding style cleanup --- src/empathy-chat-window.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 8dcb68d2f..3e77553b3 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -1000,12 +1000,11 @@ chat_window_set_highlight_room_tab_label (EmpathyChat *chat) gchar *markup; GtkWidget *widget; - if (empathy_chat_is_room (chat) == FALSE) + if (!empathy_chat_is_room (chat)) return; - markup = g_markup_printf_escaped ("%s", - "red", - empathy_chat_get_name (chat)); + markup = g_markup_printf_escaped ("%s", + empathy_chat_get_name (chat)); widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-label"); gtk_label_set_markup (GTK_LABEL (widget), markup); -- cgit v1.2.3 From 1036277e3c369afe3a1fba9aeaf3552fcd5a20aa Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 24 Jul 2009 13:18:30 +0200 Subject: Do not have too complex code in var initialization. --- src/empathy-call-window.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 520a92821..bd958aada 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -1346,8 +1346,10 @@ empathy_call_window_connected (gpointer user_data) EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data); EmpathyCallWindowPriv *priv = GET_PRIV (self); EmpathyTpCall *call; - gboolean can_send_video = priv->video_input != NULL && priv->contact != NULL - && empathy_contact_can_voip_video (priv->contact); + gboolean can_send_video; + + can_send_video = priv->video_input != NULL && priv->contact != NULL && + empathy_contact_can_voip_video (priv->contact); g_object_get (priv->handler, "tp-call", &call, NULL); -- cgit v1.2.3 From e0f2c0a49153280c723a293f2dcda0dffd931ec2 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Thu, 30 Jul 2009 20:00:01 +0200 Subject: Change the name to Empathy IM Client, which is more recognizable --- src/empathy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/empathy.c b/src/empathy.c index 0754eb7ab..4ff0918fd 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -584,7 +584,7 @@ main (int argc, char *argv[]) empathy_init (); if (!gtk_init_with_args (&argc, &argv, - N_("- Empathy Instant Messenger"), + N_("- Empathy IM Client"), options, GETTEXT_PACKAGE, &error)) { g_warning ("Error in empathy init: %s", error->message); return EXIT_FAILURE; -- cgit v1.2.3