[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r106284: * gtkutil.c (xg_make_tool_it
From: |
Jan D. |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r106284: * gtkutil.c (xg_make_tool_item): Add callbacks of one of wimage or |
Date: |
Fri, 04 Nov 2011 19:18:05 +0100 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 106284
fixes bug(s): http://debbugs.gnu.org/9951
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Fri 2011-11-04 19:18:05 +0100
message:
* gtkutil.c (xg_make_tool_item): Add callbacks of one of wimage or
label is not null.
(xg_tool_item_stale_p): Handle the fact that wimage and/or wlbl
may be NULL.
modified:
src/ChangeLog
src/gtkutil.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-11-04 10:09:41 +0000
+++ b/src/ChangeLog 2011-11-04 18:18:05 +0000
@@ -1,3 +1,10 @@
+2011-11-04 Jan Djärv <address@hidden>
+
+ * gtkutil.c (xg_make_tool_item): Add callbacks of one of wimage or
+ label is not null (Bug#9951).
+ (xg_tool_item_stale_p): Handle the fact that wimage and/or wlbl
+ may be NULL.
+
2011-11-04 Eli Zaretskii <address@hidden>
* window.c (Fwindow_body_size): Mention in the doc string that the
=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c 2011-10-30 17:31:02 +0000
+++ b/src/gtkutil.c 2011-11-04 18:18:05 +0000
@@ -4237,7 +4237,7 @@
gtk_container_add (GTK_CONTAINER (weventbox), wb);
gtk_container_add (GTK_CONTAINER (ti), weventbox);
- if (wimage)
+ if (wimage || label)
{
intptr_t ii = i;
gpointer gi = (gpointer) ii;
@@ -4302,21 +4302,21 @@
GtkWidget *wlbl = xg_get_tool_bar_widgets (vb, &wimage);
/* Check if the tool icon matches. */
- if (stock_name)
+ if (stock_name && wimage)
{
old = g_object_get_data (G_OBJECT (wimage),
XG_TOOL_BAR_STOCK_NAME);
if (!old || strcmp (old, stock_name))
return 1;
}
- else if (icon_name)
+ else if (icon_name && wimage)
{
old = g_object_get_data (G_OBJECT (wimage),
XG_TOOL_BAR_ICON_NAME);
if (!old || strcmp (old, icon_name))
return 1;
}
- else
+ else if (wimage)
{
gpointer gold_img = g_object_get_data (G_OBJECT (wimage),
XG_TOOL_BAR_IMAGE_DATA);
@@ -4331,7 +4331,7 @@
return 1;
/* Ensure label is correct. */
- if (label)
+ if (label && wlbl)
gtk_label_set_text (GTK_LABEL (wlbl), label);
return 0;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r106284: * gtkutil.c (xg_make_tool_item): Add callbacks of one of wimage or,
Jan D. <=