Commit Graph

3802 Commits

Author SHA1 Message Date
Owen Taylor
1b4f09d438 Actually update timestamps, so rules don't constantly run.
Mon Jun 25 00:28:11 2001  Owen Taylor  <otaylor@redhat.com>

        * Makefile.am: Actually update timestamps, so rules don't
        constantly run.
2001-06-25 04:31:03 +00:00
Owen Taylor
7b2e887b52 Add note about child property changes.
Sun Jun 24 22:15:16 2001  Owen Taylor  <otaylor@redhat.com>

	* docs/Changes-2.0.txt: Add note about child property
	changes.
2001-06-25 02:15:50 +00:00
Owen Taylor
1988e13749 Add a special size for drag-and-drop GTK_ICON_SIZE_DND (Default to 32x32)
Sun Jun 24 21:34:32 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkenums.h gtk/gtkiconfactory.c: Add a special size for
	drag-and-drop GTK_ICON_SIZE_DND (Default to 32x32)

	* gtk/gtkdnd.c (gtk_drag_dest_set_target_list): Fix problem
	with un'reffing wrong list reported by Jeff Franks.

	* gtk/gtkdnd.[ch] (_gtk_drag_{source,}dest_handle_event): _prefix.

	* gtk/gtkdnd.c (gtk_drag_set_icon_default): Use GTK_STOCK_DND
	for the default icon. Remove inline XPM.

	* gtk/gtkstock.h gtk/gtkiconfactory.c:
	Add GTK_STOCK_DND GTK_STOCK_DND_MULTIPLE (Currently, stock_new
	is used for GTK_STOCK_DND, but it is a bit too small.)

	* gtk/stock-icons/stock_dnd_multiple.png
	gtk/stock-icons/Makefile.am: New stock icon moved from gnome-libs.

	* gtk/gtkdnd.c (gtk_drag_source_event_cb): Only return
	TRUE when starting a drag. In other cases, we are
	just observing. (#52995)

	* gtk/gtkdnd.[ch] (gtk_drag_set_icon_{stock,pixbuf}): Add
	function to set the icon for a drag from a GdkPixbuf
	or stock ID.

	* gtk/gtkdnd.[ch] (gtk_drag_source_set_icon_{stock,pixbuf}):
	Likewise, for drag sources.

	* gtk/gtkdnd.h: Deprecate gtk_drag_set_default_icon.
	(Now should be done using the stock system.)
2001-06-25 01:51:58 +00:00
Owen Taylor
24a325c67a Removed - didn't work and not particularly useful anyways if it did.
Sun Jun 24 12:06:47 2001  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtktextview.[ch] (gtk_text_view_set_text_window_size):
        Removed - didn't work and not particularly useful anyways
	if it did.
2001-06-24 16:08:15 +00:00
Owen Taylor
cc223eeff6 Fix stupid error introduced last night that was making things decidedly
Sun Jun 24 11:29:35 2001  Owen Taylor  <otaylor@redhat.com>

	* gdk/x11/gdkimage-x11.c (gdk_image_new): Fix stupid error
	introduced last night that was making things decidedly not work.

	* gtk/*.[ch]: Patch from Kristian Rietveld adding 80 getters
	so that we have getter/setter pairing everywhere it makes
	sense. (#55767)

	* gtk/gtkradiobutton.[ch] gtk/gtktoolbar.c tests/testgtk.:
	Rename gtk_radio_button_group to gtk_radio_button_get_group, add a
	deprecated compat macro. (#55516)

	* gtk/gtklabel.[ch]: Add functions
	gtk_label_set/get_use_underline(), gtk_label_set/get_use_markup(),
	gtk_label_set_label(), which mirror the property API for GtkLabel.
	Make gtk_label_get_attributes() only reflect the attributes
	set by gtk_label_set_attributes.

	* gtk/gtknotebook.c (gtk_notebook_set_current_page) gtk/gtkcompat.h: Rename
	from gtk_notebook_set_page().
2001-06-24 15:34:48 +00:00
Owen Taylor
5a5580a8e7 Fix tests for XShm.h.
Sat Jun 23 18:02:46 2001  Owen Taylor  <otaylor@redhat.com>

        * configure.in: Fix tests for XShm.h.

        * gdk/x11/gdkimage-x11.c: Cleanup error handling in
        gdk_image_new() by use of goto, properly use g_object_unref().
2001-06-23 22:14:02 +00:00
Tim Janik
92e87e40a7 disabled g_free (image) calls, as GdkImage is an object. these should be
Sat Jun 23 22:03:20 2001  Tim Janik  <timj@gtk.org>

        * gdk/x11/gdkimage-x11.c (gdk_image_init): disabled g_free (image)
        calls, as GdkImage is an object. these should be g_obejct_unref()
        instead but that won't work because of the g_error() statement
        in gdk_x11_image_destroy(). so for now, i did s/g_free/LEAK_IMAGE/
        to spot these places.
2001-06-23 20:26:10 +00:00
Owen Taylor
b09d194d3c Fixup some problems with text length handling in error cases.
Sat Jun 23 10:27:53 2001  Owen Taylor  <otaylor@redhat.com>

	* modules/input/gtkimcontextxim.c: Fixup some problems with
	text length handling in error cases.

	* gtk/gtkwidget.c (gtk_widget_size_allocate): Reorder
	a bit to make test actually warn on attempt to allocation
	a negative size. (#56101, Matthias Clasen)
2001-06-23 14:32:44 +00:00
Jonathan Blandford
7ab5f8c5a7 Fix bug noticed by Brian Cameron. (gtk_tree_view_real_expand_row): Fix bug
Fri Jun 22 14:06:08 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): Fix bug
	noticed by Brian Cameron.
	(gtk_tree_view_real_expand_row): Fix bug noticed by Brian
	Cameron.
2001-06-22 18:11:04 +00:00
Hans Breuer
03cadd29ac PNGs need to be binary (-kb) to be useable on windoze
2001-06-22  Hans Breuer  <hans@breuer.org>
	* gtk/stock-icons/stock_menu_sort_ascending.png : PNGs need to be
	binary (-kb) to be useable on windoze
2001-06-22 14:09:33 +00:00
Hans Breuer
f0ee2996e1 updated externals
2001-06-22  Hans Breuer  <hans@breuer.org>

	* gdk/gdk.def : updated externals

	* gdk/win32/gdkdrawable-win32.c : corrected some casts
	in GDK_NOTEs

	* gdk/win32/gdkevents-win32.c : use _gdk_windowing_window_get_offsets
	to translate coordinates to the internal > 16 bit system
	Try to handle WM_WINDOWPOSCHANGED to get better performance for
	when moving/resizing

	* gdk/win32/gdkkeys-win32.c : implement gdk_keymap_get_default ()
	and gdk_keymap_get_direction (). The latter is untested for
	the RTL case

	* gtk/gtk.def : updated externals

	* gtk/gtkmain.c : gtk_get_default_language () should reurn the result
	from pango_language_from_string (), not an already freed pointer

	* gtk/stock-icons/stock_menu_sort_ascending.png : PNGs need to be
	binary (-kb) to be useable on windoze
2001-06-22 14:08:51 +00:00
Alexander Larsson
c64a3e5b24 Update to new PangoLanguage changes.
2001-06-21  Alexander Larsson  <alexl@redhat.com>

	* gdk/linux-fb/gdkfont-fb.c (gdk_font_from_description):
	Update to new PangoLanguage changes.

	* gtk/gtkwindow-decorate.c:
	* gtk/gtkwindow.[ch]:
	Added setting argument to gtk_window_set_has_frame ()
2001-06-21 21:10:48 +00:00
Pablo Saratxaga
a16a53a15b updated Azeri file 2001-06-21 20:07:21 +00:00
Pablo Saratxaga
5c8bbbbb99 file gtkrc.iso-8859-3 was initially added on branch gtk-1-2. 2001-06-21 20:06:14 +00:00
Pablo Saratxaga
7a9a5c68fd file gtkrc.iso-8859-7 was initially added on branch gtk-1-2. 2001-06-21 20:06:14 +00:00
Pablo Saratxaga
90e317d027 file gtkrc.iso-8859-9 was initially added on branch gtk-1-2. 2001-06-21 20:06:14 +00:00
Pablo Saratxaga
d9858e59e3 file gtkrc.utf-8 was initially added on branch gtk-1-2. 2001-06-21 20:06:14 +00:00
Owen Taylor
d809ceee2e Handle the case without XKB properly.
Thu Jun 21 13:42:01 2001  Owen Taylor  <otaylor@redhat.com>

	* gdk/x11/gdkkeys-x11.c (gdk_keymap_get_direction): Handle
	the case without XKB properly.

	* gtk/gtkrc.c (gtk_rc_set_default_files): Remove
	unused gtk_rc_auto_parse variable.

	* gtk/gtkrc.[ch] gtk/gtkstyle.c docs/Changes-2.0.txt:
	Remove gtk_rc_set_image_loader(), gtk_rc_load_image(), no
	longer needed with GdkPixbuf.

	* gtk/gtkrc.c (_gtk_rc_init): Make private.
2001-06-21 17:45:26 +00:00
Owen Taylor
9c3c1cd3b5 Update a bit.
Thu Jun 21 12:31:29 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtk-sections.txt: Update a bit.

	* Makefile.am: build GTK+ docs.
2001-06-21 17:44:27 +00:00
Tim Janik
f1e23c4013 added gtk_container_child_set_property() and
Thu Jun 21 02:13:40 2001  Tim Janik  <timj@gtk.org>

        * gtk/gtkcontainer.[hc]: added gtk_container_child_set_property() and
        gtk_container_child_get_property().
2001-06-21 00:42:46 +00:00
Jonathan Blandford
10f3b34911 clean up (gtk_tree_view_move_cursor_page_up_down): implement.
Wed Jun 20 19:19:15 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_move_cursor_up_down): clean up
	(gtk_tree_view_move_cursor_page_up_down): implement.
2001-06-20 23:21:46 +00:00
Tim Janik
444bf88aba make maximum digits compile time configurable via MAX_DIGITS and up to 20.
Wed Jun 20 05:32:05 2001  Tim Janik  <timj@gtk.org>

        * gtk/gtkspinbutton.c: make maximum digits compile time configurable
        via MAX_DIGITS and up to 20. 5 was just ridiculously small.
        don't use automatic fixed size buffer for printf-ing floats, doubles
        can expand to really _huge_ strings, use g_strdup_printf() instead.
2001-06-20 04:13:37 +00:00
Tim Janik
9e171fcc95 hum, "adjustment" was a construct property in 1.2 and still needs to be.
Wed Jun 20 04:28:24 2001  Tim Janik  <timj@gtk.org>

        * gtk/gtkrange.c (gtk_range_class_init): hum, "adjustment" was a
        construct property in 1.2 and still needs to be.

        * gtk/gtkwidget.c: "composite_child" is not a settable property.
2001-06-20 02:34:23 +00:00
Jonathan Blandford
8413ee73e5 New functions to clear a model.
Tue Jun 19 19:13:19 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtkliststore.c (gtk_list_store_clear):
	* gtk/gtktreestore.c (gtk_tree_store_clear): New functions to
	clear a model.
2001-06-19 23:15:22 +00:00
Tim Janik
5ebd1d022a fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001  Tim Janik  <timj@gtk.org>

        * gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.

        * gtk/Makefile.am:
        * gtk/gtk.h: disabled GtkPacker compilation.

        * gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.

        * gtk/gtknotebook.c:
        * gtk/gtktable.c:
        * gtk/gtkbox.c: ported this over to child properties.

        * gtk/gtksettings.c: fetch class properties via
        g_object_class_list_properties().

        * gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
        child arg interface. use gobjectnotifyqueue.c for child property
        notification.

        * gtk/gtkwidget.[hc]: provide necessary means for container child
        properties, i.e. ::child_notify signal,
        gtk_widget_freeze_child_notify(),
        gtk_widget_child_notify(),
        gtk_widget_thaw_child_notify().

        * tests/testgtk.c: removed inferior property handling code, for
        property editing, a generic module should be used, and GLE
        coincidentally fullfills that purpose.

        * docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
        needs to be adapted to g_object_class_list_properties() before this
        builds again.
2001-06-19 12:54:10 +00:00
Jonathan Blandford
07ddd35c57 New function to test if a node is expanded.
Mon Jun 18 20:06:10 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_row_expanded): New function to
	test if a node is expanded.
2001-06-19 00:08:48 +00:00
Jonathan Blandford
5b3ed55f80 Fix bug where collapsing a selected row would result in the cursor/anchor
Mon Jun 18 19:41:38 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): Fix bug
	where collapsing a selected row would result in the cursor/anchor
	getting screwed up.
2001-06-18 23:44:41 +00:00
Jonathan Blandford
67f8b5bd46 Rename gtk_tree_sortable_sort_column_id_set_func. It's much shorter now.
Fri Jun 15 18:53:48 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreesortable.c (gtk_tree_sortable_set_sort_func): Rename
	gtk_tree_sortable_sort_column_id_set_func.  It's much shorter now.
	* gtk/gtktreeview.c (gtk_tree_view_sort_iter_changed): WOOO!!!
	Now I can really reorder/sort all Store widgets.  treesorttest
	seems to just work now.
	* gtk/gtklistview.c (gtk_list_store_iter_changed): Whoops.
	testtreesort worked through a big coincidence all this time.
	* gtk/gtkrbtree.c (_gtk_rbtree_reorder): Nasty bug fix in nasty
	code.
	* tests/testtreecolumns.c: Big 'ol warning at the top letting
	people know that this code should never ever ever be copied.

HA!

While everyone else was busy flaming eash other over configuration
engines, I secretly got sorting completely working with store widgets
and GtkTreeView.  GtkTreeModelSort, here I come!!!!!
2001-06-15 23:03:27 +00:00
Jonas Borgstrm
6adcae811b Fixed a small typo, it should be GTK_WINDOW_GROUP_GET_CLASS and not
2001-06-15  Jonas Borgstrm  <jonas@codefactory.se>

	* gtk/gtkwindow.h: Fixed a small typo, it should be
	GTK_WINDOW_GROUP_GET_CLASS and not GTK_WINDOW_GET_CLASS
	on line 134.
2001-06-15 18:58:58 +00:00
Havoc Pennington
85b23757b6 Docs fixups, and:
2001-06-14  Havoc Pennington  <hp@redhat.com>

        Docs fixups, and:

	* gtk/gtkcompat.h: remove GTK_DISABLE_COMPAT_H, replace with
	GTK_DISABLE_DEPRECATED
2001-06-15 18:25:42 +00:00
Alexander Larsson
46880b96cf Update to new PangoLanguage changes.
2001-06-15  Alexander Larsson  <alexl@redhat.com>

	* gdk/linux-fb/gdkfont-fb.c (gdk_font_from_description):
	Update to new PangoLanguage changes.

	* gtk/gtkwindow-decorate.c:
	* gtk/gtkwindow.[ch]:
	Added setting argument to gtk_window_set_has_frame ()
2001-06-15 15:58:26 +00:00
Jonathan Blandford
426ac9c6fe Whoops. Forgot this a couple months ago. Now GtkTreeStore sort of sorts.
Thu Jun 14 19:21:27 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreestore.c (gtk_tree_store_sort_helper): Whoops.  Forgot
	this a couple months ago.  Now GtkTreeStore sort of sorts.  I'll
	finish it off tonight, though it basically works now when it's a
	list.  Also, I have a sinking feeling neither GtkTreeStore or
	GtkListStore actually resort when adding a new item.  I'll look
	into it.
2001-06-14 23:25:52 +00:00
Havoc Pennington
c604648121 fix bug identified by warnings I just added to gtktextbuffer
2001-06-14  Havoc Pennington  <hp@redhat.com>

	* demos/gtk-demo/main.c (load_file): fix bug identified by
	warnings I just added to gtktextbuffer
2001-06-14 22:29:48 +00:00
Havoc Pennington
a002196773 fix other typo
2001-06-14  Havoc Pennington  <hp@redhat.com>

	* gtk/gtkwindow.c (window_group_cleanup_grabs): fix other typo

	* gtk/gtkwidget.c (gtk_widget_propagate_state): fix typo

	* gtk/gtktextbtree.c: don't leak node data all over the place.

	* demos/gtk-demo/main.c (main): create fontify tags for the right
	buffer

	* gtk/gtktextbuffer.c, gtk/gtktexttagtable.c: enhance docs
	to mention tags in the same table can't have the same name,
	suggested by Skip Montanaro

2001-06-11  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktexttagtable.c (gtk_text_tag_table_add): improve warning
	for trying to add two tags with same name to the tag table

	* demos/gtk-demo/main.c (main): fix colors ;-)
2001-06-14 22:25:23 +00:00
Owen Taylor
cf2fab9077 Add a GtkWindowGroup struct that allows grouping together multiple windows
Fri Jun  8 17:56:52 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwindow.[ch] gtk/gtkmain.c: Add a GtkWindowGroup struct
	that allows grouping together multiple windows so that grabs
	within that set of windows only affect those windows.

	* gtk/gtkmain.c gtk/gtkwidget.[ch]: Add a "grab_notify"
	signal for notification when a widget becomes shadowed
	by a grab or is no longer shadowed by a grab.

	* gtk/gtkwidget.c (gtk_widget_propagate_state)
	  gtk/gtkmain.c: (gtk_widget_grab_add): Don't allow
	insenstive widgets to maintain a grab.
2001-06-14 21:44:01 +00:00
Owen Taylor
22491fd6a4 Add missing gdk_rectangle_get_type() prototype.
Mon Jun 11 18:15:16 2001  Owen Taylor  <otaylor@redhat.com>

	* gdk/gdk.h: Add missing gdk_rectangle_get_type() prototype.

	* gtk/gtk[hv]scale.c: Include math.h, stdlib.h

	* gdk/gdkpango.h gtk/gtkclist.c gtk/gtkentry.c gtk/gtkmain.[ch]
	  gtk/gtkspinbutton.c gtk/gtkstyle.c gtk/gtktextbuffer.c
	  gtk/gtktextdisplay.c gtk/gtktextiter.[ch]
	  gtk/gtktextlayout.c gtk/gtktexttag.[ch] gtk/gtkwidget.c: Adapt
	  to recent changes in Pango.

	* tests/testgtk.c: Set language tags with gtk_label_set_markup()
	  to test whether the basic engine honors them.
2001-06-14 20:41:44 +00:00
Alexander Larsson
7d1a049bc3 Add some example config files that can be used with the URW fonts.
2001-06-14  Alexander Larsson  <alexl@redhat.com>

        * docs/README.linux-fb:
	Add some example config files that can be used with the URW fonts.

	* gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init):
	Set up the color ramps for DirectColor mode.
2001-06-14 18:10:01 +00:00
Havoc Pennington
6851448267 version to 1.3.6
2001-06-11  Havoc Pennington  <hp@redhat.com>

	* configure.in: version to 1.3.6
2001-06-14 16:34:21 +00:00
Havoc Pennington
5d7d584808 Release 1.3.6
2001-06-11  Havoc Pennington  <hp@redhat.com>

	* Release 1.3.6
2001-06-13 22:25:15 +00:00
Alexander Larsson
be12f52526 Unify shaped window code and make it repaint the area that used to be part
2001-06-13  Alexander Larsson  <alla@lysator.liu.se>

	* gdk/linux-fb/gdkwindow-fb.c:
	Unify shaped window code and make it repaint the area that used
	to be part of the shape, but isn't anymore.
2001-06-13 21:40:37 +00:00
Havoc Pennington
b858eb9f59 Updates
2001-06-11  Havoc Pennington  <hp@redhat.com>

	* NEWS: Updates

	* configure.in (GTK_MINOR_VERSION): bump version to 1.3.6

	* gtk/Makefile.am: glib_genmarshal already contains top_builddir
2001-06-13 21:24:09 +00:00
Alexander Larsson
b2ff45ef83 Don't pass on GDK_ACTION_DEFAULT. The Xdnd code passes zero instead, so do
2001-06-13  Alexander Larsson  <alla@lysator.liu.se>

	* gdk/linux-fb/gdkdnd-fb.c (gdk_drag_status):
	Don't pass on GDK_ACTION_DEFAULT. The Xdnd code
	passes zero instead, so do we.
2001-06-13 16:00:24 +00:00
Alexander Larsson
099da4d222 Deep copy dash_list too. (_gdk_fb_gc_new): Set default cap_style before
2001-06-13  Alexander Larsson  <alla@lysator.liu.se>

	* gdk/linux-fb/gdkgc-fb.c (gdk_gc_copy):
	Deep copy dash_list too.
	(_gdk_fb_gc_new): Set default cap_style before
	setting values.
2001-06-13 15:02:35 +00:00
Sven Neumann
2b448b8e37 shut up CVS 2001-06-13 14:04:16 +00:00
Alexander Larsson
a20b45995f New functions.
2001-06-12  Alexander Larsson  <alla@lysator.liu.se>

	* gdk/linux-fb/gdkkeyboard-fb.c (gdk_keymap_get_default,
	gdk_keymap_get_direction): New functions.
2001-06-12 19:22:43 +00:00
Jonathan Blandford
5c60d1cf77 further justify gtk_tree_model_get_flags by adding a second flag for atk.
Tue Jun 12 12:41:27 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreemodel.h (GTK_TREE_MODEL_LIST_ONLY): further justify
	gtk_tree_model_get_flags by adding a second flag for atk.

	* gtk/gtktreemodel.c: make cursor behavior interact better with
	mouse presses.
2001-06-12 18:12:08 +00:00
Jonathan Blandford
5f437331f1 changed expand_row/collapse_row to be 2 signals each -- test_expand_row
Mon Jun 11 12:43:08 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_class_init): changed
	expand_row/collapse_row to be 2 signals each -- test_expand_row
	and row_expanded as well as test_collapse_row and row_collapsed.
2001-06-11 16:59:28 +00:00
Anders Carlsson
5d58e47c53 Update signal name to be changed instead of selection_changed.
2001-06-10  Anders Carlsson  <andersca@codefactory.se>

	* demos/gtk-demo/stock_browser.c (do_stock_browser): Update
	signal name to be changed instead of selection_changed.
2001-06-10 09:57:55 +00:00
Havoc Pennington
994a8daae5 add read-only "scroll_offset" property for notification when the layout
2001-06-08  Havoc Pennington  <hp@redhat.com>

	* gtk/gtkentry.c (gtk_entry_class_init): add read-only
	"scroll_offset" property for notification when the layout offsets
	may have changed
	(gtk_entry_adjust_scroll): add notify for scroll_offset
	(gtk_entry_layout_index_to_text_index): function to compensate for
	preedit string when doing coordinate stuff on the entry's layout
	(gtk_entry_text_index_to_layout_index): inverse function
	(gtk_entry_get_layout_offsets): hook to get current position of
	the layout
	(gtk_entry_get_layout): hook to get the layout itself.

	* gtk/gtklabel.c (gtk_label_get_layout): new function
2001-06-09 00:12:00 +00:00
Jonathan Blandford
a055d0620d New keybinding. (gtk_tree_view_focus): Fix merge conflict.
Fri Jun  8 19:49:29 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): New
	keybinding.
	(gtk_tree_view_focus): Fix merge conflict.
2001-06-08 23:51:21 +00:00