diff -w -ru gnome-core-1.4.0.4.orig/applets/gen_util/clock.c gnome-core-1.4.0.4/applets/gen_util/clock.c --- gnome-core-1.4.0.4.orig/applets/gen_util/clock.c Thu Feb 8 22:40:46 2001 +++ gnome-core-1.4.0.4/applets/gen_util/clock.c Tue May 15 17:34:21 2001 @@ -30,7 +30,7 @@ enum { TARGET_STRING, TARGET_TEXT, - TARGET_COMPOUND_TEXT, + TARGET_COMPOUND_TEXT }; typedef struct _ClockData ClockData; diff -w -ru gnome-core-1.4.0.4.orig/gnome-terminal/gnome-terminal.c gnome-core-1.4.0.4/gnome-terminal/gnome-terminal.c --- gnome-core-1.4.0.4.orig/gnome-terminal/gnome-terminal.c Thu Apr 19 14:46:47 2001 +++ gnome-core-1.4.0.4/gnome-terminal/gnome-terminal.c Tue May 15 17:18:03 2001 @@ -2606,11 +2606,12 @@ SHADED_KEY = -21, NOSHADED_KEY = -22, TRANSPARENT_KEY = -23, - SOLID_KEY = -24, + SOLID_KEY = -24 #ifdef ZVT_BACKGROUND_SCROLL + , BGSCROLL_PIXMAP_KEY = -25, - BGNOSCROLL_PIXMAP_KEY = -26, + BGNOSCROLL_PIXMAP_KEY = -26 #endif }; diff -w -ru gnome-core-1.4.0.4.orig/gsm/ice.c gnome-core-1.4.0.4/gsm/ice.c --- gnome-core-1.4.0.4.orig/gsm/ice.c Mon Feb 5 15:14:11 2001 +++ gnome-core-1.4.0.4/gsm/ice.c Tue May 15 15:35:52 2001 @@ -52,9 +52,9 @@ GSList *auth_entries; /* The "sockets" which we listen on */ -static IceListenObj *sockets; +static IceListenObj *isockets; static gint *input_id; -static gint num_sockets; +static gint num_isockets; /* File containing the ICE authorization data (usually ~/.ICEauthority) */ static gchar* authfile; @@ -182,9 +182,9 @@ entries = read_authfile (authfile); - for (i = 0; i < num_sockets; i++) + for (i = 0; i < num_isockets; i++) { - char* network_id = IceGetListenConnectionString (sockets[i]); + char* network_id = IceGetListenConnectionString (isockets[i]); GSList* list = entries; while (list) @@ -229,7 +229,7 @@ for (i = 1; i < 256; i++){ g_snprintf (buffer, sizeof (buffer), "-%d", i); - if (IceListenForWellKnownConnections (buffer, &num_sockets, &sockets, sizeof(error), error)) + if (IceListenForWellKnownConnections (buffer, &num_isockets, &isockets, sizeof(error), error)) return TRUE; } return FALSE; @@ -275,7 +275,7 @@ _IceTransNoListen ("tcp"); #endif } - if (IceListenForConnections (&num_sockets, &sockets, + if (IceListenForConnections (&num_isockets, &isockets, sizeof(error), error)) init_error = FALSE; } @@ -288,7 +288,7 @@ /* See above. */ umask (saved_umask); - input_id = g_new (gint, num_sockets); + input_id = g_new (gint, num_isockets); authfile = IceAuthFileName (); @@ -296,14 +296,14 @@ entries = read_authfile (authfile); - for (i = 0; i < num_sockets; i++) + for (i = 0; i < num_isockets; i++) { /* Clean up any stale cookies assigned to this socket: * (ice_clean does this but only if we get the chance to call it) * FIXME: clean up ALL the stale cookies - this means working out * a way of identifying them. */ - char* network_id = IceGetListenConnectionString (sockets[i]); + char* network_id = IceGetListenConnectionString (isockets[i]); GSList* list = entries; while (list) @@ -320,20 +320,20 @@ free (network_id); - APPEND (entries, file_entry_new ("ICE", sockets[i])); - APPEND (entries, file_entry_new ("XSMP", sockets[i])); + APPEND (entries, file_entry_new ("ICE", isockets[i])); + APPEND (entries, file_entry_new ("XSMP", isockets[i])); - input_id[i] = gdk_input_add (IceGetListenConnectionNumber (sockets[i]), + input_id[i] = gdk_input_add (IceGetListenConnectionNumber (isockets[i]), GDK_INPUT_READ, accept_connection, - (gpointer) sockets[i]); + (gpointer) isockets[i]); - IceSetHostBasedAuthProc (sockets[i], auth_proc); + IceSetHostBasedAuthProc (isockets[i], auth_proc); } write_authfile (authfile, entries); auth_entries = entries; - ids = IceComposeNetworkIdList (num_sockets, sockets); + ids = IceComposeNetworkIdList (num_isockets, isockets); p = g_strconcat (ENVNAME "=", ids, NULL); putenv (p); @@ -347,9 +347,9 @@ entries = read_authfile (authfile); - for (i = 0; i < num_sockets; i++) + for (i = 0; i < num_isockets; i++) { - char* network_id = IceGetListenConnectionString (sockets[i]); + char* network_id = IceGetListenConnectionString (isockets[i]); GSList* list = entries; while (list) @@ -372,7 +372,7 @@ g_free (input_id); free (ids); - IceFreeListenObjs (num_sockets, sockets); + IceFreeListenObjs (num_isockets, isockets); } /* Creates a new entry for inclusion in the ICE authority file and @@ -417,7 +417,7 @@ if (IceLockAuthFile (filename, 10, 2, 600) != IceAuthLockSuccess) { g_warning ("Unable to lock ICE authority file: %s", filename); - IceFreeListenObjs (num_sockets, sockets); + IceFreeListenObjs (num_isockets, isockets); exit (1); } @@ -437,7 +437,7 @@ { g_warning ("Unable to read ICE authority file: %s", filename); IceUnlockAuthFile (filename); - IceFreeListenObjs (num_sockets, sockets); + IceFreeListenObjs (num_isockets, isockets); exit (1); } } @@ -463,7 +463,7 @@ } else { g_warning ("Unable to write to ICE authority file: %s", filename); IceUnlockAuthFile (filename); - IceFreeListenObjs (num_sockets, sockets); + IceFreeListenObjs (num_isockets, isockets); exit (1); } IceUnlockAuthFile (filename); diff -w -ru gnome-core-1.4.0.4.orig/gsm/session-properties-capplet.c gnome-core-1.4.0.4/gsm/session-properties-capplet.c --- gnome-core-1.4.0.4.orig/gsm/session-properties-capplet.c Mon Feb 26 08:31:48 2001 +++ gnome-core-1.4.0.4/gsm/session-properties-capplet.c Tue May 15 16:58:21 2001 @@ -36,7 +36,7 @@ /* Current state */ GSList *deleted_sessions = NULL; -static gboolean autosave; +gboolean autosave; static gboolean autosave_revert; static gboolean logout_prompt; diff -w -ru gnome-core-1.4.0.4.orig/help-browser/transport.c gnome-core-1.4.0.4/help-browser/transport.c --- gnome-core-1.4.0.4.orig/help-browser/transport.c Mon Jan 29 11:49:35 2001 +++ gnome-core-1.4.0.4/help-browser/transport.c Tue May 15 17:11:43 2001 @@ -11,6 +11,8 @@ #include #include +#include + #include #include "transport.h" @@ -19,7 +21,6 @@ #include "misc.h" #include "cache.h" #include "gnome-helpwin.h" -#include static int getHostByName(const char *host, struct in_addr *address); diff -w -ru gnome-core-1.4.0.4.orig/panel/gnome-panel-skels.c gnome-core-1.4.0.4/panel/gnome-panel-skels.c --- gnome-core-1.4.0.4.orig/panel/gnome-panel-skels.c Thu May 3 21:23:24 2001 +++ gnome-core-1.4.0.4/panel/gnome-panel-skels.c Tue May 15 17:18:53 2001 @@ -127,7 +127,7 @@ } if (ev->_major == CORBA_NO_EXCEPTION) CORBA_Object_release(_ORBIT_retval, ev); - CORBA_Object_release((CORBA_Object) panel_applet, ev); + CORBA_Object_release(panel_applet, ev); if (ev->_major == CORBA_NO_EXCEPTION) CORBA_free(cfgpath); if (ev->_major == CORBA_NO_EXCEPTION) @@ -271,7 +271,7 @@ } if (ev->_major == CORBA_NO_EXCEPTION) CORBA_Object_release(_ORBIT_retval, ev); - CORBA_Object_release((CORBA_Object) panel_applet, ev); + CORBA_Object_release(panel_applet, ev); if (ev->_major == CORBA_NO_EXCEPTION) CORBA_free(cfgpath); if (ev->_major == CORBA_NO_EXCEPTION) @@ -802,7 +802,7 @@ } } _impl_launch_an_applet(_ORBIT_servant, goad_id, booter, ev); - CORBA_Object_release((CORBA_Object) booter, ev); + CORBA_Object_release(booter, ev); } void @@ -932,7 +932,7 @@ } if (ev->_major == CORBA_NO_EXCEPTION) CORBA_Object_release(_ORBIT_retval, ev); - CORBA_Object_release((CORBA_Object) panel_applet, ev); + CORBA_Object_release(panel_applet, ev); if (ev->_major == CORBA_NO_EXCEPTION) CORBA_free(cfgpath); if (ev->_major == CORBA_NO_EXCEPTION) diff -w -ru gnome-core-1.4.0.4.orig/panel/gnome-panel.h gnome-core-1.4.0.4/panel/gnome-panel.h --- gnome-core-1.4.0.4.orig/panel/gnome-panel.h Thu May 3 21:23:25 2001 +++ gnome-core-1.4.0.4/panel/gnome-panel.h Tue May 15 17:18:53 2001 @@ -175,8 +175,6 @@ CORBA_boolean _release; } CORBA_sequence_CORBA_octet; - CORBA_octet *CORBA_sequence_CORBA_octet_allocbuf(CORBA_unsigned_long len); -#endif #if !defined(TC_IMPL_TC_CORBA_sequence_CORBA_octet_0) #define TC_IMPL_TC_CORBA_sequence_CORBA_octet_0 'g' #define TC_IMPL_TC_CORBA_sequence_CORBA_octet_1 'n' @@ -195,6 +193,8 @@ #endif extern CORBA_sequence_CORBA_octet *CORBA_sequence_CORBA_octet__alloc(void); extern gpointer CORBA_sequence_CORBA_octet__free(gpointer mem, gpointer dat, CORBA_boolean free_strings); /* ORBit internal use */ + CORBA_octet *CORBA_sequence_CORBA_octet_allocbuf(CORBA_unsigned_long len); +#endif #if !defined(_GNOME_Panel_RgbData_defined) #define _GNOME_Panel_RgbData_defined 1 typedef CORBA_sequence_CORBA_octet GNOME_Panel_RgbData; diff -w -ru gnome-core-1.4.0.4.orig/panel/menu.c gnome-core-1.4.0.4/panel/menu.c --- gnome-core-1.4.0.4.orig/panel/menu.c Wed May 9 10:24:00 2001 +++ gnome-core-1.4.0.4/panel/menu.c Tue May 15 17:26:42 2001 @@ -20,8 +20,8 @@ #include #include #include -#include #include +#include #include "panel-include.h" #include "panel-widget.h"