--- gthumb-2.7.1/libgthumb/gthumb-stock.c.stock 2005-11-13 22:39:20.000000000 -0500
+++ gthumb-2.7.1/libgthumb/gthumb-stock.c 2005-11-13 22:40:04.000000000 -0500
@@ -38,7 +38,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 },
@@ -47,7 +46,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 },
@@ -59,7 +57,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_REDUCE_COLORS, reduce_colors_16_rgba, NULL },
{ GTHUMB_STOCK_RESET, reset_16_rgba, NULL },
{ GTHUMB_STOCK_RESIZE, resize_22_rgba, resize_16_rgba },
@@ -68,7 +65,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.7.1/libgthumb/gthumb-stock.h.stock 2005-11-13 22:40:19.000000000 -0500
+++ gthumb-2.7.1/libgthumb/gthumb-stock.h 2005-11-13 22:40:44.000000000 -0500
@@ -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_REDUCE_COLORS "gthumb-reduce-colors"
#define GTHUMB_STOCK_RESET "gthumb-reset"
#define GTHUMB_STOCK_RESIZE "gthumb-resize"
@@ -59,7 +56,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"
--- gthumb-2.7.1/src/gth-browser-actions-entries.h.stock 2005-11-13 22:34:05.000000000 -0500
+++ gthumb-2.7.1/src/gth-browser-actions-entries.h 2005-11-13 22:34:49.000000000 -0500
@@ -59,7 +59,7 @@
N_("Open the selected image in a new window"),
G_CALLBACK (gth_browser_activate_action_file_view_image) },
- { "File_ImageProp", GTHUMB_STOCK_PROPERTIES,
+ { "File_ImageProp", GTK_STOCK_PROPERTIES,
N_("Proper_ties"), NULL,
N_("View image properties"),
G_CALLBACK (gth_browser_activate_action_file_image_properties) },
--- gthumb-2.7.1/src/gth-fullscreen-actions-entries.h.stock 2005-11-13 22:35:39.000000000 -0500
+++ gthumb-2.7.1/src/gth-fullscreen-actions-entries.h 2005-11-13 22:37:13.000000000 -0500
@@ -33,7 +33,7 @@
static GtkActionEntry gth_fullscreen_action_entries[] = {
- { "ExitFullscreen", GTHUMB_STOCK_FULLSCREEN,
+ { "ExitFullscreen", GTK_STOCK_LEAVE_FULLSCREEN,
N_("Restore Normal View"), NULL,
NULL,
G_CALLBACK (gth_fullscreen_activate_action_close) },
@@ -53,7 +53,7 @@
static GtkToggleActionEntry gth_fullscreen_action_toggle_entries[] = {
- { "View_Comment", GTHUMB_STOCK_PROPERTIES,
+ { "View_Comment", GTK_STOCK_PROPERTIES,
N_("Proper_ties"), NULL,
NULL,
G_CALLBACK (gth_fullscreen_activate_action_toggle_comment),
--- gthumb-2.7.1/src/gth-window-actions-entries.h.stock 2005-11-13 22:38:03.000000000 -0500
+++ gthumb-2.7.1/src/gth-window-actions-entries.h 2005-11-13 22:38:16.000000000 -0500
@@ -211,7 +211,7 @@
N_("View next animation frame"),
G_CALLBACK (gth_window_activate_action_view_step_animation) },
- { "View_Fullscreen", GTHUMB_STOCK_FULLSCREEN,
+ { "View_Fullscreen", GTK_STOCK_FULLSCREEN,
N_("_Full Screen"), "F11",
N_("View image in fullscreen mode"),
G_CALLBACK (gth_window_activate_action_view_fullscreen) },