diff -crN ./gedit/omf.make /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gedit/omf.make *** ./gedit/omf.make Thu Jan 1 01:00:00 1970 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gedit/omf.make Wed Jul 9 10:06:15 2003 *************** *** 0 **** --- 1,53 ---- + # + # No modifications of this Makefile should be necessary. + # + # This file contains the build instructions for installing OMF files. It is + # generally called from the makefiles for particular formats of documentation. + # + # Note that you must configure your package with --localstatedir=/var/lib + # so that the scrollkeeper-update command below will update the database + # in the standard scrollkeeper directory. + # + # If it is impossible to configure with --localstatedir=/var/lib, then + # modify the definition of scrollkeeper_localstate_dir so that + # it points to the correct location. Note that you must still use + # $(localstatedir) in this or when people build RPMs it will update + # the real database on their system instead of the one under RPM_BUILD_ROOT. + # + # Note: This make file is not incorporated into xmldocs.make because, in + # general, there will be other documents install besides XML documents + # and the makefiles for these formats should also include this file. + # + # About this file: + # This file was taken from scrollkeeper_example2, a package illustrating + # how to install documentation and OMF files for use with ScrollKeeper + # 0.3.x and 0.4.x. For more information, see: + # http://scrollkeeper.sourceforge.net/ + # Version: 0.1.2 (last updated: March 20, 2002) + # + + omf_dest_dir=$(datadir)/omf/@PACKAGE@ + scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper + + omf: omf_timestamp + + omf_timestamp: $(omffile) + -for file in $(omffile); do \ + scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \ + done + touch omf_timestamp + + install-data-hook-omf: + $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) + for file in $(omffile); do \ + $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ + done + -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + + uninstall-local-omf: + -for file in $(srcdir)/*.omf; do \ + basefile=`basename $$file`; \ + rm -f $(omf_dest_dir)/$$basefile; \ + done + -rmdir $(omf_dest_dir) + -scrollkeeper-update -p $(scrollkeeper_localstate_dir) diff -crN ./gedit/plugins/shell_output/shell_output.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gedit/plugins/shell_output/shell_output.c *** ./gedit/plugins/shell_output/shell_output.c Mon Dec 9 15:27:23 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gedit/plugins/shell_output/shell_output.c Wed Sep 3 18:57:41 2003 *************** *** 421,426 **** --- 421,433 ---- do { status = g_io_channel_read_line (ioc, &string, &len, &pos, &error); + if (len == 0) + { + /* G_IO_IN + EOF = G_IO_HUP + * -> the pipe is broken + */ + goto broken_pipe; + } while (gtk_events_pending ()) { *************** *** 502,507 **** --- 509,515 ---- gchar *line; gboolean done = FALSE; + broken_pipe: gedit_debug (DEBUG_PLUGINS, "2"); g_io_channel_shutdown (ioc, TRUE, NULL); diff -crN ./gedit/src/dialogs/gnome-print-font-picker.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gedit/src/dialogs/gnome-print-font-picker.c *** ./gedit/src/dialogs/gnome-print-font-picker.c Mon Jan 27 12:26:33 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gedit/src/dialogs/gnome-print-font-picker.c Wed Jul 9 10:13:53 2003 *************** *** 67,72 **** --- 67,73 ---- #include #include + /* [BT] xlC only accept signed, unsigned or int types for bit-fields */ struct _GnomePrintFontPickerPrivate { gchar *title; *************** *** 77,87 **** int use_font_in_label_size; ! GnomePrintFontPickerMode mode : 2; ! /* Only for GNOME_PRINT_FONT_PICKER_MODE_FONT_INFO */ ! gboolean use_font_in_label : 1; ! gboolean show_size : 1; GtkWidget *font_dialog; GtkWidget *inside; --- 78,91 ---- int use_font_in_label_size; ! /* GnomePrintFontPickerMode mode : 2; */ ! unsigned mode : 2; ! /* Only for GNOME_PRINT_FONT_PICKER_MODE_FONT_INFO */ ! /* gboolean use_font_in_label : 1;*/ ! /* gboolean show_size : 1; */ ! unsigned use_font_in_label : 1; ! unsigned show_size : 1; GtkWidget *font_dialog; GtkWidget *inside; diff -crN ./gedit/src/gedit-debug.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gedit/src/gedit-debug.h *** ./gedit/src/gedit-debug.h Fri Sep 27 11:14:57 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gedit/src/gedit-debug.h Wed Jul 9 10:14:24 2003 *************** *** 64,71 **** --- 64,73 ---- /* __FUNCTION_ is not defined in Irix according to David Kaelbling */ #ifndef __GNUC__ + #ifndef __FUNCTION__ #define __FUNCTION__ "" #endif + #endif #define DEBUG_VIEW GEDIT_DEBUG_VIEW, __FILE__, __LINE__, __FUNCTION__ #define DEBUG_UNDO GEDIT_DEBUG_UNDO, __FILE__, __LINE__, __FUNCTION__ diff -crN ./gedit/src/gedit-plugins-engine.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gedit/src/gedit-plugins-engine.c *** ./gedit/src/gedit-plugins-engine.c Thu Jan 2 23:43:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gedit/src/gedit-plugins-engine.c Wed Jul 9 10:14:57 2003 *************** *** 1,3 **** --- 1,4 ---- + /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * gedit-plugins-engine.c *************** *** 46,51 **** --- 47,55 ---- #define USER_GEDIT_PLUGINS_LOCATION ".gedit-2/plugins/" + #define SOEXT ("." G_MODULE_SUFFIX) + #define SOEXT_LEN (strlen (SOEXT)) + #define GEDIT_PLUGINS_ENGINE_BASE_KEY "/apps/gedit-2/plugins" #define SOEXT ("." G_MODULE_SUFFIX) diff -crN ./gedit/src/recent-files/egg-recent-item.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gedit/src/recent-files/egg-recent-item.c *** ./gedit/src/recent-files/egg-recent-item.c Sat Jan 4 19:14:26 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gedit/src/recent-files/egg-recent-item.c Thu Sep 4 17:45:09 2003 *************** *** 63,72 **** g_free (item); } ! void egg_recent_item_ref (EggRecentItem *item) { item->refcount++; } void --- 63,74 ---- g_free (item); } ! gpointer egg_recent_item_ref (EggRecentItem *item) { item->refcount++; + + return item; } void diff -crN ./gedit/src/recent-files/egg-recent-item.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gedit/src/recent-files/egg-recent-item.h *** ./gedit/src/recent-files/egg-recent-item.h Wed Oct 2 07:05:18 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gedit/src/recent-files/egg-recent-item.h Thu Sep 4 17:45:09 2003 *************** *** 34,40 **** /* constructors */ EggRecentItem * egg_recent_item_new (void); ! void egg_recent_item_ref (EggRecentItem *item); void egg_recent_item_unref (EggRecentItem *item); /* automatically fetches the mime type, etc */ --- 34,40 ---- /* constructors */ EggRecentItem * egg_recent_item_new (void); ! gpointer egg_recent_item_ref (EggRecentItem *item); void egg_recent_item_unref (EggRecentItem *item); /* automatically fetches the mime type, etc */