Bind riece-command-list-addons instead of riece-command-change-layout in tool-bar...

diff --git a/lisp/COMPILE b/lisp/COMPILE
index 5614b7a..86a3128 100644 (file)
--- a/lisp/COMPILE
+++ b/lisp/COMPILE
@@ -58,7 +58,7 @@
   '("riece-command-previous-channel.xpm"
     "riece-command-next-channel.xpm"
     "riece-command-configure-windows.xpm"
   '("riece-command-previous-channel.xpm"
     "riece-command-next-channel.xpm"
     "riece-command-configure-windows.xpm"

-    "riece-command-change-layout.xpm"
+    "riece-command-list-addons.xpm"

     "riece-command-join.xpm"
     "riece-command-part.xpm"
     "riece-command-quit.xpm"))
     "riece-command-join.xpm"
     "riece-command-part.xpm"
     "riece-command-quit.xpm"))

diff --git a/lisp/Makefile.am b/lisp/Makefile.am
index ddc2078..157ad55 100644 (file)
--- a/lisp/Makefile.am
+++ b/lisp/Makefile.am
@@ -22,7 +22,7 @@ EXTRA_DIST = COMPILE ChangeLog ChangeLog.Liece \
        riece-shrink-buffer.el riece-xfaceb.el riece-epg.el riece-twitter.el \
        url-riece.el \
        riece-command-previous-channel.xpm riece-command-next-channel.xpm \
        riece-shrink-buffer.el riece-xfaceb.el riece-epg.el riece-twitter.el \
        url-riece.el \
        riece-command-previous-channel.xpm riece-command-next-channel.xpm \

-       riece-command-configure-windows.xpm riece-command-change-layout.xpm \
+       riece-command-configure-windows.xpm riece-command-list-addons.xpm \

        riece-command-join.xpm riece-command-part.xpm riece-command-quit.xpm \
        server.rb aproxy.rb
 
        riece-command-join.xpm riece-command-part.xpm riece-command-quit.xpm \
        server.rb aproxy.rb
 

diff --git a/lisp/riece-command-change-layout.xpm b/lisp/riece-command-list-addons.xpm
similarity index 98%
rename from lisp/riece-command-change-layout.xpm
rename to lisp/riece-command-list-addons.xpm
index a303b13..31b3d9c 100644 (file)
--- a/lisp/riece-command-change-layout.xpm
+++ b/lisp/riece-command-list-addons.xpm
@@ -1,5 +1,5 @@
 /* XPM */
 /* XPM */

-static char *riece_command_change_layout[] = {
+static char *riece_command_list_addons[] = {

 /* columns rows colors chars-per-pixel */
 "24 24 193 2",
 "   c black",
 /* columns rows colors chars-per-pixel */
 "24 24 193 2",
 "   c black",

diff --git a/lisp/riece-mcat-japanese.el b/lisp/riece-mcat-japanese.el
index 2cf659a..cc15e2d 100644 (file)
--- a/lisp/riece-mcat-japanese.el
+++ b/lisp/riece-mcat-japanese.el
@@ -118,6 +118,7 @@
     ("Logging in to %s...done" . "%s \e$B$K%m%0%$%s$7$F$$$^$9\e(B...\e$B40N;\e(B")
     ("Logging in to IRC server..." . "IRC \e$B%5!<%P$K%m%0%$%s$7$F$$$^$9\e(B...")
     ("Logging in to IRC server...done" . "IRC \e$B%5!<%P$K%m%0%$%s$7$F$$$^$9\e(B...\e$B40N;\e(B")
     ("Logging in to %s...done" . "%s \e$B$K%m%0%$%s$7$F$$$^$9\e(B...\e$B40N;\e(B")
     ("Logging in to IRC server..." . "IRC \e$B%5!<%P$K%m%0%$%s$7$F$$$^$9\e(B...")
     ("Logging in to IRC server...done" . "IRC \e$B%5!<%P$K%m%0%$%s$7$F$$$^$9\e(B...\e$B40N;\e(B")

+    ("Manage Add-ons" . nil)

     ("Mark As Away" . "\e$BN%@J>uBV$K$9$k\e(B")
     ("Message to user: " . "\e$B%f!<%6$X$N%a%C%;!<%8\e(B: ")
     ("Message: " . "\e$B%a%C%;!<%8\e(B")
     ("Mark As Away" . "\e$BN%@J>uBV$K$9$k\e(B")
     ("Message to user: " . "\e$B%f!<%6$X$N%a%C%;!<%8\e(B: ")
     ("Message: " . "\e$B%a%C%;!<%8\e(B")

diff --git a/lisp/riece-menu.el b/lisp/riece-menu.el
index 19d98b4..a1524f3 100644 (file)
--- a/lisp/riece-menu.el
+++ b/lisp/riece-menu.el
@@ -73,6 +73,7 @@
    (vector (riece-mcat "Invite User") 'riece-command-invite
           'riece-current-channel)
    "----"
    (vector (riece-mcat "Invite User") 'riece-command-invite
           'riece-current-channel)
    "----"

+   (vector (riece-mcat "Manage Add-ons") 'riece-command-list-addons t)

    (vector (riece-mcat "Version") 'riece-version t)
    (vector (riece-mcat "Submit Bug Report") 'riece-submit-bug-report t)
    "----"
    (vector (riece-mcat "Version") 'riece-version t)
    (vector (riece-mcat "Submit Bug Report") 'riece-submit-bug-report t)
    "----"

diff --git a/lisp/riece-toolbar.el b/lisp/riece-toolbar.el
index ea8f8ba..9d77ac8 100644 (file)
--- a/lisp/riece-toolbar.el
+++ b/lisp/riece-toolbar.el
@@ -28,7 +28,7 @@
 ;; riece-command-next-channel.xpm      stock_next.png
 ;; riece-command-previous-channel.xpm  stock_previous.png
 ;; riece-command-configure-windows.xpm stock_refresh.png
 ;; riece-command-next-channel.xpm      stock_next.png
 ;; riece-command-previous-channel.xpm  stock_previous.png
 ;; riece-command-configure-windows.xpm stock_refresh.png

-;; riece-command-change-layout         stock_styles.png
+;; riece-command-list-addons           stock_styles.png

 ;; riece-command-join                  stock_people.png
 ;; riece-command-part                  stock_calc-cancel.png
 ;; riece-command-quit                  stock_exit.png
 ;; riece-command-join                  stock_people.png
 ;; riece-command-part                  stock_calc-cancel.png
 ;; riece-command-quit                  stock_exit.png


@@ -46,7 +46,7 @@
   '(riece-command-previous-channel
     riece-command-next-channel
     riece-command-configure-windows
   '(riece-command-previous-channel
     riece-command-next-channel
     riece-command-configure-windows

-    riece-command-change-layout
+    riece-command-list-addons

     riece-command-join
     riece-command-part
     riece-command-quit))
     riece-command-join
     riece-command-part
     riece-command-quit))