diff options
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/gossip-contact-list-store.c | 8 | ||||
| -rw-r--r-- | libempathy-gtk/gossip-contact-list-view.c | 25 | ||||
| -rw-r--r-- | libempathy-gtk/gossip-new-chatroom-dialog.c | 6 |
3 files changed, 9 insertions, 30 deletions
diff --git a/libempathy-gtk/gossip-contact-list-store.c b/libempathy-gtk/gossip-contact-list-store.c index 816102b2d..c8a43ed5a 100644 --- a/libempathy-gtk/gossip-contact-list-store.c +++ b/libempathy-gtk/gossip-contact-list-store.c @@ -1164,10 +1164,10 @@ contact_list_store_get_group_foreach (GtkTreeModel *model, static void contact_list_store_get_group (GossipContactListStore *store, - const gchar *name, - GtkTreeIter *iter_group_to_set, - GtkTreeIter *iter_separator_to_set, - gboolean *created) + const gchar *name, + GtkTreeIter *iter_group_to_set, + GtkTreeIter *iter_separator_to_set, + gboolean *created) { GossipContactListStorePriv *priv; GtkTreeModel *model; diff --git a/libempathy-gtk/gossip-contact-list-view.c b/libempathy-gtk/gossip-contact-list-view.c index b9ee7063f..3cad7821d 100644 --- a/libempathy-gtk/gossip-contact-list-view.c +++ b/libempathy-gtk/gossip-contact-list-view.c @@ -1079,32 +1079,9 @@ contact_list_view_cell_set_background (GossipContactListView *view, NULL); } } else { -#if 0 - gint color_sum_normal; - gint color_sum_selected; - - color = style->base[GTK_STATE_SELECTED]; - color_sum_normal = color.red+color.green+color.blue; - color = style->base[GTK_STATE_NORMAL]; - color_sum_selected = color.red+color.green+color.blue; - color = style->text_aa[GTK_STATE_INSENSITIVE]; - - if (color_sum_normal < color_sum_selected) { - /* Found a light theme */ - color.red = (color.red + (style->white).red) / 2; - color.green = (color.green + (style->white).green) / 2; - color.blue = (color.blue + (style->white).blue) / 2; - } else { - /* Found a dark theme */ - color.red = (color.red + (style->black).red) / 2; - color.green = (color.green + (style->black).green) / 2; - color.blue = (color.blue + (style->black).blue) / 2; - } - g_object_set (cell, - "cell-background-gdk", &color, + "cell-background-gdk", NULL, NULL); -#endif } } diff --git a/libempathy-gtk/gossip-new-chatroom-dialog.c b/libempathy-gtk/gossip-new-chatroom-dialog.c index 33c6f723e..838f90a74 100644 --- a/libempathy-gtk/gossip-new-chatroom-dialog.c +++ b/libempathy-gtk/gossip-new-chatroom-dialog.c @@ -607,7 +607,7 @@ new_chatroom_dialog_join (GossipNewChatroomDialog *dialog) TpConn *tp_conn; GList *chatrooms, *l; const gchar *room; - const gchar *server; + const gchar *server = NULL; gchar *room_name = NULL; const gchar *room_names[2] = {NULL, NULL}; @@ -621,7 +621,9 @@ new_chatroom_dialog_join (GossipNewChatroomDialog *dialog) } room = gtk_entry_get_text (GTK_ENTRY (dialog->entry_room)); - server = gtk_entry_get_text (GTK_ENTRY (dialog->entry_server)); + if (GTK_WIDGET_VISIBLE (dialog->hbox_server)) { + server = gtk_entry_get_text (GTK_ENTRY (dialog->entry_server)); + } account_chooser = GOSSIP_ACCOUNT_CHOOSER (dialog->account_chooser); account = gossip_account_chooser_get_account (account_chooser); mc = gossip_mission_control_new (); |