diff --git a/ChangeLog b/ChangeLog index 3d592b3596..534a7feffe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Dec 15 09:22:44 1998 Owen Taylor + + * gtk/gtkrc.c (gtk_rc_init): Removed unused + variable, fixed minor memory leak. + + * gdk/gdk.c: Fixed another merge problem. + Tue Dec 15 08:53:38 1998 Owen Taylor * gdk/gdk.c (gdk_get_display): Remove gdk_signal, diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3d592b3596..534a7feffe 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Tue Dec 15 09:22:44 1998 Owen Taylor + + * gtk/gtkrc.c (gtk_rc_init): Removed unused + variable, fixed minor memory leak. + + * gdk/gdk.c: Fixed another merge problem. + Tue Dec 15 08:53:38 1998 Owen Taylor * gdk/gdk.c (gdk_get_display): Remove gdk_signal, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3d592b3596..534a7feffe 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Tue Dec 15 09:22:44 1998 Owen Taylor + + * gtk/gtkrc.c (gtk_rc_init): Removed unused + variable, fixed minor memory leak. + + * gdk/gdk.c: Fixed another merge problem. + Tue Dec 15 08:53:38 1998 Owen Taylor * gdk/gdk.c (gdk_get_display): Remove gdk_signal, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3d592b3596..534a7feffe 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Tue Dec 15 09:22:44 1998 Owen Taylor + + * gtk/gtkrc.c (gtk_rc_init): Removed unused + variable, fixed minor memory leak. + + * gdk/gdk.c: Fixed another merge problem. + Tue Dec 15 08:53:38 1998 Owen Taylor * gdk/gdk.c (gdk_get_display): Remove gdk_signal, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3d592b3596..534a7feffe 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Tue Dec 15 09:22:44 1998 Owen Taylor + + * gtk/gtkrc.c (gtk_rc_init): Removed unused + variable, fixed minor memory leak. + + * gdk/gdk.c: Fixed another merge problem. + Tue Dec 15 08:53:38 1998 Owen Taylor * gdk/gdk.c (gdk_get_display): Remove gdk_signal, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3d592b3596..534a7feffe 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Tue Dec 15 09:22:44 1998 Owen Taylor + + * gtk/gtkrc.c (gtk_rc_init): Removed unused + variable, fixed minor memory leak. + + * gdk/gdk.c: Fixed another merge problem. + Tue Dec 15 08:53:38 1998 Owen Taylor * gdk/gdk.c (gdk_get_display): Remove gdk_signal, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3d592b3596..534a7feffe 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Tue Dec 15 09:22:44 1998 Owen Taylor + + * gtk/gtkrc.c (gtk_rc_init): Removed unused + variable, fixed minor memory leak. + + * gdk/gdk.c: Fixed another merge problem. + Tue Dec 15 08:53:38 1998 Owen Taylor * gdk/gdk.c (gdk_get_display): Remove gdk_signal, diff --git a/gdk/gdk.c b/gdk/gdk.c index f5a68bac23..97c2a8c229 100644 --- a/gdk/gdk.c +++ b/gdk/gdk.c @@ -1041,25 +1041,6 @@ gdk_x_io_error (Display *display) return 0; } -/* Sends a ClientMessage to all toplevel client windows */ -gboolean -gdk_event_send_client_message (GdkEvent *event, guint32 xid) -{ - XEvent sev; - - g_return_val_if_fail(event != NULL, FALSE); - - /* Set up our event to send, with the exception of its target window */ - sev.xclient.type = ClientMessage; - sev.xclient.display = gdk_display; - sev.xclient.format = event->client.data_format; - sev.xclient.window = xid; - memcpy(&sev.xclient.data, &event->client.data, sizeof(sev.xclient.data)); - sev.xclient.message_type = event->client.message_type; - - return gdk_send_xevent (xid, False, NoEventMask, &sev); -} - gchar * gdk_get_display(void) { diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c index f5a68bac23..97c2a8c229 100644 --- a/gdk/x11/gdkmain-x11.c +++ b/gdk/x11/gdkmain-x11.c @@ -1041,25 +1041,6 @@ gdk_x_io_error (Display *display) return 0; } -/* Sends a ClientMessage to all toplevel client windows */ -gboolean -gdk_event_send_client_message (GdkEvent *event, guint32 xid) -{ - XEvent sev; - - g_return_val_if_fail(event != NULL, FALSE); - - /* Set up our event to send, with the exception of its target window */ - sev.xclient.type = ClientMessage; - sev.xclient.display = gdk_display; - sev.xclient.format = event->client.data_format; - sev.xclient.window = xid; - memcpy(&sev.xclient.data, &event->client.data, sizeof(sev.xclient.data)); - sev.xclient.message_type = event->client.message_type; - - return gdk_send_xevent (xid, False, NoEventMask, &sev); -} - gchar * gdk_get_display(void) { diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 1b33c235e5..0306cf4be5 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -449,12 +449,12 @@ gtk_rc_init (void) */ for (j=n_locale_suffixes-1; j>=0; j--) { - struct stat statbuf; gchar *name = g_strconcat (gtk_rc_default_files[i], ".", locale_suffixes[j], NULL); gtk_rc_parse (name); + g_free (name); } gtk_rc_parse (gtk_rc_default_files[i]);