Adding some missing bugfixes from pre-consolidation from another branch. Adding the...

[hildon] / src / hildon-date-editor.c

diff --git a/src/hildon-date-editor.c b/src/hildon-date-editor.c
index e1ed643..9f8be07 100644 (file)
--- a/src/hildon-date-editor.c
+++ b/src/hildon-date-editor.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of hildon-libs
+ * This file is a part of hildon
  *
  * Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved.
  *
@@ -48,7 +48,7 @@
 #include                                        "hildon-calendar-popup.h"
 #include                                        "hildon-defines.h"
 #include                                        "hildon-input-mode-hint.h"
-#include                                        "hildon-composite-widget.h"
+#include                                        "hildon-private.h"
 #include                                        "hildon-marshalers.h"
 #include                                        "hildon-enum-types.h"
 #include                                        "hildon-time-editor.h"
@@ -58,6 +58,8 @@
 
 #define                                         _(string) dgettext(PACKAGE, string)
 
+#define                                         c_(string) dgettext("hildon-common-strings", string)
+
 #define                                         ENTRY_BORDERS 11
 
 #define                                         DATE_EDITOR_HEIGHT 30
@@ -116,7 +118,7 @@ hildon_date_editor_entry_focus_out              (GtkWidget *widget,
 
 static gboolean
 hildon_date_editor_date_error                   (HildonDateEditor *editor, 
-                                                                    HildonDateTimeEditorError type);
+                                                HildonDateTimeError type);
 
 static gboolean 
 hildon_date_editor_entry_focus_in               (GtkWidget *widget,
@@ -213,7 +215,7 @@ hildon_date_editor_class_init                   (HildonDateEditorClass *editor_c
     gobject_class->get_property             = hildon_date_editor_get_property;
     widget_class->size_request              = hildon_date_editor_size_request;
     widget_class->size_allocate             = hildon_date_editor_size_allocate;
-    widget_class->focus                     = hildon_composite_widget_focus;
+    widget_class->focus                     = hildon_private_composite_focus;
 
     container_class->forall                 = hildon_child_forall;
     GTK_OBJECT_CLASS(editor_class)->destroy = hildon_date_editor_destroy;
@@ -227,7 +229,7 @@ hildon_date_editor_class_init                   (HildonDateEditorClass *editor_c
                 G_STRUCT_OFFSET (HildonDateEditorClass, date_error),
                 g_signal_accumulator_true_handled, NULL,
                 _hildon_marshal_BOOLEAN__ENUM,
-                G_TYPE_BOOLEAN, 1, HILDON_TYPE_DATE_TIME_EDITOR_ERROR);
+                G_TYPE_BOOLEAN, 1, HILDON_TYPE_DATE_TIME_ERROR);
 
     /**
      * HildonDateEditor:year:
@@ -1165,7 +1167,7 @@ hildon_date_editor_entry_focus_out              (GtkWidget *widget,
 
 static gboolean 
 hildon_date_editor_date_error                   (HildonDateEditor *editor,
-                                                 HildonDateTimeEditorError type)
+                                                 HildonDateTimeError type)
 {
     HildonDateEditorPrivate *priv = HILDON_DATE_EDITOR_GET_PRIVATE (editor);
     g_assert (priv);
@@ -1207,7 +1209,7 @@ hildon_date_editor_date_error                   (HildonDateEditor *editor,
             break;
 
         case HILDON_DATE_TIME_ERROR_INVALID_CHAR:
-            hildon_banner_show_information (GTK_WIDGET (editor), NULL, _("ckct_ib_illegal_character"));
+            hildon_banner_show_information (GTK_WIDGET (editor), NULL, c_("ckct_ib_illegal_character"));
             break;
 
         case HILDON_DATE_TIME_ERROR_INVALID_DATE: