From 55434ebd3296151af64aad4bc380d1f91f6a1f2c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 16 Dec 2004 03:49:22 +0000 Subject: [PATCH] Require glib 2.6.0 for g_filename_display_basename. 2004-12-15 Matthias Clasen * configure.in: Require glib 2.6.0 for g_filename_display_basename. * gtk/gtkentrycompletion.[hc]: Make the prefix parameter to the insert-prefix signal a const gchar* instead of a gchar*. (#161415, Murray Cumming) Also remove an unused static function. --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-6 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ configure.in | 2 +- gtk/gtkentrycompletion.c | 16 ++-------------- gtk/gtkentrycompletion.h | 2 +- 7 files changed, 44 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 957a1db992..d2f5a09487 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2004-12-15 Matthias Clasen + + * configure.in: Require glib 2.6.0 for + g_filename_display_basename. + + * gtk/gtkentrycompletion.[hc]: Make the prefix parameter + to the insert-prefix signal a const gchar* instead of a + gchar*. (#161415, Murray Cumming) + Also remove an unused static function. + 2004-12-15 Alexander Larsson * gtk/gtkfilesystemunix.c (gtk_file_folder_unix_get_info): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 957a1db992..d2f5a09487 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +2004-12-15 Matthias Clasen + + * configure.in: Require glib 2.6.0 for + g_filename_display_basename. + + * gtk/gtkentrycompletion.[hc]: Make the prefix parameter + to the insert-prefix signal a const gchar* instead of a + gchar*. (#161415, Murray Cumming) + Also remove an unused static function. + 2004-12-15 Alexander Larsson * gtk/gtkfilesystemunix.c (gtk_file_folder_unix_get_info): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 957a1db992..d2f5a09487 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +2004-12-15 Matthias Clasen + + * configure.in: Require glib 2.6.0 for + g_filename_display_basename. + + * gtk/gtkentrycompletion.[hc]: Make the prefix parameter + to the insert-prefix signal a const gchar* instead of a + gchar*. (#161415, Murray Cumming) + Also remove an unused static function. + 2004-12-15 Alexander Larsson * gtk/gtkfilesystemunix.c (gtk_file_folder_unix_get_info): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 957a1db992..d2f5a09487 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +2004-12-15 Matthias Clasen + + * configure.in: Require glib 2.6.0 for + g_filename_display_basename. + + * gtk/gtkentrycompletion.[hc]: Make the prefix parameter + to the insert-prefix signal a const gchar* instead of a + gchar*. (#161415, Murray Cumming) + Also remove an unused static function. + 2004-12-15 Alexander Larsson * gtk/gtkfilesystemunix.c (gtk_file_folder_unix_get_info): diff --git a/configure.in b/configure.in index 0888f74d9d..a248efc278 100644 --- a/configure.in +++ b/configure.in @@ -29,7 +29,7 @@ m4_define([gtk_api_version], [2.0]) m4_define([gtk_binary_version], [2.4.0]) # required versions of other packages -m4_define([glib_required_version], [2.5.7]) +m4_define([glib_required_version], [2.6.0]) m4_define([pango_required_version], [1.7.0]) m4_define([atk_required_version], [1.0.1]) diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index e802137cf2..5cae4ab142 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -133,7 +133,7 @@ static gboolean gtk_entry_completion_match_selected (GtkEntryCompletion *co GtkTreeModel *model, GtkTreeIter *iter); static gboolean gtk_entry_completion_real_insert_prefix (GtkEntryCompletion *completion, - gchar *key); + const gchar *prefix); static GObjectClass *parent_class = NULL; static guint entry_completion_signals[LAST_SIGNAL] = { 0 }; @@ -903,18 +903,6 @@ gtk_entry_completion_get_entry (GtkEntryCompletion *completion) return completion->priv->entry; } -static void -filter_model_changed_cb (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer user_data) -{ - GtkEntryCompletion *completion = GTK_ENTRY_COMPLETION (user_data); - - if (GTK_WIDGET_VISIBLE (completion->priv->popup_window)) - _gtk_entry_completion_resize_popup (completion); -} - /** * gtk_entry_completion_set_model: * @completion: A #GtkEntryCompletion. @@ -1461,7 +1449,7 @@ gtk_entry_completion_compute_prefix (GtkEntryCompletion *completion) static gboolean gtk_entry_completion_real_insert_prefix (GtkEntryCompletion *completion, - gchar *prefix) + const gchar *prefix) { if (prefix) { diff --git a/gtk/gtkentrycompletion.h b/gtk/gtkentrycompletion.h index addac0b5a7..f1e22ebcc7 100644 --- a/gtk/gtkentrycompletion.h +++ b/gtk/gtkentrycompletion.h @@ -64,7 +64,7 @@ struct _GtkEntryCompletionClass void (* action_activated) (GtkEntryCompletion *completion, gint index_); gboolean (* insert_prefix) (GtkEntryCompletion *completion, - gchar *prefix); + const gchar *prefix); /* Padding for future expansion */ void (*_gtk_reserved0) (void);