summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--ChangeLog.pre-2-102
-rw-r--r--gtk/gtksocket-x11.c4
-rwxr-xr-xgtk/gtkstatusicon.c2
4 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c12ae8f312..72500751e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2005-08-29 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtksocket-x11.c, gtk/gtkstatusicon-x11.c: Fix typos.
+
* gtk/gtkstatusicon-x11.c (gtk_status_icon_new_from_stock):
* gtk/gtkimage.c (gtk_image_new_from_stock): Don't
refer to nonexisting stock ids.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c12ae8f312..72500751e4 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,7 @@
2005-08-29 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtksocket-x11.c, gtk/gtkstatusicon-x11.c: Fix typos.
+
* gtk/gtkstatusicon-x11.c (gtk_status_icon_new_from_stock):
* gtk/gtkimage.c (gtk_image_new_from_stock): Don't
refer to nonexisting stock ids.
diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c
index 5dad07eeeb..0470a7c896 100644
--- a/gtk/gtksocket-x11.c
+++ b/gtk/gtksocket-x11.c
@@ -268,9 +268,9 @@ void
_gtk_socket_windowing_embed_notify (GtkSocket *socket)
{
#ifdef HAVE_XFIXES
- GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (socket);
+ GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (socket));
- XFixesChangeSaveSet (GDK_DISPLAY_XDISPLAY (display)),
+ XFixesChangeSaveSet (GDK_DISPLAY_XDISPLAY (display),
GDK_WINDOW_XWINDOW (socket->plug_window),
SetModeInsert, SaveSetRoot, SaveSetUnmap);
#endif
diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index f0b01b112f..d1f48458bd 100755
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -811,7 +811,7 @@ gtk_status_icon_set_from_pixbuf (GtkStatusIcon *status_icon,
gtk_status_icon_set_image (status_icon, GTK_IMAGE_PIXBUF,
(gpointer) pixbuf);
}
-v
+
/**
* gtk_status_icon_set_from_file:
* @status_icon: a #GtkStatusIcon