callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove accidentially committed debug spew.

Browse Source 
Mon Jan 12 00:10:20 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkuimanager.c: Remove accidentially committed debug spew.
This commit is contained in:
Matthias Clasen
2004-01-11 23:08:13 +00:00
committed by Matthias Clasen
parent 748b249e51
commit 93bc689cb0
6 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Mon Jan 12 00:10:20 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c: Remove accidentially committed debug spew.
Sun Jan 11 01:55:07 2004 Matthias Clasen <maclas@gmx.de> Sun Jan 11 01:55:07 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkaccelmap.c: Remove accidentally committed notification stuff. * gtk/gtkaccelmap.c: Remove accidentally committed notification stuff.

4
ChangeLog.pre-2-10
View File

@ -1,3 +1,7 @@
Mon Jan 12 00:10:20 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c: Remove accidentially committed debug spew.
Sun Jan 11 01:55:07 2004 Matthias Clasen <maclas@gmx.de> Sun Jan 11 01:55:07 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkaccelmap.c: Remove accidentally committed notification stuff. * gtk/gtkaccelmap.c: Remove accidentally committed notification stuff.

4
ChangeLog.pre-2-4
View File

@ -1,3 +1,7 @@
Mon Jan 12 00:10:20 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c: Remove accidentially committed debug spew.
Sun Jan 11 01:55:07 2004 Matthias Clasen <maclas@gmx.de> Sun Jan 11 01:55:07 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkaccelmap.c: Remove accidentally committed notification stuff. * gtk/gtkaccelmap.c: Remove accidentally committed notification stuff.

4
ChangeLog.pre-2-6
View File

@ -1,3 +1,7 @@
Mon Jan 12 00:10:20 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c: Remove accidentially committed debug spew.
Sun Jan 11 01:55:07 2004 Matthias Clasen <maclas@gmx.de> Sun Jan 11 01:55:07 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkaccelmap.c: Remove accidentally committed notification stuff. * gtk/gtkaccelmap.c: Remove accidentally committed notification stuff.

4
ChangeLog.pre-2-8
View File

@ -1,3 +1,7 @@
Mon Jan 12 00:10:20 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c: Remove accidentially committed debug spew.
Sun Jan 11 01:55:07 2004 Matthias Clasen <maclas@gmx.de> Sun Jan 11 01:55:07 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkaccelmap.c: Remove accidentally committed notification stuff. * gtk/gtkaccelmap.c: Remove accidentally committed notification stuff.

17
gtk/gtkuimanager.c
View File

@ -1580,7 +1580,6 @@ find_menu_position (GNode *node,
NODE_INFO (node)->type == NODE_TYPE_SEPARATOR, NODE_INFO (node)->type == NODE_TYPE_SEPARATOR,
FALSE); FALSE);
g_print ("find_menu_position %s\n", NODE_INFO (node)->name);
/* first sibling -- look at parent */ /* first sibling -- look at parent */
if (node->prev == NULL) if (node->prev == NULL)
{ {
@ -1604,7 +1603,6 @@ find_menu_position (GNode *node,
pos = 1; pos = 1;
else else
pos = 0; pos = 0;
g_print ("parent is menu, pos %d\n", pos);
g_list_free (siblings); g_list_free (siblings);
break; break;
case NODE_TYPE_MENU_PLACEHOLDER: case NODE_TYPE_MENU_PLACEHOLDER:
@ -1612,7 +1610,6 @@ find_menu_position (GNode *node,
g_return_val_if_fail (GTK_IS_MENU_SHELL (menushell), FALSE); g_return_val_if_fail (GTK_IS_MENU_SHELL (menushell), FALSE);
pos = g_list_index (GTK_MENU_SHELL (menushell)->children, pos = g_list_index (GTK_MENU_SHELL (menushell)->children,
NODE_INFO (parent)->proxy) + 1; NODE_INFO (parent)->proxy) + 1;
g_print ("parent is menu placeholder, pos %d\n", pos);
break; break;
default: default:
g_warning("%s: bad parent node type %d", G_STRLOC, g_warning("%s: bad parent node type %d", G_STRLOC,
@ -1636,9 +1633,6 @@ find_menu_position (GNode *node,
g_return_val_if_fail (GTK_IS_MENU_SHELL (menushell), FALSE); g_return_val_if_fail (GTK_IS_MENU_SHELL (menushell), FALSE);
pos = g_list_index (GTK_MENU_SHELL (menushell)->children, prev_child) + 1; pos = g_list_index (GTK_MENU_SHELL (menushell)->children, prev_child) + 1;
g_print ("previous is %s, pos %d\n",
NODE_INFO (sibling)->type == NODE_TYPE_MENU_PLACEHOLDER ? "placeholder" : "menuitem",
pos);
} }
if (menushell_p) if (menushell_p)
@ -1770,7 +1764,6 @@ update_smart_separators (GtkWidget *proxy)
{ {
GtkWidget *parent = NULL; GtkWidget *parent = NULL;
g_print ("update_smart_separators %s\n", gtk_widget_get_name (proxy));
if (GTK_IS_MENU (proxy) || GTK_IS_TOOLBAR (proxy)) if (GTK_IS_MENU (proxy) || GTK_IS_TOOLBAR (proxy))
parent = proxy; parent = proxy;
else if (GTK_IS_MENU_ITEM (proxy) || GTK_IS_TOOL_ITEM (proxy)) else if (GTK_IS_MENU_ITEM (proxy) || GTK_IS_TOOL_ITEM (proxy))
@ -1796,7 +1789,6 @@ update_smart_separators (GtkWidget *proxy)
cur = children; cur = children;
while (cur) while (cur)
{ {
g_print ("%d. %s\n", i++, G_OBJECT_TYPE_NAME (cur->data));
if (g_object_get_data (cur->data, "gtk-empty-menu-item")) if (g_object_get_data (cur->data, "gtk-empty-menu-item"))
filler = cur->data; filler = cur->data;
@ -1809,27 +1801,22 @@ update_smart_separators (GtkWidget *proxy)
switch (mode) switch (mode)
{ {
case SEPARATOR_MODE_VISIBLE: case SEPARATOR_MODE_VISIBLE:
g_print ("visible\n");
gtk_widget_show (GTK_WIDGET (cur->data)); gtk_widget_show (GTK_WIDGET (cur->data));
last = NULL; last = NULL;
visible = FALSE; visible = FALSE;
break; break;
case SEPARATOR_MODE_HIDDEN: case SEPARATOR_MODE_HIDDEN:
g_print ("hidden\n");
gtk_widget_hide (GTK_WIDGET (cur->data)); gtk_widget_hide (GTK_WIDGET (cur->data));
break; break;
case SEPARATOR_MODE_SMART: case SEPARATOR_MODE_SMART:
if (visible) if (visible)
{ {
g_print ("smart, visible\n");
gtk_widget_show (GTK_WIDGET (cur->data)); gtk_widget_show (GTK_WIDGET (cur->data));
last = cur; last = cur;
visible = FALSE; visible = FALSE;
} }
else else
{ g_print ("smart, hidden\n");
gtk_widget_hide (GTK_WIDGET (cur->data)); gtk_widget_hide (GTK_WIDGET (cur->data));
}
break; break;
} }
} }
@ -1848,10 +1835,8 @@ update_smart_separators (GtkWidget *proxy)
cur = cur->next; cur = cur->next;
} }
if (last) { if (last)
g_print ("hide last separator\n");
gtk_widget_hide (GTK_WIDGET (last->data)); gtk_widget_hide (GTK_WIDGET (last->data));
}
if (GTK_IS_MENU (parent)) if (GTK_IS_MENU (parent))
{ {