diff --git a/ChangeLog b/ChangeLog index 801c010ee2..98c10c8fe1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Feb 19 18:53:51 1998 Larry Ewing + + * removed g_warnings from the common XShm failure cases in gdkimage.c + 1998-02-19 Federico Mena Quintero * gtk/gtkcombo.c (gtk_combo_entry_key_press): Added M-p and M-n diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 801c010ee2..98c10c8fe1 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +Thu Feb 19 18:53:51 1998 Larry Ewing + + * removed g_warnings from the common XShm failure cases in gdkimage.c + 1998-02-19 Federico Mena Quintero * gtk/gtkcombo.c (gtk_combo_entry_key_press): Added M-p and M-n diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 801c010ee2..98c10c8fe1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +Thu Feb 19 18:53:51 1998 Larry Ewing + + * removed g_warnings from the common XShm failure cases in gdkimage.c + 1998-02-19 Federico Mena Quintero * gtk/gtkcombo.c (gtk_combo_entry_key_press): Added M-p and M-n diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 801c010ee2..98c10c8fe1 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +Thu Feb 19 18:53:51 1998 Larry Ewing + + * removed g_warnings from the common XShm failure cases in gdkimage.c + 1998-02-19 Federico Mena Quintero * gtk/gtkcombo.c (gtk_combo_entry_key_press): Added M-p and M-n diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 801c010ee2..98c10c8fe1 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +Thu Feb 19 18:53:51 1998 Larry Ewing + + * removed g_warnings from the common XShm failure cases in gdkimage.c + 1998-02-19 Federico Mena Quintero * gtk/gtkcombo.c (gtk_combo_entry_key_press): Added M-p and M-n diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 801c010ee2..98c10c8fe1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +Thu Feb 19 18:53:51 1998 Larry Ewing + + * removed g_warnings from the common XShm failure cases in gdkimage.c + 1998-02-19 Federico Mena Quintero * gtk/gtkcombo.c (gtk_combo_entry_key_press): Added M-p and M-n diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 801c010ee2..98c10c8fe1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +Thu Feb 19 18:53:51 1998 Larry Ewing + + * removed g_warnings from the common XShm failure cases in gdkimage.c + 1998-02-19 Federico Mena Quintero * gtk/gtkcombo.c (gtk_combo_entry_key_press): Added M-p and M-n diff --git a/gdk/gdkimage.c b/gdk/gdkimage.c index 0e4caab797..1a7273bc5a 100644 --- a/gdk/gdkimage.c +++ b/gdk/gdkimage.c @@ -136,7 +136,6 @@ gdk_image_init () { if (!gdk_image_check_xshm (gdk_display)) { - g_warning ("MIT-SHM Extension not availible on server"); gdk_use_xshm = False; } } @@ -213,7 +212,6 @@ gdk_image_new (GdkImageType type, g_free (private->x_shm_info); g_free (image); - gdk_use_xshm = False; gdk_use_xshm = False; return NULL; } @@ -249,8 +247,7 @@ gdk_image_new (GdkImageType type, gdk_error_warnings = 1; if (gdk_error_code == -1) { - g_warning ("XShmAttach failed!"); - + /* this is the common failure case so omit warning */ XDestroyImage (private->ximage); shmdt (x_shm_info->shmaddr); shmctl (x_shm_info->shmid, IPC_RMID, 0); diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c index 0e4caab797..1a7273bc5a 100644 --- a/gdk/x11/gdkimage-x11.c +++ b/gdk/x11/gdkimage-x11.c @@ -136,7 +136,6 @@ gdk_image_init () { if (!gdk_image_check_xshm (gdk_display)) { - g_warning ("MIT-SHM Extension not availible on server"); gdk_use_xshm = False; } } @@ -213,7 +212,6 @@ gdk_image_new (GdkImageType type, g_free (private->x_shm_info); g_free (image); - gdk_use_xshm = False; gdk_use_xshm = False; return NULL; } @@ -249,8 +247,7 @@ gdk_image_new (GdkImageType type, gdk_error_warnings = 1; if (gdk_error_code == -1) { - g_warning ("XShmAttach failed!"); - + /* this is the common failure case so omit warning */ XDestroyImage (private->ximage); shmdt (x_shm_info->shmaddr); shmctl (x_shm_info->shmid, IPC_RMID, 0);