callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Require glib 2.6.0 for g_filename_display_basename.

Browse Source 
2004-12-15  Matthias Clasen  <mclasen@redhat.com>

	* 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.
This commit is contained in:
Matthias Clasen 2004-12-16 03:49:22 +00:00 committed by Matthias Clasen
parent 55ef0b48c3
commit 55434ebd32
7 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2004-12-15 Matthias Clasen <mclasen@redhat.com>
* 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 <alexl@redhat.com> 2004-12-15 Alexander Larsson <alexl@redhat.com>
* gtk/gtkfilesystemunix.c (gtk_file_folder_unix_get_info): * gtk/gtkfilesystemunix.c (gtk_file_folder_unix_get_info):

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,13 @@
2004-12-15 Matthias Clasen <mclasen@redhat.com>
* 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 <alexl@redhat.com> 2004-12-15 Alexander Larsson <alexl@redhat.com>
* gtk/gtkfilesystemunix.c (gtk_file_folder_unix_get_info): * gtk/gtkfilesystemunix.c (gtk_file_folder_unix_get_info):

10
ChangeLog.pre-2-6
View File

@ -1,3 +1,13 @@
2004-12-15 Matthias Clasen <mclasen@redhat.com>
* 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 <alexl@redhat.com> 2004-12-15 Alexander Larsson <alexl@redhat.com>
* gtk/gtkfilesystemunix.c (gtk_file_folder_unix_get_info): * gtk/gtkfilesystemunix.c (gtk_file_folder_unix_get_info):

10
ChangeLog.pre-2-8
View File

@ -1,3 +1,13 @@
2004-12-15 Matthias Clasen <mclasen@redhat.com>
* 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 <alexl@redhat.com> 2004-12-15 Alexander Larsson <alexl@redhat.com>
* gtk/gtkfilesystemunix.c (gtk_file_folder_unix_get_info): * gtk/gtkfilesystemunix.c (gtk_file_folder_unix_get_info):

2
configure.in
View File

@ -29,7 +29,7 @@ m4_define([gtk_api_version], [2.0])
m4_define([gtk_binary_version], [2.4.0]) m4_define([gtk_binary_version], [2.4.0])
# required versions of other packages # 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([pango_required_version], [1.7.0])
m4_define([atk_required_version], [1.0.1]) m4_define([atk_required_version], [1.0.1])

16
gtk/gtkentrycompletion.c
View File

@ -133,7 +133,7 @@ static gboolean gtk_entry_completion_match_selected (GtkEntryCompletion *co
GtkTreeModel *model, GtkTreeModel *model,
GtkTreeIter *iter); GtkTreeIter *iter);
static gboolean gtk_entry_completion_real_insert_prefix (GtkEntryCompletion *completion, static gboolean gtk_entry_completion_real_insert_prefix (GtkEntryCompletion *completion,
gchar *key); const gchar *prefix);
static GObjectClass *parent_class = NULL; static GObjectClass *parent_class = NULL;
static guint entry_completion_signals[LAST_SIGNAL] = { 0 }; static guint entry_completion_signals[LAST_SIGNAL] = { 0 };
@ -903,18 +903,6 @@ gtk_entry_completion_get_entry (GtkEntryCompletion *completion)
return completion->priv->entry; 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: * gtk_entry_completion_set_model:
* @completion: A #GtkEntryCompletion. * @completion: A #GtkEntryCompletion.
@ -1461,7 +1449,7 @@ gtk_entry_completion_compute_prefix (GtkEntryCompletion *completion)
static gboolean static gboolean
gtk_entry_completion_real_insert_prefix (GtkEntryCompletion *completion, gtk_entry_completion_real_insert_prefix (GtkEntryCompletion *completion,
gchar *prefix) const gchar *prefix)
{ {
if (prefix) if (prefix)
{ {

2
gtk/gtkentrycompletion.h
View File

@ -64,7 +64,7 @@ struct _GtkEntryCompletionClass
void (* action_activated) (GtkEntryCompletion *completion, void (* action_activated) (GtkEntryCompletion *completion,
gint index_); gint index_);
gboolean (* insert_prefix) (GtkEntryCompletion *completion, gboolean (* insert_prefix) (GtkEntryCompletion *completion,
gchar *prefix); const gchar *prefix);
/* Padding for future expansion */ /* Padding for future expansion */
void (*_gtk_reserved0) (void); void (*_gtk_reserved0) (void);