[SCM] Debian packaging for libhildon. branch, debian-patches, updated. upstream/2.1.34.debian.1-6-gfe6d102
Jonny Lamb
jonny at debian.org
Tue Aug 3 19:43:50 UTC 2010
The following commit has been merged in the debian-patches branch:
commit fe6d102b642b6178ec45cb6fac45299fffdfde76
Author: Jonny Lamb <jonny at debian.org>
Date: Sun Aug 1 16:59:06 2010 -0400
Add some more includes and if 0s to let it build.
Signed-off-by: Jonny Lamb <jonny at debian.org>
diff --git a/examples/hildon-text-view-example.c b/examples/hildon-text-view-example.c
index 4e2a16b..63e128f 100644
--- a/examples/hildon-text-view-example.c
+++ b/examples/hildon-text-view-example.c
@@ -36,7 +36,9 @@ static void
set_placeholder_button_clicked (GtkButton *button,
GtkEntry *entry)
{
+#if 0
hildon_gtk_text_view_set_placeholder_text (textview, gtk_entry_get_text (entry));
+#endif
}
static void
diff --git a/hildon/hildon-check-button.c b/hildon/hildon-check-button.c
index 4a8d90d..0c1b147 100644
--- a/hildon/hildon-check-button.c
+++ b/hildon/hildon-check-button.c
@@ -83,6 +83,8 @@ enum {
static guint signals[LAST_SIGNAL] = { 0 };
+#include "hildon-enum-types.h"
+
G_DEFINE_TYPE (HildonCheckButton, hildon_check_button, GTK_TYPE_BUTTON);
#define HILDON_CHECK_BUTTON_GET_PRIVATE(obj) \
diff --git a/hildon/hildon-entry.c b/hildon/hildon-entry.c
index 5268586..e01f3e4 100644
--- a/hildon/hildon-entry.c
+++ b/hildon/hildon-entry.c
@@ -47,6 +47,7 @@
#undef HILDON_DISABLE_DEPRECATED
+#include "hildon-enum-types.h"
#include "hildon-entry.h"
G_DEFINE_TYPE (HildonEntry, hildon_entry, GTK_TYPE_ENTRY);
@@ -138,7 +139,9 @@ hildon_entry_set_placeholder (HildonEntry *entry,
const gchar *text)
{
g_return_if_fail (HILDON_IS_ENTRY (entry) && text != NULL);
+#if 0
hildon_gtk_entry_set_placeholder_text (GTK_ENTRY (entry), text);
+#endif
}
/**
diff --git a/hildon/hildon-gtk.h b/hildon/hildon-gtk.h
index 9b31771..4a29cfb 100644
--- a/hildon/hildon-gtk.h
+++ b/hildon/hildon-gtk.h
@@ -38,6 +38,21 @@ typedef enum
HILDON_UI_MODE_EDIT
} HildonUIMode;
+typedef enum
+{
+ HILDON_GTK_INPUT_MODE_ALPHA = 1 << 0,
+ HILDON_GTK_INPUT_MODE_NUMERIC = 1 << 1,
+ HILDON_GTK_INPUT_MODE_SPECIAL = 1 << 2,
+ HILDON_GTK_INPUT_MODE_HEXA = 1 << 3,
+ HILDON_GTK_INPUT_MODE_TELE = 1 << 4,
+ HILDON_GTK_INPUT_MODE_FULL = (HILDON_GTK_INPUT_MODE_ALPHA | HILDON_GTK_INPUT_MODE_NUMERIC | HILDON_GTK_INPUT_MODE_SPECIAL),
+ HILDON_GTK_INPUT_MODE_NO_SCREEN_PLUGINS = 1 << 27,
+ HILDON_GTK_INPUT_MODE_MULTILINE = 1 << 28,
+ HILDON_GTK_INPUT_MODE_INVISIBLE = 1 << 29,
+ HILDON_GTK_INPUT_MODE_AUTOCAP = 1 << 30,
+ HILDON_GTK_INPUT_MODE_DICTIONARY = 1 << 31
+} HildonGtkInputMode;
+
void
hildon_gtk_widget_set_theme_size (GtkWidget *widget,
HildonSizeType size);
diff --git a/hildon/hildon-live-search.c b/hildon/hildon-live-search.c
index 249a37c..5df7955 100644
--- a/hildon/hildon-live-search.c
+++ b/hildon/hildon-live-search.c
@@ -708,9 +708,11 @@ hildon_live_search_init (HildonLiveSearch *self)
/* Unset the autocap and dictionary input flags from the
HildonEntry. */
+#if 0
imode = hildon_gtk_entry_get_input_mode (GTK_ENTRY (priv->entry));
hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry),
filter_input_mode (imode));
+#endif
gtk_widget_set_name (GTK_WIDGET (priv->entry),
"HildonLiveSearchEntry");
diff --git a/hildon/hildon-text-view.c b/hildon/hildon-text-view.c
index 1d95f1c..a1cf1ae 100644
--- a/hildon/hildon-text-view.c
+++ b/hildon/hildon-text-view.c
@@ -134,7 +134,9 @@ hildon_text_view_set_placeholder (HildonTextView *text_view,
const gchar *text)
{
g_return_if_fail (HILDON_IS_TEXT_VIEW (text_view) && text != NULL);
+#if 0
hildon_gtk_text_view_set_placeholder_text (GTK_TEXT_VIEW (text_view), text);
+#endif
}
/**
@@ -162,11 +164,13 @@ hildon_text_view_button_press_event (GtkWidget *widget,
gtk_widget_grab_focus (widget);
+#if 0
if (GTK_TEXT_VIEW (widget)->editable &&
hildon_gtk_im_context_filter_event (GTK_TEXT_VIEW (widget)->im_context, (GdkEvent*)event)) {
GTK_TEXT_VIEW (widget)->need_im_reset = TRUE;
return TRUE;
}
+#endif
if (event->button == 1 && event->type == GDK_BUTTON_PRESS) {
priv->x = event->x;
@@ -212,11 +216,13 @@ hildon_text_view_button_release_event (GtkWidget *widget,
GtkTextIter iter;
gint x, y;
+#if 0
if (text_view->editable &&
hildon_gtk_im_context_filter_event (text_view->im_context, (GdkEvent*)event)) {
text_view->need_im_reset = TRUE;
return TRUE;
}
+#endif
if (event->button == 1 && event->type == GDK_BUTTON_RELEASE &&
!priv->selection_movement) {
diff --git a/hildon/hildon-touch-selector-entry.c b/hildon/hildon-touch-selector-entry.c
index c7c4d27..30862ad 100644
--- a/hildon/hildon-touch-selector-entry.c
+++ b/hildon/hildon-touch-selector-entry.c
@@ -47,6 +47,7 @@
#include "hildon-touch-selector.h"
#include "hildon-touch-selector-entry.h"
#include "hildon-entry.h"
+#include "hildon-gtk.h"
#include <string.h>
@@ -247,6 +248,7 @@ hildon_touch_selector_entry_init (HildonTouchSelectorEntry *self)
priv->entry = hildon_entry_new (HILDON_SIZE_FINGER_HEIGHT);
gtk_entry_set_activates_default (GTK_ENTRY (priv->entry), TRUE);
+#if 0
input_mode = hildon_gtk_entry_get_input_mode (GTK_ENTRY (priv->entry));
/* Disable unsupported input modes. */
@@ -255,6 +257,7 @@ hildon_touch_selector_entry_init (HildonTouchSelectorEntry *self)
input_mode &= ~HILDON_GTK_INPUT_MODE_DICTIONARY;
hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry), input_mode);
+#endif
completion = gtk_entry_completion_new ();
gtk_entry_completion_set_inline_completion (completion, TRUE);
@@ -423,7 +426,9 @@ hildon_touch_selector_entry_set_input_mode (HildonTouchSelectorEntry * selector,
priv = HILDON_TOUCH_SELECTOR_ENTRY_GET_PRIVATE (selector);
+#if 0
hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry), input_mode);
+#endif
}
/**
@@ -440,6 +445,7 @@ hildon_touch_selector_entry_set_input_mode (HildonTouchSelectorEntry * selector,
HildonGtkInputMode
hildon_touch_selector_entry_get_input_mode (HildonTouchSelectorEntry * selector)
{
+#if 0
HildonTouchSelectorEntryPrivate *priv;
g_return_val_if_fail (HILDON_IS_TOUCH_SELECTOR_ENTRY (selector), HILDON_GTK_INPUT_MODE_ALPHA);
@@ -447,6 +453,8 @@ hildon_touch_selector_entry_get_input_mode (HildonTouchSelectorEntry * selector)
priv = HILDON_TOUCH_SELECTOR_ENTRY_GET_PRIVATE (selector);
return hildon_gtk_entry_get_input_mode (GTK_ENTRY (priv->entry));
+#endif
+ return HILDON_GTK_INPUT_MODE_FULL;
}
static void
diff --git a/hildon/hildon-touch-selector.c b/hildon/hildon-touch-selector.c
index e16b3b5..1b74859 100644
--- a/hildon/hildon-touch-selector.c
+++ b/hildon/hildon-touch-selector.c
@@ -2797,7 +2797,9 @@ hildon_touch_selector_set_hildon_ui_mode (HildonTouchSelector *selector,
column = HILDON_TOUCH_SELECTOR_COLUMN (iter->data);
tree_view = column->priv->tree_view;
+#if 0
hildon_tree_view_set_hildon_ui_mode (tree_view, mode);
+#endif
/* looking at the code of hildon_tree_view_set_hildon_ui_mode, it seems
that it call the unselect_all, but it is required anyway */
--
Debian packaging for libhildon.
More information about the pkg-maemo-commits
mailing list