changed some debugging messages to be prefixed by "Gdk:".

Tue Mar 17 16:19:47 1998  Tim Janik  <timj@gimp.org>

        * gdk/gdk.c:
                * gdk/gdkvisual.c: changed some debugging messages to be prefixed
                        by "Gdk:".

                                * gtk/gtkwidget.c (gtk_widget_real_draw): applied
                                        gtk-shige-980317-0.patch.gz to set all event fields, but modified
                                                the event.send_event field to be set to TRUE, since the event is not
                                                        really comming from the server.

                                                                * gtk/gtkwindow.c (gtk_window_init): applied gtk-ograf-980317-1.patch.gz
                                                                        which cares about an initial setting of program name and program class.

                                                                                * gdk/gdk.c (gdk_init): applied gtk-ograf-980317-0.patch.gz, which
                                                                                        strips leading pathnames from gdk_progname.

6 files changed, 28 insertions, 10 deletions

diff --git a/gdk/gdk.c b/gdk/gdk.c
index c75801b83b..9dcb75bde8 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -307,7 +307,17 @@ gdk_init (int    *argc,
   if (argc && argv)
     {
       if (*argc > 0)
-	gdk_progname = (*argv)[0];
+	{
+	  gchar *d;
+
+	  d = strrchr((*argv)[0],'/');
+	  if (d != NULL)
+	    gdk_progname = g_strdup (d + 1);
+	  else
+	    gdk_progname = g_strdup ((*argv)[0]);
+	  GDK_NOTE (MISC,
+		    g_print ("Gdk: progname: \"%s\"\n", gdk_progname));
+	}
 
       for (i = 1; i < *argc;)
 	{
@@ -474,7 +484,7 @@ gdk_init (int    *argc,
 
   connection_number = ConnectionNumber (gdk_display);
   GDK_NOTE (MISC,
-    g_print ("connection number: %d\n", connection_number));
+    g_print ("Gdk: connection number: %d\n", connection_number));
 
   if (synchronize)
     XSynchronize (gdk_display, True);
@@ -4013,7 +4023,7 @@ gdk_event_send_clientmessage_toall(GdkEvent *event)
     curwin = gdk_get_client_window(gdk_display, ret_children[i]);
     sev.xclient.window = curwin;
     if (!gdk_send_xevent (curwin, False, NoEventMask, &sev))
-      GDK_NOTE (MISC, g_print("Sending client message %ld to %#lx failed\n",
+      GDK_NOTE (MISC, g_print("Gdk: Sending client message %ld to %#lx failed\n",
 			     event->client.message_type, curwin));
   }
 
diff --git a/gdk/gdkvisual.c b/gdk/gdkvisual.c
index 16163dbddf..4a86e37739 100644
--- a/gdk/gdkvisual.c
+++ b/gdk/gdkvisual.c
@@ -204,7 +204,7 @@ gdk_visual_init ()
 #ifdef G_ENABLE_DEBUG 
   if (gdk_debug_flags & GDK_DEBUG_MISC)
     for (i = 0; i < nvisuals; i++)
-      g_print ("visual: %s: %d\n",
+      g_print ("Gdk: visual: %s: %d\n",
 	       visual_names[visuals[i].visual.type],
 	       visuals[i].visual.depth);
 #endif /* G_ENABLE_DEBUG */
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index e3680a95fe..5092070a2e 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -119,7 +119,6 @@ gdk_window_xid_at_coords(gint x, gint y, GList *excludes, gboolean excl_child)
    Window root,child=0,parent_win=0,root_win=0;
    unsigned int num;
    int i;
-   GList *gl;
    
    window=(GdkWindow*)&gdk_root_parent;
    private=(GdkWindowPrivate*)window;
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index c75801b83b..9dcb75bde8 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -307,7 +307,17 @@ gdk_init (int    *argc,
   if (argc && argv)
     {
       if (*argc > 0)
-	gdk_progname = (*argv)[0];
+	{
+	  gchar *d;
+
+	  d = strrchr((*argv)[0],'/');
+	  if (d != NULL)
+	    gdk_progname = g_strdup (d + 1);
+	  else
+	    gdk_progname = g_strdup ((*argv)[0]);
+	  GDK_NOTE (MISC,
+		    g_print ("Gdk: progname: \"%s\"\n", gdk_progname));
+	}
 
       for (i = 1; i < *argc;)
 	{
@@ -474,7 +484,7 @@ gdk_init (int    *argc,
 
   connection_number = ConnectionNumber (gdk_display);
   GDK_NOTE (MISC,
-    g_print ("connection number: %d\n", connection_number));
+    g_print ("Gdk: connection number: %d\n", connection_number));
 
   if (synchronize)
     XSynchronize (gdk_display, True);
@@ -4013,7 +4023,7 @@ gdk_event_send_clientmessage_toall(GdkEvent *event)
     curwin = gdk_get_client_window(gdk_display, ret_children[i]);
     sev.xclient.window = curwin;
     if (!gdk_send_xevent (curwin, False, NoEventMask, &sev))
-      GDK_NOTE (MISC, g_print("Sending client message %ld to %#lx failed\n",
+      GDK_NOTE (MISC, g_print("Gdk: Sending client message %ld to %#lx failed\n",
 			     event->client.message_type, curwin));
   }
 
diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
index 16163dbddf..4a86e37739 100644
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.c
@@ -204,7 +204,7 @@ gdk_visual_init ()
 #ifdef G_ENABLE_DEBUG 
   if (gdk_debug_flags & GDK_DEBUG_MISC)
     for (i = 0; i < nvisuals; i++)
-      g_print ("visual: %s: %d\n",
+      g_print ("Gdk: visual: %s: %d\n",
 	       visual_names[visuals[i].visual.type],
 	       visuals[i].visual.depth);
 #endif /* G_ENABLE_DEBUG */
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index e3680a95fe..5092070a2e 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -119,7 +119,6 @@ gdk_window_xid_at_coords(gint x, gint y, GList *excludes, gboolean excl_child)
    Window root,child=0,parent_win=0,root_win=0;
    unsigned int num;
    int i;
-   GList *gl;
    
    window=(GdkWindow*)&gdk_root_parent;
    private=(GdkWindowPrivate*)window;