Remove dead code and fix some coding style issues

diff --git a/libempathy-gtk/empathy-account-widget.h b/libempathy-gtk/empathy-account-widget.h
index f44edcc6af7ab1aa0ec319d5f5bb1972033136ee..415934a2d1557ce97d3fd0d1cc8b9ed671df3e57 100644 (file)
--- a/libempathy-gtk/empathy-account-widget.h
+++ b/libempathy-gtk/empathy-account-widget.h
@@ -61,9 +61,6 @@ GType empathy_account_widget_get_type (void);
 
 GtkWidget *empathy_account_widget_get_widget (EmpathyAccountWidget *widget);
 
-//EmpathyAccountWidget *empathy_account_widget_new_for_protocol (
-//    const char *protocol,
-//    EmpathyAccountSettings *settings);
 EmpathyAccountWidget * empathy_account_widget_new_for_protocol (
     const char *protocol,
     EmpathyAccountSettings *settings,

diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index ad96ba9218f0e48cb82dbda42f67b031d4740c5b..40f46e49e8374786a83fc4e6b529c197ed0ba1a8 100644 (file)
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -644,7 +644,6 @@ accounts_dialog_model_add_columns (EmpathyAccountsDialog *dialog)
 
   /* Account column */
   column = gtk_tree_view_column_new ();
-  //gtk_tree_view_column_set_title (column, _("Accounts"));
   gtk_tree_view_column_set_expand (column, TRUE);
   gtk_tree_view_append_column (view, column);
 
@@ -711,7 +710,6 @@ static void
 accounts_dialog_model_selection_changed (GtkTreeSelection *selection,
     EmpathyAccountsDialog *dialog)
 {
-//  EmpathyAccountsDialogPriv priv = GET_PRIV (dialog);
   EmpathyAccountSettings *settings;
   GtkTreeModel *model;
   GtkTreeIter   iter;
@@ -726,7 +724,7 @@ accounts_dialog_model_selection_changed (GtkTreeSelection *selection,
 
   accounts_dialog_update_settings (dialog, settings);
 
-  if (settings)
+  if (settings != NULL)
     g_object_unref (settings);
 }