[Xfce4-commits] <terminal:master> Use the gtk-stock-quit icon for the close window action.

[Nick Schermer]

Updating branch refs/heads/master
         to 2ede7225f703718ffdbccedd79fdc122324367b0 (commit)
       from b070fb36ddc0b1ea893c0558df52025d09d20622 (commit)

commit 2ede7225f703718ffdbccedd79fdc122324367b0
Author: Nick Schermer <nick at xfce.org>
Date:   Wed Oct 7 16:14:05 2009 +0200

    Use the gtk-stock-quit icon for the close window action.

 icons/16x16/Makefile.am                    |    1 -
 icons/24x24/Makefile.am                    |    1 -
 icons/24x24/stock_terminal-closewindow.png |  Bin 1047 -> 0 bytes
 terminal/terminal-stock.c                  |    1 -
 terminal/terminal-stock.h                  |    1 -
 terminal/terminal-window.c                 |    2 +-
 6 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
index e39fd17..a453d69 100644
--- a/icons/16x16/Makefile.am
+++ b/icons/16x16/Makefile.am
@@ -3,7 +3,6 @@
 iconsdir = $(datadir)/icons/hicolor/16x16/stock/navigation
 icons_DATA =								\
 	stock_terminal-closetab.png					\
-	stock_terminal-closewindow.png					\
 	stock_terminal-newtab.png					\
 	stock_terminal-newwindow.png					\
 	stock_terminal-reportbug.png
diff --git a/icons/24x24/Makefile.am b/icons/24x24/Makefile.am
index 31d0b58..861b15d 100644
--- a/icons/24x24/Makefile.am
+++ b/icons/24x24/Makefile.am
@@ -3,7 +3,6 @@
 iconsdir = $(datadir)/icons/hicolor/24x24/stock/navigation
 icons_DATA =								\
 	stock_terminal-closetab.png					\
-	stock_terminal-closewindow.png					\
 	stock_terminal-newtab.png					\
 	stock_terminal-newwindow.png					\
 	stock_terminal-reportbug.png					\
diff --git a/icons/24x24/stock_terminal-closewindow.png b/icons/24x24/stock_terminal-closewindow.png
deleted file mode 100644
index 3fe78a2..0000000
Binary files a/icons/24x24/stock_terminal-closewindow.png and /dev/null differ
diff --git a/terminal/terminal-stock.c b/terminal/terminal-stock.c
index e3a9de3..3bea04c 100644
--- a/terminal/terminal-stock.c
+++ b/terminal/terminal-stock.c
@@ -46,7 +46,6 @@ typedef struct
 static const TerminalStockIcon terminal_stock_icons[] =
 {
   { TERMINAL_STOCK_CLOSETAB,    "tab-close" },
-  { TERMINAL_STOCK_CLOSEWINDOW, "window-close" },
   { TERMINAL_STOCK_NEWTAB,      "tab-new" },
   { TERMINAL_STOCK_NEWWINDOW,   "window-new" },
   { TERMINAL_STOCK_REPORTBUG,   NULL },
diff --git a/terminal/terminal-stock.h b/terminal/terminal-stock.h
index c2043d7..acb64d6 100644
--- a/terminal/terminal-stock.h
+++ b/terminal/terminal-stock.h
@@ -25,7 +25,6 @@
 G_BEGIN_DECLS
 
 #define TERMINAL_STOCK_CLOSETAB     "terminal-closetab"
-#define TERMINAL_STOCK_CLOSEWINDOW  "terminal-closewindow"
 #define TERMINAL_STOCK_NEWTAB       "terminal-newtab"
 #define TERMINAL_STOCK_NEWWINDOW    "terminal-newwindow"
 #define TERMINAL_STOCK_REPORTBUG    "terminal-reportbug"
diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index 7d02572..ffef53b 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -219,7 +219,7 @@ static const GtkActionEntry action_entries[] =
   { "new-window", TERMINAL_STOCK_NEWWINDOW, N_ ("Open T_erminal"), "<control><shift>N", N_ ("Open a new terminal window"), G_CALLBACK (terminal_window_action_new_window), },
   { "detach-tab", NULL, N_ ("_Detach Tab"), NULL, N_ ("Open a new window for the current terminal tab"), G_CALLBACK (terminal_window_action_detach_tab), },
   { "close-tab", TERMINAL_STOCK_CLOSETAB, N_ ("C_lose Tab"), NULL, N_ ("Close the current terminal tab"), G_CALLBACK (terminal_window_action_close_tab), },
-  { "close-window", TERMINAL_STOCK_CLOSEWINDOW, N_ ("_Close Window"), NULL, N_ ("Close the terminal window"), G_CALLBACK (terminal_window_action_close_window), },
+  { "close-window", GTK_STOCK_QUIT, N_ ("_Close Window"), NULL, N_ ("Close the terminal window"), G_CALLBACK (terminal_window_action_close_window), },
   { "edit-menu", NULL, N_ ("_Edit"), NULL, NULL, NULL, },
   { "copy", GTK_STOCK_COPY, N_ ("_Copy"), NULL, N_ ("Copy to clipboard"), G_CALLBACK (terminal_window_action_copy), },
   { "paste", GTK_STOCK_PASTE, N_ ("_Paste"), NULL, N_ ("Paste from clipboard"), G_CALLBACK (terminal_window_action_paste), },