[contact-lookup-applet] Compile with -DGSEAL_ENABLE. Fixes bug 616182.
- From: Andre Klapper <aklapper src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [contact-lookup-applet] Compile with -DGSEAL_ENABLE. Fixes bug 616182.
- Date: Mon, 19 Apr 2010 14:30:15 +0000 (UTC)
commit d212d3b6c23678e6e55b9b10ea929fe04fd1df75
Author: Andre Klapper <a9016009 gmx de>
Date: Mon Apr 19 16:02:30 2010 +0200
Compile with -DGSEAL_ENABLE. Fixes bug 616182.
configure.ac | 2 +-
src/contact-lookup-applet.c | 2 +-
src/e-contact-entry.c | 2 +-
src/test-entry-default.c | 2 +-
src/test-entry.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 43ead25..772cb4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AM_GLIB_GNU_GETTEXT
AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal])
dnl GTK+
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.12.0)
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18.0)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
diff --git a/src/contact-lookup-applet.c b/src/contact-lookup-applet.c
index ee46878..18584bb 100644
--- a/src/contact-lookup-applet.c
+++ b/src/contact-lookup-applet.c
@@ -205,7 +205,7 @@ change_background_cb (PanelApplet *applet,
GTK_STATE_NORMAL, colour);
break;
case PANEL_PIXMAP_BACKGROUND:
- style = gtk_style_copy (GTK_WIDGET (applet)->style);
+ style = gtk_style_copy (gtk_widget_get_style (GTK_WIDGET (applet)));
if (style->bg_pixmap[GTK_STATE_NORMAL])
g_object_unref (style->bg_pixmap[GTK_STATE_NORMAL]);
style->bg_pixmap[GTK_STATE_NORMAL] = g_object_ref (pixmap);
diff --git a/src/e-contact-entry.c b/src/e-contact-entry.c
index 69ffa3d..e190290 100644
--- a/src/e-contact-entry.c
+++ b/src/e-contact-entry.c
@@ -385,7 +385,7 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data)
EContactEntry *entry;
entry = E_CONTACT_ENTRY (editable);
- if (GTK_ENTRY (editable)->text_length >= entry->priv->lookup_length) {
+ if (gtk_entry_get_text_length (GTK_ENTRY (editable)) >= entry->priv->lookup_length) {
GList *l;
EBookQuery *query;
diff --git a/src/test-entry-default.c b/src/test-entry-default.c
index ed85d27..c6ac6f8 100644
--- a/src/test-entry-default.c
+++ b/src/test-entry-default.c
@@ -109,7 +109,7 @@ int main (int argc, char **argv)
g_signal_connect (G_OBJECT (entry), "state-change",
G_CALLBACK (state_change_cb), NULL);
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (window)->vbox), entry);
+ gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (window))), entry);
gtk_widget_show_all (window);
diff --git a/src/test-entry.c b/src/test-entry.c
index 1059687..b23dacd 100644
--- a/src/test-entry.c
+++ b/src/test-entry.c
@@ -193,7 +193,7 @@ int main (int argc, char **argv)
g_signal_connect (G_OBJECT (entry), "state-change",
G_CALLBACK (state_change_cb), NULL);
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (window)->vbox), entry);
+ gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (window))), entry);
gtk_widget_show_all (window);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]