diff options
author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-06-07 00:51:28 +0800 |
---|---|---|
committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-06-07 00:51:28 +0800 |
commit | 4e9ac0de60f83b2529172eb6edbddb220d73d577 (patch) | |
tree | 05de93c45fad3d000b4e90c73a30dd5a26975c71 | |
parent | dbafad87cd6cc02cbf703e74b97c7277bbea35a9 (diff) | |
parent | 77d952456357871efc0adbfeb46d5e3917557757 (diff) | |
download | gsoc2013-empathy-4e9ac0de60f83b2529172eb6edbddb220d73d577.tar gsoc2013-empathy-4e9ac0de60f83b2529172eb6edbddb220d73d577.tar.gz gsoc2013-empathy-4e9ac0de60f83b2529172eb6edbddb220d73d577.tar.bz2 gsoc2013-empathy-4e9ac0de60f83b2529172eb6edbddb220d73d577.tar.lz gsoc2013-empathy-4e9ac0de60f83b2529172eb6edbddb220d73d577.tar.xz gsoc2013-empathy-4e9ac0de60f83b2529172eb6edbddb220d73d577.tar.zst gsoc2013-empathy-4e9ac0de60f83b2529172eb6edbddb220d73d577.zip |
Merge branch 'empathy-skype' into debian
-rw-r--r-- | libempathy-gtk/empathy-account-widget-skype.c | 6 | ||||
-rw-r--r-- | libempathy-gtk/empathy-account-widget-skype.ui | 51 | ||||
-rw-r--r-- | libempathy-gtk/empathy-log-window.c | 23 |
3 files changed, 24 insertions, 56 deletions
diff --git a/libempathy-gtk/empathy-account-widget-skype.c b/libempathy-gtk/empathy-account-widget-skype.c index fb56ac561..c47dab5ed 100644 --- a/libempathy-gtk/empathy-account-widget-skype.c +++ b/libempathy-gtk/empathy-account-widget-skype.c @@ -537,7 +537,6 @@ account_widget_build_skype_get_privacy_settings_cb (TpProxy *cm, static const char *widgets[] = { "allow-text-chats-from", "allow-skype-calls-from", - "allow-video-from", "show-my-avatar-to", "show-my-web-status", "show-i-have-video-to" @@ -741,11 +740,6 @@ account_widget_skype_privacy_settings (GtkWidget *button, EMP_PRIVACY_SETTING_CONTACTS, -1); account_widget_build_skype_setup_combo (self, gui, - "allow-video-from", "AllowVideoFrom", - EMP_PRIVACY_SETTING_ANYONE, - EMP_PRIVACY_SETTING_CONTACTS, - -1); - account_widget_build_skype_setup_combo (self, gui, "show-i-have-video-to", "ShowIHaveVideoTo", EMP_PRIVACY_SETTING_ANYONE, EMP_PRIVACY_SETTING_CONTACTS, diff --git a/libempathy-gtk/empathy-account-widget-skype.ui b/libempathy-gtk/empathy-account-widget-skype.ui index dbea877da..c59eeddd3 100644 --- a/libempathy-gtk/empathy-account-widget-skype.ui +++ b/libempathy-gtk/empathy-account-widget-skype.ui @@ -139,7 +139,7 @@ Get one at <a href="http://www.skype.com/go/register">Skype.com</a>< <child> <object class="GtkTable" id="table1"> <property name="visible">True</property> - <property name="n_rows">5</property> + <property name="n_rows">4</property> <property name="n_columns">2</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> @@ -172,21 +172,6 @@ Get one at <a href="http://www.skype.com/go/register">Skype.com</a>< </packing> </child> <child> - <object class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Allow video _from:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">allow-video-from</property> - </object> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="xalign">0</property> @@ -195,8 +180,8 @@ Get one at <a href="http://www.skype.com/go/register">Skype.com</a>< <property name="mnemonic_widget">show-my-avatar-to</property> </object> <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> @@ -234,24 +219,6 @@ Get one at <a href="http://www.skype.com/go/register">Skype.com</a>< </packing> </child> <child> - <object class="GtkComboBox" id="allow-video-from"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext4"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - </packing> - </child> - <child> <object class="GtkComboBox" id="show-my-avatar-to"> <property name="visible">True</property> <child> @@ -264,8 +231,8 @@ Get one at <a href="http://www.skype.com/go/register">Skype.com</a>< <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> </packing> </child> <child> @@ -277,8 +244,8 @@ Get one at <a href="http://www.skype.com/go/register">Skype.com</a>< <property name="mnemonic_widget">show-i-have-video-to</property> </object> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> @@ -296,8 +263,8 @@ Get one at <a href="http://www.skype.com/go/register">Skype.com</a>< <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> </packing> </child> </object> diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index 9ad627f99..d2f0a65b5 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -163,7 +163,6 @@ enum COL_WHAT_SUBTYPE, COL_WHAT_TEXT, COL_WHAT_ICON, - COL_WHAT_EXPANDER, COL_WHAT_COUNT }; @@ -745,7 +744,7 @@ get_parent_iter_for_message (TplEvent *event, pretty_date = g_date_time_format (date, C_("A date with the time", "%A, %e %B %Y %X")); - body = g_strdup_printf (_("Chat with %s"), + body = g_markup_printf_escaped (_("Chat with %s"), get_contact_alias_for_message (message)); gtk_tree_store_append (store, &iter, NULL); @@ -816,14 +815,16 @@ log_window_append_chat_message (TplEvent *event, if (tpl_text_event_get_message_type (TPL_TEXT_EVENT (event)) == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION) { - body = g_strdup_printf ("* %s %s", + /* Translators: this is an emote: '* Danielle waves' */ + body = g_markup_printf_escaped (_("<i>* %s %s</i>"), tpl_entity_get_alias (tpl_event_get_sender (event)), empathy_message_get_body (message)); } else { - body = g_strdup_printf ( - C_("First is a contact, second is what was said", "%s: %s"), + /* Translators: this is a message: 'Danielle: hello' + * The string in bold is the sender's name */ + body = g_markup_printf_escaped (_("<b>%s:</b> %s"), tpl_entity_get_alias (tpl_event_get_sender (event)), empathy_message_get_body (message)); } @@ -1909,7 +1910,7 @@ log_window_events_setup (EmpathyLogWindow *window) cell = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_start (column, cell, TRUE); gtk_tree_view_column_add_attribute (column, cell, - "text", COL_EVENTS_TEXT); + "markup", COL_EVENTS_TEXT); cell = gtk_cell_renderer_text_new (); g_object_set (cell, "xalign", 1.0, NULL); @@ -1927,6 +1928,8 @@ log_window_events_setup (EmpathyLogWindow *window) COL_EVENTS_TS, GTK_SORT_ASCENDING); + gtk_tree_view_set_enable_search (view, FALSE); + g_object_unref (store); } @@ -1988,6 +1991,8 @@ log_window_who_setup (EmpathyLogWindow *window) COL_WHO_NAME, sort_by_name, NULL, NULL); + gtk_tree_view_set_search_column (view, COL_WHO_NAME); + /* set up signals */ g_signal_connect (selection, "changed", G_CALLBACK (log_window_who_changed_cb), window); @@ -2187,6 +2192,8 @@ log_window_when_setup (EmpathyLogWindow *window) COL_WHEN_DATE, sort_by_date, NULL, NULL); + gtk_tree_view_set_search_column (view, COL_WHEN_TEXT); + /* set up signals */ g_signal_connect (selection, "changed", G_CALLBACK (log_window_when_changed_cb), @@ -2294,8 +2301,7 @@ log_window_what_setup (EmpathyLogWindow *window) G_TYPE_INT, /* history type */ G_TYPE_INT, /* history subtype */ G_TYPE_STRING, /* stringified history type */ - G_TYPE_STRING, /* icon */ - G_TYPE_BOOLEAN); /* expander (hidden) */ + G_TYPE_STRING); /* icon */ model = GTK_TREE_MODEL (store); sortable = GTK_TREE_SORTABLE (store); @@ -2318,6 +2324,7 @@ log_window_what_setup (EmpathyLogWindow *window) "text", COL_WHAT_TEXT); gtk_tree_view_append_column (view, column); + gtk_tree_view_set_search_column (view, COL_WHAT_TEXT); /* set up treeview properties */ gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE); |