rpms/gnome-media/devel icons.patch, NONE, 1.1 gnome-media.spec, 1.108, 1.109
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Wed Sep 19 05:40:09 UTC 2007
Author: mclasen
Update of /cvs/extras/rpms/gnome-media/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4992
Modified Files:
gnome-media.spec
Added Files:
icons.patch
Log Message:
- Don't add extra categories to volume control, since
upstream has moved it to Hardware (#295251)
- Make icons show up again (#295171)
icons.patch:
--- NEW FILE icons.patch ---
diff -up gnome-media-2.20.0/gnome-cd/gnome-cd.c.icons gnome-media-2.20.0/gnome-cd/gnome-cd.c
--- gnome-media-2.20.0/gnome-cd/gnome-cd.c.icons 2007-08-09 09:52:53.000000000 -0400
+++ gnome-media-2.20.0/gnome-cd/gnome-cd.c 2007-09-19 01:36:51.000000000 -0400
@@ -294,15 +294,18 @@ make_button_from_widget (GnomeCD *gcd,
}
static GtkWidget *
-make_button_from_icon_name (GnomeCD *gcd,
- const char *icon_name,
+make_button_from_stock (GnomeCD *gcd,
+ const char *stock,
GCallback func,
const char *tooltip,
const char *shortname)
{
GtkWidget *pixmap;
- pixmap = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
+ if (gtk_icon_factory_lookup_default (stock))
+ pixmap = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_BUTTON);
+ else
+ pixmap = gtk_image_new_from_icon_name (stock, GTK_ICON_SIZE_BUTTON);
return make_button_from_widget (gcd, pixmap, func, tooltip, shortname);
}
@@ -401,7 +404,10 @@ make_popup_menu (GnomeCD *gcd, GdkEventB
icon_name = menuitems[i].icon;
if (icon_name != NULL) {
- image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
+ if (gtk_icon_factory_lookup_default (icon_name))
+ image = gtk_image_new_from_stock (icon_name, GTK_ICON_SIZE_MENU);
+ else
+ image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
}
if (image != NULL) {
@@ -717,7 +723,7 @@ init_player (const char *device_override
option_hbox = gtk_hbox_new (FALSE, 2);
/* Create app controls */
- button = make_button_from_icon_name (gcd, GTK_STOCK_PREFERENCES,
+ button = make_button_from_stock (gcd, GTK_STOCK_PREFERENCES,
G_CALLBACK(open_preferences),
_("Open preferences"),
_("Preferences"));
@@ -732,7 +738,7 @@ init_player (const char *device_override
gnome_cd_build_track_list_menu (gcd);
gtk_box_pack_start (GTK_BOX (option_hbox), gcd->tracks, TRUE, TRUE, 0);
- button = make_button_from_icon_name (gcd, GTK_STOCK_INDEX,
+ button = make_button_from_stock (gcd, GTK_STOCK_INDEX,
G_CALLBACK(open_track_editor),
_("Open track editor"),
_("Track editor"));
@@ -769,15 +775,15 @@ init_player (const char *device_override
gcd->play_b = button;
gcd->current_image = gcd->play_image;
- button = make_button_from_icon_name (gcd, GTK_STOCK_MEDIA_STOP, G_CALLBACK (stop_cb), _("Stop"), _("Stop"));
+ button = make_button_from_stock (gcd, GTK_STOCK_MEDIA_STOP, G_CALLBACK (stop_cb), _("Stop"), _("Stop"));
gtk_box_pack_start (GTK_BOX (button_hbox), button, TRUE, TRUE, 0);
gcd->stop_b = button;
- button = make_button_from_icon_name (gcd, GTK_STOCK_MEDIA_PREVIOUS, G_CALLBACK (back_cb), _("Previous track"), _("Previous"));
+ button = make_button_from_stock (gcd, GTK_STOCK_MEDIA_PREVIOUS, G_CALLBACK (back_cb), _("Previous track"), _("Previous"));
gtk_box_pack_start (GTK_BOX (button_hbox), button, TRUE, TRUE, 0);
gcd->back_b = button;
- button = make_button_from_icon_name (gcd, GTK_STOCK_MEDIA_REWIND, NULL, _("Rewind"), _("Rewind"));
+ button = make_button_from_stock (gcd, GTK_STOCK_MEDIA_REWIND, NULL, _("Rewind"), _("Rewind"));
g_signal_connect (G_OBJECT (button), "button-press-event",
G_CALLBACK (rewind_press_cb), gcd);
g_signal_connect (G_OBJECT (button), "button-release-event",
@@ -785,7 +791,7 @@ init_player (const char *device_override
gtk_box_pack_start (GTK_BOX (button_hbox), button, TRUE, TRUE, 0);
gcd->rewind_b = button;
- button = make_button_from_icon_name (gcd, GTK_STOCK_MEDIA_FORWARD, NULL, _("Fast forward"), _("Fast forward"));
+ button = make_button_from_stock (gcd, GTK_STOCK_MEDIA_FORWARD, NULL, _("Fast forward"), _("Fast forward"));
g_signal_connect (G_OBJECT (button), "button-press-event",
G_CALLBACK (ffwd_press_cb), gcd);
g_signal_connect (G_OBJECT (button), "button-release-event",
@@ -793,11 +799,11 @@ init_player (const char *device_override
gtk_box_pack_start (GTK_BOX (button_hbox), button, TRUE, TRUE, 0);
gcd->ffwd_b = button;
- button = make_button_from_icon_name (gcd, GTK_STOCK_MEDIA_NEXT, G_CALLBACK (next_cb), _("Next track"), _("Next track"));
+ button = make_button_from_stock (gcd, GTK_STOCK_MEDIA_NEXT, G_CALLBACK (next_cb), _("Next track"), _("Next track"));
gtk_box_pack_start (GTK_BOX (button_hbox), button, TRUE, TRUE, 0);
gcd->next_b = button;
- button = make_button_from_icon_name (gcd, GNOME_CD_EJECT, G_CALLBACK (eject_cb), _("Eject CD"), _("Eject"));
+ button = make_button_from_stock (gcd, GNOME_CD_EJECT, G_CALLBACK (eject_cb), _("Eject CD"), _("Eject"));
gtk_box_pack_start (GTK_BOX (button_hbox), button, TRUE, TRUE, 0);
gcd->eject_b = button;
Index: gnome-media.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- gnome-media.spec 18 Sep 2007 10:48:46 -0000 1.108
+++ gnome-media.spec 19 Sep 2007 05:39:32 -0000 1.109
@@ -12,11 +12,12 @@
Summary: GNOME media programs
Name: gnome-media
Version: 2.20.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+ and GFDL+
Group: Applications/Multimedia
Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.20/gnome-media-%{version}.tar.gz
Patch0: gnome-media-2.13.5-hide-help-button.patch
+Patch1: icons.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: gnome
@@ -75,6 +76,7 @@
%prep
%setup -q
%patch0 -p1 -b .hide-help-button
+%patch1 -p1 -b .icons
%build
/usr/bin/gst-inspect-0.10 --print-all > /dev/null
@@ -98,13 +100,11 @@
## only show in GNOME
desktop-file-install --vendor gnome --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --add-only-show-in GNOME \
$RPM_BUILD_ROOT%{_datadir}/applications/gnome-cd.desktop
desktop-file-install --vendor gnome --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-only-show-in GNOME \
- --add-category X-GNOME-PersonalSettings \
$RPM_BUILD_ROOT%{_datadir}/applications/gnome-volume-control.desktop
# show in all
@@ -164,7 +164,7 @@
%files -f %{gettext_package}.lang
%defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc AUTHORS COPYING NEWS README
%config %{_sysconfdir}/gconf/schemas/*.schemas
%{_libexecdir}/*
@@ -187,6 +187,11 @@
%{_libdir}/pkgconfig/*
%changelog
+* Wed Sep 19 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
+- Don't add extra categories to volume control, since
+ upstream has moved it to Hardware (#295251)
+- Make icons show up again (#295171)
+
* Mon Sep 17 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.0-1
- Update to 2.20.0
More information about the scm-commits
mailing list