aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2011-06-01 02:20:21 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2011-06-01 02:20:21 +0800
commit5d2b0e7740e6929451c630dc072f0ac199f173c3 (patch)
tree50cc619004ed710d6b6145fee219ca61b7e3e649
parentecfcc6cb011230531ef4fe527f4ff045217f714a (diff)
parentb0bd73cfa5658971f12c86a1f3711cab663a3f40 (diff)
downloadgsoc2013-empathy-5d2b0e7740e6929451c630dc072f0ac199f173c3.tar
gsoc2013-empathy-5d2b0e7740e6929451c630dc072f0ac199f173c3.tar.gz
gsoc2013-empathy-5d2b0e7740e6929451c630dc072f0ac199f173c3.tar.bz2
gsoc2013-empathy-5d2b0e7740e6929451c630dc072f0ac199f173c3.tar.lz
gsoc2013-empathy-5d2b0e7740e6929451c630dc072f0ac199f173c3.tar.xz
gsoc2013-empathy-5d2b0e7740e6929451c630dc072f0ac199f173c3.tar.zst
gsoc2013-empathy-5d2b0e7740e6929451c630dc072f0ac199f173c3.zip
Merge branch 'speedup-protocol-chooser'
-rw-r--r--libempathy-gtk/empathy-account-chooser.c13
-rw-r--r--libempathy-gtk/empathy-chat.c4
2 files changed, 9 insertions, 8 deletions
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index 2b0478e79..2df4a153a 100644
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -609,7 +609,7 @@ account_chooser_setup (EmpathyAccountChooser *chooser)
gtk_cell_layout_clear (GTK_CELL_LAYOUT (combobox));
store = gtk_list_store_new (COL_ACCOUNT_COUNT,
- G_TYPE_STRING, /* Image */
+ GDK_TYPE_PIXBUF, /* Image */
G_TYPE_STRING, /* Name */
G_TYPE_BOOLEAN, /* Enabled */
G_TYPE_UINT, /* Row type */
@@ -625,10 +625,9 @@ account_chooser_setup (EmpathyAccountChooser *chooser)
renderer = gtk_cell_renderer_pixbuf_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox), renderer, FALSE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combobox), renderer,
- "icon-name", COL_ACCOUNT_IMAGE,
+ "pixbuf", COL_ACCOUNT_IMAGE,
"sensitive", COL_ACCOUNT_ENABLED,
NULL);
- g_object_set (renderer, "stock-size", GTK_ICON_SIZE_BUTTON, NULL);
renderer = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox), renderer, TRUE);
@@ -763,6 +762,7 @@ account_chooser_filter_ready_cb (gboolean is_enabled,
GtkListStore *store;
GtkComboBox *combobox;
const gchar *icon_name;
+ GdkPixbuf *pixbuf;
chooser = fr_data->chooser;
priv = GET_PRIV (chooser);
@@ -772,13 +772,18 @@ account_chooser_filter_ready_cb (gboolean is_enabled,
store = GTK_LIST_STORE (gtk_combo_box_get_model (combobox));
icon_name = tp_account_get_icon_name (account);
+ pixbuf = empathy_pixbuf_from_icon_name (icon_name,
+ GTK_ICON_SIZE_BUTTON);
gtk_list_store_set (store, iter,
- COL_ACCOUNT_IMAGE, icon_name,
+ COL_ACCOUNT_IMAGE, pixbuf,
COL_ACCOUNT_TEXT, tp_account_get_display_name (account),
COL_ACCOUNT_ENABLED, is_enabled,
-1);
+ if (pixbuf != NULL)
+ g_object_unref (pixbuf);
+
/* set first connected account as active account */
if (priv->account_manually_set == FALSE &&
priv->set_active_item == FALSE && is_enabled) {
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 246cc216b..f026bbc8e 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -390,10 +390,6 @@ chat_composing_start (EmpathyChat *chat)
static void
chat_composing_stop (EmpathyChat *chat)
{
- EmpathyChatPriv *priv;
-
- priv = GET_PRIV (chat);
-
chat_composing_remove_timeout (chat);
set_chat_state (chat, TP_CHANNEL_CHAT_STATE_ACTIVE);
}