gatuno
/
gatuno-terminal
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

remove debug callbacks for deprecated size-request signal

master-1.22
Sorokin Alexei 2016-03-08 02:45:13 +03:00
parent c0efce1fb0
commit a3d1c5f081
3 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/terminal-screen-container.c
View File

@ -100,13 +100,13 @@ terminal_screen_container_set_placement_set (TerminalScreenContainer *container,
#if defined(USE_SCROLLED_WINDOW) && defined(MATE_ENABLE_DEBUG) #if defined(USE_SCROLLED_WINDOW) && defined(MATE_ENABLE_DEBUG)
static void static void
size_request_cb (GtkWidget *widget, size_allocate_cb (GtkWidget *widget,
GtkRequisition *req, GdkRectangle *rect,
TerminalScreenContainer *container) TerminalScreenContainer *container)
{ {
_terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY,
"[screen %p] scrolled-window size req %d : %d\n", "[screen %p] scrolled-window size alloc %d : %d\n",
container->priv->screen, req->width, req->height); container->priv->screen, rect->width, rect->height);
} }
#endif #endif
@ -162,7 +162,7 @@ terminal_screen_container_constructor (GType type,
gtk_widget_show (priv->scrolled_window); gtk_widget_show (priv->scrolled_window);
#ifdef MATE_ENABLE_DEBUG #ifdef MATE_ENABLE_DEBUG
g_signal_connect (priv->scrolled_window, "size-request", G_CALLBACK (size_request_cb), container); g_signal_connect (priv->scrolled_window, "size-allocate", G_CALLBACK (size_allocate_cb), container);
#endif #endif
#else #else

10
src/terminal-screen.c
View File

@ -343,15 +343,6 @@ terminal_screen_style_set (GtkWidget *widget,
} }
#ifdef MATE_ENABLE_DEBUG #ifdef MATE_ENABLE_DEBUG
static void
size_request (GtkWidget *widget,
GtkRequisition *req)
{
_terminal_debug_print (TERMINAL_DEBUG_GEOMETRY,
"[screen %p] size-request %d : %d\n",
widget, req->width, req->height);
}
static void static void
size_allocate (GtkWidget *widget, size_allocate (GtkWidget *widget,
GtkAllocation *allocation) GtkAllocation *allocation)
@ -436,7 +427,6 @@ terminal_screen_init (TerminalScreen *screen)
#ifdef MATE_ENABLE_DEBUG #ifdef MATE_ENABLE_DEBUG
_TERMINAL_DEBUG_IF (TERMINAL_DEBUG_GEOMETRY) _TERMINAL_DEBUG_IF (TERMINAL_DEBUG_GEOMETRY)
{ {
g_signal_connect_after (screen, "size-request", G_CALLBACK (size_request), NULL);
g_signal_connect_after (screen, "size-allocate", G_CALLBACK (size_allocate), NULL); g_signal_connect_after (screen, "size-allocate", G_CALLBACK (size_allocate), NULL);
} }
#endif #endif

10
src/terminal-window.c
View File

@ -1517,15 +1517,6 @@ terminal_window_accel_activate_cb (GtkAccelGroup *accel_group,
/*****************************************/ /*****************************************/
#ifdef MATE_ENABLE_DEBUG #ifdef MATE_ENABLE_DEBUG
static void
terminal_window_size_request_cb (GtkWidget *widget,
GtkRequisition *req)
{
_terminal_debug_print (TERMINAL_DEBUG_GEOMETRY,
"[window %p] size-request result %d : %d\n",
widget, req->width, req->height);
}
static void static void
terminal_window_size_allocate_cb (GtkWidget *widget, terminal_window_size_allocate_cb (GtkWidget *widget,
GtkAllocation *allocation) GtkAllocation *allocation)
@ -2071,7 +2062,6 @@ terminal_window_init (TerminalWindow *window)
#ifdef MATE_ENABLE_DEBUG #ifdef MATE_ENABLE_DEBUG
_TERMINAL_DEBUG_IF (TERMINAL_DEBUG_GEOMETRY) _TERMINAL_DEBUG_IF (TERMINAL_DEBUG_GEOMETRY)
{ {
g_signal_connect_after (window, "size-request", G_CALLBACK (terminal_window_size_request_cb), NULL);
g_signal_connect_after (window, "size-allocate", G_CALLBACK (terminal_window_size_allocate_cb), NULL); g_signal_connect_after (window, "size-allocate", G_CALLBACK (terminal_window_size_allocate_cb), NULL);
} }
#endif #endif