X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-secureauth-combo-box.h;h=ed811b4285f3a467fdf2c564b4da5140d642c363;hp=4f4c761e2f21524a3dba12886579d7cb3cc12c83;hb=ec98b6e930e0b781d77b277db25bbf638083c9cf;hpb=180a67fe712b82fbd8f07a8c5647c9840181f2ff

diff --git a/src/widgets/modest-secureauth-combo-box.h b/src/widgets/modest-secureauth-combo-box.h
index 4f4c761..ed811b4 100644
--- a/src/widgets/modest-secureauth-combo-box.h
+++ b/src/widgets/modest-secureauth-combo-box.h
@@ -1,13 +1,38 @@
-/* Copyright (c) 2007, Nokia Corporation
+/*
+ * Copyright (C) 2007 Nokia Corporation, all rights reserved.
  * All rights reserved.
  *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef _MODEST_SECUREAUTH_COMBO_BOX
 #define _MODEST_SECUREAUTH_COMBO_BOX
 
-#include <gtk/gtkcombobox.h>
-#include "modest-protocol-info.h"
+#include <gtk/gtk.h>
+#include "modest-protocol-registry.h"
 
 G_BEGIN_DECLS
 
@@ -21,11 +46,11 @@ G_BEGIN_DECLS
 	(G_TYPE_CHECK_CLASS_CAST ((klass), \
 	MODEST_TYPE_SECUREAUTH_COMBO_BOX, ModestSecureauthComboBoxClass))
 
-#define EASYSETUP_IS_SECUREAUTH_COMBO_BOX(obj) \
+#define MODEST_IS_SECUREAUTH_COMBO_BOX(obj) \
 	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
 	MODEST_TYPE_SECUREAUTH_COMBO_BOX))
 
-#define EASYSETUP_IS_SECUREAUTH_COMBO_BOX_CLASS(klass) \
+#define MODEST_IS_SECUREAUTH_COMBO_BOX_CLASS(klass) \
 	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
 	MODEST_TYPE_SECUREAUTH_COMBO_BOX))
 
@@ -45,10 +70,10 @@ GType modest_secureauth_combo_box_get_type (void);
 
 ModestSecureauthComboBox* modest_secureauth_combo_box_new (void);
 
-ModestAuthProtocol modest_secureauth_combo_box_get_active_secureauth (ModestSecureauthComboBox *combobox);
+ModestProtocolType modest_secureauth_combo_box_get_active_secureauth (ModestSecureauthComboBox *combobox);
 
 gboolean modest_secureauth_combo_box_set_active_secureauth (ModestSecureauthComboBox *combobox,
-							    ModestAuthProtocol secureauth);
+							    ModestProtocolType secureauth);
 
 
 G_END_DECLS