gnome-terminal r2867 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Wed Jun  4 18:10:06 2008
New Revision: 2867
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2867&view=rev

Log:
Fix build with -DDEBUG_GEOMETRY.


Modified:
   trunk/src/terminal-screen.c
   trunk/src/terminal-window.c

Modified: trunk/src/terminal-screen.c
==============================================================================
--- trunk/src/terminal-screen.c	(original)
+++ trunk/src/terminal-screen.c	Wed Jun  4 18:10:06 2008
@@ -217,9 +217,9 @@
 
 #ifdef DEBUG_GEOMETRY
   if (old_parent)
-    g_signal_handlers_disconnect_by_func (old_parent, G_CALLBACK (parent_size_request), screen);
-  if (GTK_WIDGET (screen)->parent)
-    g_signal_connect (GTK_WIDGET (screen)->parent, "size-request", G_CALLBACK (parent_size_request), screen);
+    g_signal_handlers_disconnect_by_func (old_parent, G_CALLBACK (parent_size_request), widget);
+  if (widget->parent)
+    g_signal_connect (widget->parent, "size-request", G_CALLBACK (parent_size_request), widget);
 #endif
 }
 

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Wed Jun  4 18:10:06 2008
@@ -1942,7 +1942,7 @@
   if (priv->active_screen)
     {
 #ifdef DEBUG_GEOMETRY
-      g_fprintf (stderr,"setting size after toggling menubar visibility\n");
+      g_printerr ("setting size after toggling menubar visibility\n");
 #endif
       terminal_window_set_size (window, priv->active_screen, TRUE);
     }
@@ -2005,7 +2005,7 @@
   gtk_widget_size_request (widget, &widget_request);
 
 #ifdef DEBUG_GEOMETRY
-  g_fprintf (stderr,"set size: toplevel %dx%d widget %dx%d\n",
+  g_printerr ("set size: toplevel %dx%d widget %dx%d\n",
            toplevel_request.width, toplevel_request.height,
            widget_request.width, widget_request.height);
 #endif
@@ -2027,7 +2027,7 @@
   h += ypad + char_height * grid_height;
 
 #ifdef DEBUG_GEOMETRY
-  g_fprintf (stderr,"set size: grid %dx%d force %dx%d setting %dx%d pixels\n",
+  g_printerr ("set size: grid %dx%d force %dx%d setting %dx%d pixels\n",
            grid_width, grid_height, force_grid_width, force_grid_height, w, h);
 #endif
 
@@ -2086,7 +2086,7 @@
 
   /* set size of window to current grid size */
 #ifdef DEBUG_GEOMETRY
-  g_fprintf (stderr,"setting size after flipping notebook pages\n");
+  g_printerr ("setting size after flipping notebook pages\n");
 #endif
   terminal_window_set_size (window, screen, TRUE);
 
@@ -2347,7 +2347,7 @@
                                      GDK_HINT_BASE_SIZE);
 
 #ifdef DEBUG_GEOMETRY
-      g_fprintf (stderr,"hints: base %dx%d min %dx%d inc %d %d\n",
+      g_printerr ("hints: base %dx%d min %dx%d inc %d %d\n",
                hints.base_width,
                hints.base_height,
                hints.min_width,
@@ -2363,7 +2363,7 @@
 #ifdef DEBUG_GEOMETRY
   else
     {
-      g_fprintf (stderr,"hints: increment unchanged, not setting\n");
+      g_printerr ("hints: increment unchanged, not setting\n");
     }
 #endif
 }