Commit 17ae7af6 authored by Jonathan Tellier's avatar Jonathan Tellier Committed by Sjoerd Simons

Fix errors revealed by make check

- Added missing files in po/POTFILES.in
- Fixed style
parent adc79c5d
......@@ -1190,7 +1190,7 @@ do_constructed (GObject *obj)
G_CALLBACK (account_widget_apply_clicked_cb),
self);
gtk_widget_show_all (hbox);
account_widget_set_control_buttons_sensitivity(self, FALSE);
account_widget_set_control_buttons_sensitivity (self, FALSE);
}
account = empathy_account_settings_get_account (priv->settings);
......
......@@ -59,7 +59,7 @@
typedef struct
{
GtkListStore *store;
gboolean dispose_run;
EmpathyConnectionManagers *cms;
......
......@@ -76,6 +76,7 @@ src/empathy-event-manager.c
src/empathy-ft-manager.c
[type: gettext/glade]src/empathy-ft-manager.ui
src/empathy-import-dialog.c
src/empathy-import-widget.c
[type: gettext/glade]src/empathy-import-dialog.ui
src/empathy-import-widget.c
src/empathy-main-window.c
......
......@@ -390,7 +390,7 @@ account_assistant_finish_enter_or_create_page (EmpathyAccountAssistant *self,
gboolean is_enter)
{
EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
if (is_enter)
{
gtk_label_set_label (GTK_LABEL (priv->first_label),
......@@ -426,10 +426,10 @@ account_assistant_finish_enter_or_create_page (EmpathyAccountAssistant *self,
priv->enter_or_create_page,
_("Enter the details for the new account"));
}
g_signal_connect (priv->chooser, "changed",
G_CALLBACK (account_assistant_protocol_changed_cb), self);
/* trigger show the first account widget */
account_assistant_protocol_changed_cb (GTK_COMBO_BOX (priv->chooser), self);
}
......@@ -568,7 +568,7 @@ account_assistant_build_introduction_page (EmpathyAccountAssistant *self)
str = _("Yes, I'll enter my account details now");
if (radio == NULL)
{
{
radio = gtk_radio_button_new_with_label (NULL, str);
w = radio;
}
......@@ -772,7 +772,7 @@ impl_signal_prepare (GtkAssistant *assistant,
gint current_idx;
current_idx = gtk_assistant_get_current_page (assistant);
if (current_idx >= PAGE_ENTER_CREATE)
{
if (!priv->enter_create_forward)
......
......@@ -243,7 +243,7 @@ account_dialog_create_settings_widget (EmpathyAccountsDialog *dialog,
empathy_account_settings_get_protocol (settings));
accounts_dialog_update_name_label (dialog,
empathy_account_settings_get_display_name(settings));
empathy_account_settings_get_display_name (settings));
g_free (icon_name);
}
......@@ -1061,7 +1061,7 @@ accounts_dialog_account_changed_cb (EmpathyAccountManager *manager,
if (settings == selected_settings)
accounts_dialog_update_name_label (dialog,
empathy_account_settings_get_display_name(settings));
empathy_account_settings_get_display_name (settings));
if (settings)
g_object_unref (settings);
......
......@@ -61,14 +61,14 @@ import_dialog_add_import_widget (EmpathyImportDialog *self)
GtkWidget *widget, *area;
area = gtk_dialog_get_content_area (GTK_DIALOG (self));
iw = empathy_import_widget_new (EMPATHY_IMPORT_APPLICATION_ALL);
widget = empathy_import_widget_get_widget (iw);
gtk_box_pack_start (GTK_BOX (area), widget, FALSE, FALSE, 0);
gtk_widget_show (widget);
priv->iw = iw;
gtk_dialog_add_buttons (GTK_DIALOG (self), GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
}
......
......@@ -85,7 +85,7 @@ import_widget_account_id_in_list (GList *accounts,
parameters = empathy_account_get_parameters (account);
value = g_hash_table_lookup ((GHashTable *)parameters, "account");
value = g_hash_table_lookup ((GHashTable *) parameters, "account");
if (value == NULL)
continue;
......@@ -438,7 +438,7 @@ do_constructed (GObject *obj)
gchar *filename;
priv->accounts = empathy_import_accounts_load (priv->app_id);
filename = empathy_file_lookup ("empathy-import-dialog.ui", "src");
gui = empathy_builder_get_file (filename,
"widget_vbox", &priv->vbox,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment