aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@gnome.org>2007-07-10 21:14:52 +0800
committerChristian Persch <chpe@src.gnome.org>2007-07-10 21:14:52 +0800
commita8ccd1aa2ba3bb025627f0d0d46274a67c014505 (patch)
tree2414aa85dcb172dc06c6b5e32b94280bbab34a87
parent1f582511944d0dbb4e99c8c48b18c311fd7cb2b3 (diff)
downloadgsoc2013-epiphany-a8ccd1aa2ba3bb025627f0d0d46274a67c014505.tar
gsoc2013-epiphany-a8ccd1aa2ba3bb025627f0d0d46274a67c014505.tar.gz
gsoc2013-epiphany-a8ccd1aa2ba3bb025627f0d0d46274a67c014505.tar.bz2
gsoc2013-epiphany-a8ccd1aa2ba3bb025627f0d0d46274a67c014505.tar.lz
gsoc2013-epiphany-a8ccd1aa2ba3bb025627f0d0d46274a67c014505.tar.xz
gsoc2013-epiphany-a8ccd1aa2ba3bb025627f0d0d46274a67c014505.tar.zst
gsoc2013-epiphany-a8ccd1aa2ba3bb025627f0d0d46274a67c014505.zip
Remove gtk version check since we now depend on 2.11.
2007-07-10 Christian Persch <chpe@gnome.org> * lib/widgets/ephy-location-entry.c: (cursor_on_match_cb), (ephy_location_entry_set_completion): Remove gtk version check since we now depend on 2.11. svn path=/trunk/; revision=7138
-rw-r--r--ChangeLog7
-rw-r--r--lib/widgets/ephy-location-entry.c5
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 1dbe3c219..64895e62f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2007-07-10 Christian Persch <chpe@gnome.org>
+ * lib/widgets/ephy-location-entry.c: (cursor_on_match_cb),
+ (ephy_location_entry_set_completion):
+
+ Remove gtk version check since we now depend on 2.11.
+
+2007-07-10 Christian Persch <chpe@gnome.org>
+
* lib/widgets/ephy-location-entry.c:
(ephy_location_entry_finalize), (ephy_location_entry_class_init),
(ephy_location_entry_construct_contents),
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index e9431e850..1a239aff7 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -53,7 +53,6 @@
#include <gtk/gtkseparatormenuitem.h>
#include <gtk/gtkalignment.h>
#include <gtk/gtkclipboard.h>
-#include <gtk/gtkversion.h>
#include <string.h>
@@ -976,7 +975,6 @@ sort_func (GtkTreeModel *model,
return valueb - valuea;
}
-#if GTK_CHECK_VERSION (2, 11, 0)
static gboolean
cursor_on_match_cb (GtkEntryCompletion *completion,
GtkTreeModel *model,
@@ -997,7 +995,6 @@ cursor_on_match_cb (GtkEntryCompletion *completion,
return TRUE;
}
-#endif /* GTK+ 2.11.0 */
void
ephy_location_entry_set_completion (EphyLocationEntry *le,
@@ -1069,11 +1066,9 @@ ephy_location_entry_set_completion (EphyLocationEntry *le,
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (completion),
extracell, "text", extra_col);
-#if GTK_CHECK_VERSION (2, 11, 0)
g_object_set (completion, "inline-selection", TRUE, NULL);
g_signal_connect (completion, "cursor-on-match",
G_CALLBACK (cursor_on_match_cb), le);
-#endif
gtk_entry_set_completion (GTK_ENTRY (priv->icon_entry->entry), completion);
g_object_unref (completion);