aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libempathy-gtk/empathy-account-widget-jabber.ui105
-rw-r--r--libempathy-gtk/empathy-account-widget.c35
-rw-r--r--libempathy-gtk/empathy-protocol-chooser.c15
-rw-r--r--libempathy/empathy-utils.c1
4 files changed, 0 insertions, 156 deletions
diff --git a/libempathy-gtk/empathy-account-widget-jabber.ui b/libempathy-gtk/empathy-account-widget-jabber.ui
index d17d0d7e0..3136f51b4 100644
--- a/libempathy-gtk/empathy-account-widget-jabber.ui
+++ b/libempathy-gtk/empathy-account-widget-jabber.ui
@@ -132,20 +132,6 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho
<property name="position">2</property>
</packing>
</child>
- <child>
- <object class="GtkLabel" id="label_username_ovi_example">
- <property name="xalign">0</property>
- <property name="xpad">3</property>
- <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; alice</property>
- <property name="use_markup">True</property>
- <attributes>
- <attribute name="scale" value="0.800000"/>
- </attributes>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -705,95 +691,4 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
</packing>
</child>
</object>
- <object class="GtkVBox" id="vbox_ovi_simple">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="label_id_ovi_simple">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">What is your Ovi username?</property>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment_simple_ovi_id">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xscale">0.34999999403953552</property>
- <property name="yscale">0.34999999403953552</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">3</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkVBox" id="vbox3">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkEntry" id="entry_id_ovi_simple">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_ovi_example">
- <property name="visible">True</property>
- <property name="xalign">0.10000000149011612</property>
- <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; alice</property>
- <property name="use_markup">True</property>
- <attributes>
- <attribute name="scale" value="0.800000"/>
- </attributes>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_password_ovi_simple">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="ypad">6</property>
- <property name="label" translatable="yes">What is your Ovi password?</property>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xscale">0.34999999403953552</property>
- <property name="yscale">0.5</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkEntry" id="entry_password_ovi_simple">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
-
</interface>
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 5625f95dc..d96de2b34 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -59,7 +59,6 @@ typedef enum
NO_SERVICE = 0,
GTALK_SERVICE,
FACEBOOK_SERVICE,
- OVI_SERVICE,
N_SERVICES
} Service;
@@ -73,7 +72,6 @@ static ServiceInfo services_infos[N_SERVICES] = {
{ "label_username_example", TRUE },
{ "label_username_g_example", TRUE },
{ "label_username_f_example", FALSE },
- { "label_username_ovi_example", FALSE },
};
typedef struct {
@@ -1355,9 +1353,6 @@ account_widget_get_service (EmpathyAccountWidget *self)
!tp_strdiff (service, "facebook"))
return FACEBOOK_SERVICE;
- if (!tp_strdiff (service, "ovi-chat"))
- return OVI_SERVICE;
-
return NO_SERVICE;
}
@@ -1437,22 +1432,6 @@ account_widget_build_jabber (EmpathyAccountWidget *self,
self->ui_details->default_focus = g_strdup ("entry_id_fb_simple");
}
- else if (priv->simple && service == OVI_SERVICE)
- {
- /* Simple widget for Ovi */
- self->ui_details->gui = empathy_builder_get_file (filename,
- "vbox_ovi_simple", &self->ui_details->widget,
- "entry_id_ovi_simple", &entry_id,
- NULL);
-
- empathy_account_widget_handle_params (self,
- "entry_password_ovi_simple", "password",
- NULL);
-
- setup_id_widget_with_suffix (self, entry_id, "@ovi.com");
-
- self->ui_details->default_focus = g_strdup ("entry_id_ovi_simple");
- }
else
{
ServiceInfo info = services_infos[service];
@@ -1489,12 +1468,6 @@ account_widget_build_jabber (EmpathyAccountWidget *self,
* "@chat.facebook.com" part */
setup_id_widget_with_suffix (self, entry_id, "@chat.facebook.com");
}
- else if (service == OVI_SERVICE)
- {
- gtk_label_set_label (GTK_LABEL (label_id), _("Username:"));
-
- setup_id_widget_with_suffix (self, entry_id, "@ovi.com");
- }
else
{
empathy_account_widget_setup_widget (self, entry_id, "account");
@@ -2427,14 +2400,6 @@ empathy_account_widget_get_default_display_name (EmpathyAccountWidget *self)
default_display_name = g_strdup_printf ("Facebook (%s)", tmp);
g_free (tmp);
}
- else if (service == OVI_SERVICE)
- {
- gchar *tmp;
-
- tmp = remove_jid_suffix (self, login_id);
- default_display_name = g_strdup_printf ("Ovi (%s)", tmp);
- g_free (tmp);
- }
else
{
default_display_name = g_strdup (login_id);
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index c126c2f80..689f6a28a 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -258,16 +258,6 @@ protocol_choosers_add_cm (EmpathyProtocolChooser *chooser,
COL_PROTOCOL_NAME, proto->name,
COL_SERVICE, "facebook",
-1);
-
- display_name = empathy_service_name_to_display_name ("ovi-chat");
- gtk_list_store_insert_with_values (priv->store,
- NULL, 0,
- COL_ICON, "im-ovi",
- COL_LABEL, display_name,
- COL_CM, cm,
- COL_PROTOCOL_NAME, proto->name,
- COL_SERVICE, "ovi-chat",
- -1);
}
g_free (icon_name);
@@ -618,11 +608,6 @@ empathy_protocol_chooser_create_account_settings (EmpathyProtocolChooser *self)
empathy_account_settings_set_string (settings, "server",
"chat.facebook.com");
}
- else if (!tp_strdiff (service, "ovi-chat"))
- {
- empathy_account_settings_set_icon_name_async (settings, "im-ovi",
- NULL, NULL);
- }
g_object_unref (cm);
g_free (service);
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 6f2fc4113..6bbd53f86 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -576,7 +576,6 @@ empathy_service_name_to_display_name (const gchar *service_name)
} names[] = {
{ "google-talk", N_("Google Talk"), FALSE },
{ "facebook", N_("Facebook Chat"), TRUE },
- { "ovi-chat", "Ovi", FALSE },
{ NULL, NULL }
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 10:27:13 +0800