diff options
| author | Cosimo Cecchi <cosimo.cecchi@collabora.co.uk> | 2009-08-01 16:33:18 +0800 |
|---|---|---|
| committer | Cosimo Cecchi <cosimo.cecchi@collabora.co.uk> | 2009-08-01 16:33:18 +0800 |
| commit | 8dcbfe163b293dda9bc0481e846db3bdd4e0ea98 (patch) | |
| tree | ccd09bc3f224492e9d8c360c0b903e11f8b593ab /src | |
| parent | 3e8f25168aadd741ecc0fe8da4d1847eece5ff83 (diff) | |
| parent | c62744a26535b8778e6053e5d7c544ca9ccc1e5f (diff) | |
| download | gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar.gz gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar.bz2 gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar.lz gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar.xz gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar.zst gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.zip | |
Merge branch 'master' into mc5
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-call-window.c | 6 | ||||
| -rw-r--r-- | src/empathy-chat-window.c | 7 | ||||
| -rw-r--r-- | src/empathy.c | 2 |
3 files changed, 8 insertions, 7 deletions
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); diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 47ef37c42..822f22826 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -999,12 +999,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 ("<span color=\"%s\">%s</span>", - "red", - empathy_chat_get_name (chat)); + markup = g_markup_printf_escaped ("<span color=\"red\">%s</span>", + 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); diff --git a/src/empathy.c b/src/empathy.c index 956b05e5f..637470773 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -621,7 +621,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; |