X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-retrieve-combo-box.h;h=ef50b8b478e8c4af7eed714318c6eb7d2c62e28e;hb=28d919a2a90b3aa88febe9b6496b15e11730a424;hp=69a2be68be7d0058d23bccdbbcef097013007cd1;hpb=7929406e046ed92142ff337bd9161e6a16e1d04e;p=modest

diff --git a/src/widgets/modest-retrieve-combo-box.h b/src/widgets/modest-retrieve-combo-box.h
index 69a2be6..ef50b8b 100644
--- a/src/widgets/modest-retrieve-combo-box.h
+++ b/src/widgets/modest-retrieve-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_RETRIEVE_COMBO_BOX
 #define _MODEST_RETRIEVE_COMBO_BOX
 
-#include <gtk/gtkcombobox.h>
-#include "modest-protocol-info.h"
+#include <gtk/gtk.h>
+#include "modest-protocol-registry.h"
 #include <modest-account-settings.h>
 
 G_BEGIN_DECLS
@@ -46,7 +71,7 @@ GType modest_retrieve_combo_box_get_type (void);
 
 ModestRetrieveComboBox* modest_retrieve_combo_box_new (void);
 
-void modest_retrieve_combo_box_fill (ModestRetrieveComboBox *combobox, ModestTransportStoreProtocol protocol);
+void modest_retrieve_combo_box_fill (ModestRetrieveComboBox *combobox, ModestProtocolType protocol);
 
 ModestAccountRetrieveType modest_retrieve_combo_box_get_active_retrieve_conf (ModestRetrieveComboBox *combobox);