Merge branch 'master' into tp-tube

[empathy.git] / libempathy / empathy-contact-monitor.h

diff --git a/libempathy/empathy-contact-monitor.h b/libempathy/empathy-contact-monitor.h
index e9a0605443d3f6e22650531a4ae4110948b7838a..76b943668fcd86c6f614e646c81ec3198aff9d91 100644 (file)
--- a/libempathy/empathy-contact-monitor.h
+++ b/libempathy/empathy-contact-monitor.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
 /*
  * Copyright (C) 2008 Collabora Ltd.
  *
@@ -38,12 +38,12 @@ G_BEGIN_DECLS
 typedef struct _EmpathyContactMonitorClass EmpathyContactMonitorClass;
 
 struct _EmpathyContactMonitor {
-       GObject parent;
-       gpointer priv;
+  GObject parent;
+  gpointer priv;
 };
 
 struct _EmpathyContactMonitorClass {
-       GObjectClass parent_class;
+  GObjectClass parent_class;
 };
 
 GType empathy_contact_monitor_get_type (void);
@@ -51,12 +51,13 @@ GType empathy_contact_monitor_get_type (void);
 /* public methods */
 
 void
-empathy_contact_monitor_set_proxy (EmpathyContactMonitor *self,
-                                  EmpathyContactList *proxy);
+empathy_contact_monitor_set_iface (EmpathyContactMonitor *self,
+                                   EmpathyContactList *iface);
                                   
 EmpathyContactMonitor * 
-empathy_contact_monitor_new_for_proxy (EmpathyContactList *proxy);
+empathy_contact_monitor_new_for_iface (EmpathyContactList *iface);
 
 G_END_DECLS
 
 #endif /* __EMPATHY_CONTACT_MONITOR_H__ */
+