Merge branch 'gnome-3-8'

[empathy.git] / libempathy-gtk / empathy-account-widget.h

diff --git a/libempathy-gtk/empathy-account-widget.h b/libempathy-gtk/empathy-account-widget.h
index 5279d75f288104cd545cd716e10fe46d036ddddc..65de952c7be3fc6599b990e01a970fdc747f4ce5 100644 (file)
--- a/libempathy-gtk/empathy-account-widget.h
+++ b/libempathy-gtk/empathy-account-widget.h
@@ -26,7 +26,7 @@
 
 #include <gtk/gtk.h>
 
-#include <libempathy/empathy-account-settings.h>
+#include "empathy-account-settings.h"
 
 G_BEGIN_DECLS
 
@@ -46,7 +46,7 @@ typedef struct _EmpathyAccountWidgetPriv EmpathyAccountWidgetPriv;
 typedef struct _EmpathyAccountWidgetUIDetails EmpathyAccountWidgetUIDetails;
 
 typedef struct {
-  GObject parent;
+  GtkBox parent;
 
   EmpathyAccountWidgetUIDetails *ui_details;
 
@@ -54,13 +54,11 @@ typedef struct {
 } EmpathyAccountWidget;
 
 typedef struct {
-  GObjectClass parent_class;
+  GtkBoxClass parent_class;
 } EmpathyAccountWidgetClass;
 
 GType empathy_account_widget_get_type (void);
 
-GtkWidget *empathy_account_widget_get_widget (EmpathyAccountWidget *widget);
-
 EmpathyAccountWidget * empathy_account_widget_new_for_protocol (
     EmpathyAccountSettings *settings,
     gboolean simple);
@@ -84,6 +82,8 @@ void empathy_account_widget_set_other_accounts_exist (
 
 void empathy_account_widget_hide_buttons (EmpathyAccountWidget *self);
 
+void empathy_account_widget_apply_and_log_in (EmpathyAccountWidget *self);
+
 /* protected methods */
 void empathy_account_widget_changed (EmpathyAccountWidget *widget);