diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 14 | ||||
| -rw-r--r-- | gtk/gtkcellview.c | 1 | ||||
| -rw-r--r-- | gtk/gtkcombo.c | 4 | ||||
| -rw-r--r-- | gtk/gtkrc.c | 4 | ||||
| -rw-r--r-- | tests/testentrycompletion.c | 3 |
9 files changed, 76 insertions, 6 deletions
@@ -1,3 +1,17 @@ +2004-04-29 Matthias Clasen <mclasen@redhat.com> + + * tests/testentrycompletion.c (main): Add a missing + cat. (#141070, Chris Sherlock) + + * gtk/gtkrc.c (gtk_rc_check_pixmap_dir): Remove unused + variable. (#141022, Chris Sherlock) + + * gtk/gtkcombo.c (gtk_combo_popup_list): Add a missing + cast. (#141013, Chris Sherlock) + + * gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear): Remove + unused variable. (#141011, Chris Sherlock) + 2004-04-29 Tor Lillqvist <tml@iki.fi> * gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Plug memory diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fd6136f34..c2f0d1179 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,17 @@ +2004-04-29 Matthias Clasen <mclasen@redhat.com> + + * tests/testentrycompletion.c (main): Add a missing + cat. (#141070, Chris Sherlock) + + * gtk/gtkrc.c (gtk_rc_check_pixmap_dir): Remove unused + variable. (#141022, Chris Sherlock) + + * gtk/gtkcombo.c (gtk_combo_popup_list): Add a missing + cast. (#141013, Chris Sherlock) + + * gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear): Remove + unused variable. (#141011, Chris Sherlock) + 2004-04-29 Tor Lillqvist <tml@iki.fi> * gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Plug memory diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fd6136f34..c2f0d1179 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,17 @@ +2004-04-29 Matthias Clasen <mclasen@redhat.com> + + * tests/testentrycompletion.c (main): Add a missing + cat. (#141070, Chris Sherlock) + + * gtk/gtkrc.c (gtk_rc_check_pixmap_dir): Remove unused + variable. (#141022, Chris Sherlock) + + * gtk/gtkcombo.c (gtk_combo_popup_list): Add a missing + cast. (#141013, Chris Sherlock) + + * gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear): Remove + unused variable. (#141011, Chris Sherlock) + 2004-04-29 Tor Lillqvist <tml@iki.fi> * gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Plug memory diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fd6136f34..c2f0d1179 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,17 @@ +2004-04-29 Matthias Clasen <mclasen@redhat.com> + + * tests/testentrycompletion.c (main): Add a missing + cat. (#141070, Chris Sherlock) + + * gtk/gtkrc.c (gtk_rc_check_pixmap_dir): Remove unused + variable. (#141022, Chris Sherlock) + + * gtk/gtkcombo.c (gtk_combo_popup_list): Add a missing + cast. (#141013, Chris Sherlock) + + * gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear): Remove + unused variable. (#141011, Chris Sherlock) + 2004-04-29 Tor Lillqvist <tml@iki.fi> * gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Plug memory diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fd6136f34..c2f0d1179 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,17 @@ +2004-04-29 Matthias Clasen <mclasen@redhat.com> + + * tests/testentrycompletion.c (main): Add a missing + cat. (#141070, Chris Sherlock) + + * gtk/gtkrc.c (gtk_rc_check_pixmap_dir): Remove unused + variable. (#141022, Chris Sherlock) + + * gtk/gtkcombo.c (gtk_combo_popup_list): Add a missing + cast. (#141013, Chris Sherlock) + + * gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear): Remove + unused variable. (#141011, Chris Sherlock) + 2004-04-29 Tor Lillqvist <tml@iki.fi> * gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Plug memory diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c index 8ca33fd99..84dc2e7fd 100644 --- a/gtk/gtkcellview.c +++ b/gtk/gtkcellview.c @@ -640,7 +640,6 @@ gtk_cell_view_cell_layout_add_attribute (GtkCellLayout *layout, static void gtk_cell_view_cell_layout_clear (GtkCellLayout *layout) { - GList *i; GtkCellView *cellview = GTK_CELL_VIEW (layout); g_return_if_fail (GTK_IS_CELL_VIEW (cellview)); diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c index 045f2d578..a0fe38c74 100644 --- a/gtk/gtkcombo.c +++ b/gtk/gtkcombo.c @@ -514,7 +514,7 @@ gtk_combo_get_pos (GtkCombo * combo, gint * x, gint * y, gint * height, gint * w } static void -gtk_combo_popup_list (GtkCombo * combo) +gtk_combo_popup_list (GtkCombo *combo) { GtkWidget *toplevel; GtkList *list; @@ -556,7 +556,7 @@ gtk_combo_popup_list (GtkCombo * combo) gtk_window_move (GTK_WINDOW (combo->popwin), x, y); - toplevel = gtk_widget_get_toplevel (combo); + toplevel = gtk_widget_get_toplevel (GTK_WIDGET (combo)); if (GTK_IS_WINDOW (toplevel)) { diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 5466b0ee3..25cbd009b 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -2967,10 +2967,10 @@ gtk_rc_parse_bg_pixmap (GtkRcContext *context, } static gchar* -gtk_rc_check_pixmap_dir (const gchar *dir, const gchar *pixmap_file) +gtk_rc_check_pixmap_dir (const gchar *dir, + const gchar *pixmap_file) { gchar *buf; - gint fd; buf = g_build_filename (dir, pixmap_file, NULL); diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c index 0a07be9aa..c894b9041 100644 --- a/tests/testentrycompletion.c +++ b/tests/testentrycompletion.c @@ -243,6 +243,7 @@ main (int argc, char *argv[]) gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); label = gtk_label_new (NULL); + gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example."); gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); @@ -311,7 +312,7 @@ main (int argc, char *argv[]) g_object_unref (completion); /* Create a tree model and use it as the completion model */ - completion_model = gtk_list_store_new (1, G_TYPE_STRING); + completion_model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING)); gtk_entry_completion_set_model (completion, completion_model); g_object_unref (completion_model); |