rpms/gtk2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix blank toolitems in the evo composer

Browse Source
This commit is contained in:
Matthias Clasen 2009-01-24 22:03:26 +00:00
parent 1226971083
commit 072fd2cf19
2 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
activatable-toolitem.patch Normal file
View File

@ -0,0 +1,43 @@
Index: gtk/gtktoolbutton.c
===================================================================
--- gtk/gtktoolbutton.c (revision 22204)
+++ gtk/gtktoolbutton.c (working copy)
@@ -772,6 +772,7 @@ gtk_tool_button_activatable_update (GtkA
gtk_tool_button_set_label (button, NULL);
gtk_tool_button_set_icon_name (button, NULL);
}
+ gtk_tool_button_set_icon_widget (button, NULL);
gtk_tool_button_set_stock_id (button, gtk_action_get_stock_id (action));
}
else if (strcmp (property_name, "gicon") == 0)
@@ -812,6 +813,7 @@ gtk_tool_button_activatable_reset (GtkAc
{
GtkToolButton *button;
GIcon *icon;
+ const gchar *stock_id;
parent_activatable_iface->reset (activatable, action);
@@ -822,14 +824,15 @@ gtk_tool_button_activatable_reset (GtkAc
return;
button = GTK_TOOL_BUTTON (activatable);
-
- gtk_tool_button_set_label (button, NULL);
- gtk_tool_button_set_stock_id (button, NULL);
- gtk_tool_button_set_icon_name (button, NULL);
+ stock_id = gtk_action_get_stock_id (action);
+
+ gtk_tool_button_set_label (button, gtk_action_get_short_label (action));
gtk_tool_button_set_use_underline (button, TRUE);
-
- if (gtk_action_get_stock_id (action))
- gtk_tool_button_set_stock_id (button, gtk_action_get_stock_id (action));
+ gtk_tool_button_set_stock_id (button, stock_id);
+ gtk_tool_button_set_icon_name (button, gtk_action_get_icon_name (action));
+
+ if (stock_id && gtk_icon_factory_lookup_default (stock_id))
+ gtk_tool_button_set_icon_widget (button, NULL);
else if ((icon = gtk_action_get_gicon (action)) != NULL)
{
GtkIconSize icon_size = gtk_tool_item_get_icon_size (GTK_TOOL_ITEM (button));

10
gtk2.spec
View File

@ -16,7 +16,7 @@
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
Name: gtk2 Name: gtk2
Version: %{base_version} Version: %{base_version}
Release: 1%{?dist} Release: 2%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
Source: http://download.gnome.org/sources/gtk+/2.15/gtk+-%{version}.tar.bz2 Source: http://download.gnome.org/sources/gtk+/2.15/gtk+-%{version}.tar.bz2
@ -30,6 +30,8 @@ Patch0: gtk+-2.13.5-lib64.patch
Patch2: workaround.patch Patch2: workaround.patch
# http://bugzilla.redhat.com/show_bug.cgi?id=478400 # http://bugzilla.redhat.com/show_bug.cgi?id=478400
Patch3: default_printer.patch Patch3: default_printer.patch
# fixed upstream
Patch4: activatable-toolitem.patch
BuildRequires: atk-devel >= %{atk_version} BuildRequires: atk-devel >= %{atk_version}
BuildRequires: pango-devel >= %{pango_version} BuildRequires: pango-devel >= %{pango_version}
@ -116,7 +118,8 @@ GTK+ widget toolkit.
%patch0 -p1 -b .lib64 %patch0 -p1 -b .lib64
%patch2 -p1 -b .workaround %patch2 -p1 -b .workaround
%patch3 -p0 -b default-printer %patch3 -p0 -b .default-printer
%patch4 -p0 -b .activatable-toolitem
%build %build
libtoolize --force --copy libtoolize --force --copy
@ -294,6 +297,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-2.0 %{_datadir}/gtk-2.0
%changelog %changelog
* Sat Jan 24 2009 Matthias Clasen <mclasen@redhat.com> - 2.15.1-2
- Fix blank toolbuttons in the evolution composer
* Fri Jan 23 2009 Matthias Clasen <mclasen@redhat.com> - 2.15.1-1 * Fri Jan 23 2009 Matthias Clasen <mclasen@redhat.com> - 2.15.1-1
- Update to 2.15.1 - Update to 2.15.1