projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set header filters depending on edit mode (fixes NB#97299)
[modest]
/
src
/
widgets
/
modest-validating-entry.c
diff --git
a/src/widgets/modest-validating-entry.c
b/src/widgets/modest-validating-entry.c
index
08994c3
..
879e1da
100644
(file)
--- a/
src/widgets/modest-validating-entry.c
+++ b/
src/widgets/modest-validating-entry.c
@@
-4,6
+4,7
@@
*/
#include "modest-validating-entry.h"
*/
#include "modest-validating-entry.h"
+#include <modest-ui-constants.h>
#include <gtk/gtksignal.h> /* For the gtk_signal_stop_emit_by_name() convenience function. */
#include <string.h> /* For strlen(). */
#include <gtk/gtksignal.h> /* For the gtk_signal_stop_emit_by_name() convenience function. */
#include <string.h> /* For strlen(). */
@@
-12,7
+13,12
@@
#include <config.h>
#endif
#include <config.h>
#endif
+
+#ifdef MODEST_TOOLKIT_HILDON2
+G_DEFINE_TYPE (ModestValidatingEntry, modest_validating_entry, HILDON_TYPE_ENTRY);
+#else
G_DEFINE_TYPE (ModestValidatingEntry, modest_validating_entry, GTK_TYPE_ENTRY);
G_DEFINE_TYPE (ModestValidatingEntry, modest_validating_entry, GTK_TYPE_ENTRY);
+#endif
#define VALIDATING_ENTRY_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), MODEST_TYPE_VALIDATING_ENTRY, ModestValidatingEntryPrivate))
#define VALIDATING_ENTRY_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), MODEST_TYPE_VALIDATING_ENTRY, ModestValidatingEntryPrivate))
@@
-203,7
+209,15
@@
modest_validating_entry_init (ModestValidatingEntry *self)
ModestValidatingEntry*
modest_validating_entry_new (void)
{
ModestValidatingEntry*
modest_validating_entry_new (void)
{
- return g_object_new (MODEST_TYPE_VALIDATING_ENTRY, NULL);
+ ModestValidatingEntry *entry;
+
+ entry = g_object_new (MODEST_TYPE_VALIDATING_ENTRY, NULL);
+
+#ifdef MODEST_TOOLKIT_HILDON2
+ hildon_gtk_widget_set_theme_size (GTK_WIDGET (entry), MODEST_EDITABLE_SIZE);
+#endif
+
+ return entry;
}
/** Specify characters that may not be entered into this GtkEntry.
}
/** Specify characters that may not be entered into this GtkEntry.