X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-number-editor.h;h=171632d4d9f8b613ee66bc9c626e8360b8b82e63;hb=e37773399d98b5b959b0481bf3e2b8cbd9a30f34;hp=84b1d559ba76f9053ca2df9202f29e2f2dc41ddd;hpb=17319d5700c0f40e765d1128f20f3ffa86602932;p=modest

diff --git a/src/hildon2/modest-number-editor.h b/src/hildon2/modest-number-editor.h
index 84b1d55..171632d 100644
--- a/src/hildon2/modest-number-editor.h
+++ b/src/hildon2/modest-number-editor.h
@@ -1,8 +1,31 @@
 /*
- * This file is a part of modest
+ * Copyright (C) 2008 Nokia Corporation, all rights reserved.
+ * All rights reserved.
  *
- * Copyright (C) 2005, 2006, 2008 Nokia Corporation, 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_NUMBER_EDITOR_H__
@@ -17,20 +40,21 @@ G_BEGIN_DECLS
                                                 (modest_number_editor_get_type())
 
 #define                                         MODEST_NUMBER_EDITOR(obj) \
-                                                (GTK_CHECK_CAST (obj, MODEST_TYPE_NUMBER_EDITOR, ModestNumberEditor))
+                                                (G_TYPE_CHECK_INSTANCE_CAST (obj, MODEST_TYPE_NUMBER_EDITOR, ModestNumberEditor))
 
 #define                                         MODEST_NUMBER_EDITOR_CLASS(klass) \
-                                                (GTK_CHECK_CLASS_CAST ((klass), MODEST_TYPE_NUMBER_EDITOR, \
+                                                (G_TYPE_CHECK_CLASS_CAST ((klass), MODEST_TYPE_NUMBER_EDITOR, \
                                                 ModestNumberEditorClass))
 
 #define                                         MODEST_IS_NUMBER_EDITOR(obj) \
-                                                (GTK_CHECK_TYPE (obj, MODEST_TYPE_NUMBER_EDITOR))
+                                                (G_TYPE_CHECK_INSTANCE_TYPE (obj, MODEST_TYPE_NUMBER_EDITOR))
 
 #define                                         MODEST_IS_NUMBER_EDITOR_CLASS(klass) \
-                                                (GTK_CHECK_CLASS_TYPE ((klass), MODEST_TYPE_NUMBER_EDITOR))
+                                                (G_TYPE_CHECK_CLASS_TYPE ((klass), MODEST_TYPE_NUMBER_EDITOR))
 
 #define                                         MODEST_NUMBER_EDITOR_GET_CLASS(obj) \
-                                                ((ModestNumberEditorClass *) G_OBJECT_GET_CLASS(obj))
+						(G_TYPE_INSTANCE_GET_CLASS ((obj), MODEST_TYPE_NUMBER_EDITOR, \
+						ModestNumberEditorClass))
 
 typedef struct                                  _ModestNumberEditor ModestNumberEditor;
 
@@ -50,7 +74,7 @@ typedef enum
 
 struct                                          _ModestNumberEditorClass 
 {
-	GtkEntryClass parent_class;
+	HildonEntryClass parent_class;
 	
 	gboolean  (*range_error)  (ModestNumberEditor *editor, ModestNumberEditorErrorType type); 
 	void      (*valid_changed) (ModestNumberEditor *editor, gboolean valid);