rpms/gthumb/devel gthumb-2.6.4-stock.patch, NONE, 1.1 gthumb.spec, 1.23, 1.24
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Oct 12 16:09:03 UTC 2005
Author: mclasen
Update of /cvs/dist/rpms/gthumb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29990
Modified Files:
gthumb.spec
Added Files:
gthumb-2.6.4-stock.patch
Log Message:
Use GTK+ stock icons where available
gthumb-2.6.4-stock.patch:
libgthumb/gthumb-stock.c | 4 ----
libgthumb/gthumb-stock.h | 4 ----
src/fullscreen.c | 4 ++--
src/ui.h | 10 +++++-----
4 files changed, 7 insertions(+), 15 deletions(-)
--- NEW FILE gthumb-2.6.4-stock.patch ---
--- gthumb-2.6.4/src/ui.h.stock 2005-03-10 16:17:15.000000000 -0500
+++ gthumb-2.6.4/src/ui.h 2005-10-12 11:54:08.000000000 -0400
@@ -79,7 +79,7 @@
N_("Print the current image"),
G_CALLBACK (activate_action_file_print) },
- { "File_ImageProp", GTHUMB_STOCK_PROPERTIES,
+ { "File_ImageProp", GTK_STOCK_PROPERTIES,
N_("Proper_ties"), NULL,
N_("View image properties"),
G_CALLBACK (activate_action_file_image_properties) },
@@ -89,7 +89,7 @@
N_("Import photos from a digital camera"),
G_CALLBACK (activate_action_file_camera_import) },
- { "File_WriteToCD", GTHUMB_STOCK_CDROM,
+ { "File_WriteToCD", GTK_STOCK_CDROM,
N_("_Write To CD"), NULL,
N_("Write selection to CD"),
G_CALLBACK (activate_action_file_write_to_cd) },
@@ -439,7 +439,7 @@
N_("View next animation frame"),
G_CALLBACK (activate_action_view_step_animation) },
- { "View_Fullscreen", GTHUMB_STOCK_FULLSCREEN,
+ { "View_Fullscreen", GTK_STOCK_FULLSCREEN,
N_("_Full Screen"), "F",
N_("View image in fullscreen mode"),
G_CALLBACK (activate_action_view_fullscreen) },
@@ -449,7 +449,7 @@
N_("View image in fullscreen mode"),
G_CALLBACK (activate_action_view_exit_fullscreen) },
- { "View_ImageProp", GTHUMB_STOCK_PROPERTIES,
+ { "View_ImageProp", GTK_STOCK_PROPERTIES,
N_("Proper_ties"), NULL,
N_("View image properties"),
G_CALLBACK (activate_action_view_image_prop) },
@@ -671,7 +671,7 @@
static GtkRadioActionEntry content_entries[] = {
- { "View_ShowFolders", GTHUMB_STOCK_SHOW_FOLDERS,
+ { "View_ShowFolders", GTK_STOCK_OPEN,
N_("_Folders"), "<alt>1",
N_("View the folders"), GTH_SIDEBAR_DIR_LIST },
{ "View_ShowCatalogs", GTHUMB_STOCK_SHOW_CATALOGS,
--- gthumb-2.6.4/src/fullscreen.c.stock 2005-03-10 16:17:14.000000000 -0500
+++ gthumb-2.6.4/src/fullscreen.c 2005-10-12 11:48:57.000000000 -0400
@@ -871,7 +871,7 @@
/* restore normal view */
- button = create_button (GTHUMB_STOCK_FULLSCREEN, _("Restore Normal View"), FALSE);
+ button = create_button (GTK_STOCK_LEAVE_FULLSCREEN, _("Restore Normal View"), FALSE);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (button),
"clicked",
@@ -880,7 +880,7 @@
/* image info */
- prop_button = button = create_button (GTHUMB_STOCK_PROPERTIES, _("Image Info"), TRUE);
+ prop_button = button = create_button (GTK_STOCK_PROPERTIES, _("Image Info"), TRUE);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (button),
"toggled",
--- gthumb-2.6.4/libgthumb/gthumb-stock.c.stock 2005-03-10 16:17:03.000000000 -0500
+++ gthumb-2.6.4/libgthumb/gthumb-stock.c 2005-10-12 11:48:57.000000000 -0400
@@ -37,7 +37,6 @@
{ GTHUMB_STOCK_BRIGHTNESS_CONTRAST, brightness_contrast_22_rgba, brightness_contrast_16_rgba },
{ GTHUMB_STOCK_CAMERA, camera_24_rgba, NULL },
{ GTHUMB_STOCK_CATALOG, catalog_24_rgba, catalog_16_rgba },
- { GTHUMB_STOCK_CDROM, cdrom_24_rgba, NULL },
{ GTHUMB_STOCK_CHANGE_DATE, change_date_16_rgba, NULL },
{ GTHUMB_STOCK_COLOR_BALANCE, color_balance_22_rgba, color_balance_16_rgba },
{ GTHUMB_STOCK_CROP, crop_16_rgba, NULL },
@@ -46,7 +45,6 @@
{ GTHUMB_STOCK_EDIT_IMAGE, edit_image_24_rgba, NULL },
{ GTHUMB_STOCK_FILM, film_16_rgba, NULL },
{ GTHUMB_STOCK_FLIP, flip_24_rgba, flip_16_rgba },
- { GTHUMB_STOCK_FULLSCREEN, fullscreen_24_rgba, fullscreen_16_rgba },
{ GTHUMB_STOCK_HISTOGRAM, histogram_22_rgba, histogram_16_rgba },
{ GTHUMB_STOCK_HUE_SATURATION, hue_saturation_22_rgba, hue_saturation_16_rgba },
{ GTHUMB_STOCK_IMAGE, image_24_rgba, NULL },
@@ -58,7 +56,6 @@
{ GTHUMB_STOCK_NORMAL_VIEW, exit_fullscreen_24_rgba, NULL },
{ GTHUMB_STOCK_POSTERIZE, posterize_22_rgba, posterize_16_rgba },
{ GTHUMB_STOCK_PREVIOUS_IMAGE, prev_image_24_rgba, NULL },
- { GTHUMB_STOCK_PROPERTIES, image_info_24_rgba, image_info_16_rgba },
{ GTHUMB_STOCK_RESET, reset_16_rgba, NULL },
{ GTHUMB_STOCK_RESIZE, resize_22_rgba, resize_16_rgba },
{ GTHUMB_STOCK_ROTATE, rotate_16_rgba, NULL },
@@ -66,7 +63,6 @@
{ GTHUMB_STOCK_ROTATE_90_CC, rotate_270_24_rgba, rotate_270_16_rgba },
{ GTHUMB_STOCK_SEARCH, catalog_search_16_rgba, NULL },
{ GTHUMB_STOCK_SHOW_CATALOGS, catalog_24_rgba, catalog_16_rgba },
- { GTHUMB_STOCK_SHOW_FOLDERS, dir_24_rgba, dir_16_rgba },
{ GTHUMB_STOCK_SHOW_IMAGE, image_24_rgba, NULL },
{ GTHUMB_STOCK_SLIDESHOW, slideshow_24_rgba, slideshow_16_rgba },
{ GTHUMB_STOCK_SWAP, swap_24_rgba, swap_16_rgba },
--- gthumb-2.6.4/libgthumb/gthumb-stock.h.stock 2005-03-10 16:17:03.000000000 -0500
+++ gthumb-2.6.4/libgthumb/gthumb-stock.h 2005-10-12 11:48:57.000000000 -0400
@@ -29,7 +29,6 @@
#define GTHUMB_STOCK_BRIGHTNESS_CONTRAST "gthumb-brightness-contrast"
#define GTHUMB_STOCK_CAMERA "gthumb-camera"
#define GTHUMB_STOCK_CATALOG "gthumb-catalog"
-#define GTHUMB_STOCK_CDROM "gthumb-cdrom"
#define GTHUMB_STOCK_CHANGE_DATE "gthumb-change-date"
#define GTHUMB_STOCK_COLOR_BALANCE "gthumb-color-balance"
#define GTHUMB_STOCK_CROP "gthumb-crop"
@@ -38,7 +37,6 @@
#define GTHUMB_STOCK_EDIT_IMAGE "gthumb-edit-image"
#define GTHUMB_STOCK_FILM "gthumb-film"
#define GTHUMB_STOCK_FLIP "gthumb-flip"
-#define GTHUMB_STOCK_FULLSCREEN "gthumb-fullscreen"
#define GTHUMB_STOCK_HISTOGRAM "gthumb-histogram"
#define GTHUMB_STOCK_HUE_SATURATION "gthumb-hue-saturation"
#define GTHUMB_STOCK_IMAGE "gthumb-image"
@@ -50,7 +48,6 @@
#define GTHUMB_STOCK_NORMAL_VIEW "gthumb-normal-view"
#define GTHUMB_STOCK_POSTERIZE "gthumb-posterize"
#define GTHUMB_STOCK_PREVIOUS_IMAGE "gthumb-previous-image"
-#define GTHUMB_STOCK_PROPERTIES "gthumb-properties"
#define GTHUMB_STOCK_RESET "gthumb-reset"
#define GTHUMB_STOCK_RESIZE "gthumb-resize"
#define GTHUMB_STOCK_ROTATE "gthumb-rotate"
@@ -58,7 +55,6 @@
#define GTHUMB_STOCK_ROTATE_90_CC "gthumb-rotate-90-cc"
#define GTHUMB_STOCK_SEARCH "gthumb-search"
#define GTHUMB_STOCK_SHOW_CATALOGS "gthumb-show-catalogs"
-#define GTHUMB_STOCK_SHOW_FOLDERS "gthumb-show-folders"
#define GTHUMB_STOCK_SHOW_IMAGE "gthumb-show-image"
#define GTHUMB_STOCK_SLIDESHOW "gthumb-slideshow"
#define GTHUMB_STOCK_SWAP "gthumb-swap"
Index: gthumb.spec
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gthumb.spec 30 Sep 2005 03:38:49 -0000 1.23
+++ gthumb.spec 12 Oct 2005 16:08:58 -0000 1.24
@@ -10,9 +10,10 @@
Summary: Image viewer, editor, organizer
Name: gthumb
Version: 2.6.8
-Release: 1
+Release: 2
URL: http://gthumb.sourceforge.net
Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gthumb/2.4/%{name}-%{version}.tar.bz2
+Patch0: gthumb-2.6.4-stock.patch
License: GPL
Group: User Interface/X
BuildRoot: %{_tmppath}/%{name}-root
@@ -42,6 +43,7 @@
%prep
%setup -q
+%patch0 -p1 -b .stock
%build
@@ -94,6 +96,9 @@
%{_datadir}/pixmaps
%changelog
+* Wed Oct 12 2005 Matthias Clasen <mclasen at redhat.com> - 2.6.8-2
+- Use GTK+ stock icons where available
+
* Thu Sep 29 2005 Matthias Clasen <mclasen at redhat.com> - 2.6.8-1
- Update to 2.6.8
More information about the fedora-cvs-commits
mailing list