2005-10-04 [colin] 1.9.15cvs10

[claws.git] / src / toolbar.c

diff --git a/src/toolbar.c b/src/toolbar.c
index 932b90f2f9a963f5cfa64c9bf4147d5521d1854a..c55f01748c0dff88c354a5b4cfb2d3da8cde4df9 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -306,11 +306,6 @@ GList *toolbar_get_action_items(ToolbarType source)
 
                for (i = 0; i < sizeof main_items / sizeof main_items[0]; i++)  {
                        items = g_list_append(items, gettext(toolbar_text[main_items[i]].descr));
-                       if (main_items[i] == A_PRINT) {
-                               g_print("$$$ descr %s, trans %s\n",
-                                       toolbar_text[main_items[i]].descr,
-                                       gettext(toolbar_text[main_items[i]].descr));
-                       }
                }       
        }
        else if (source == TOOLBAR_COMPOSE) {
@@ -391,7 +386,7 @@ static void toolbar_set_default_main(void)
                { A_RECEIVE_ALL,   STOCK_PIXMAP_MAIL_RECEIVE_ALL,     _("Get All") },
                { A_SEPARATOR,     0,                                 ("")         }, 
                { A_SEND_QUEUED,   STOCK_PIXMAP_MAIL_SEND_QUEUE,      _("Send")    },
-               { A_COMPOSE_EMAIL, STOCK_PIXMAP_MAIL_COMPOSE,         _("Email")   },
+               { A_COMPOSE_EMAIL, STOCK_PIXMAP_MAIL_COMPOSE,         _("Compose") },
                { A_SEPARATOR,     0,                                 ("")         },
                { A_REPLY_MESSAGE, STOCK_PIXMAP_MAIL_REPLY,           _("Reply")   }, 
                { A_REPLY_ALL,     STOCK_PIXMAP_MAIL_REPLY_TO_ALL,    _("All")     },
@@ -1996,7 +1991,6 @@ void send_queue_cb(gpointer data, guint action, GtkWidget *widget)
                                               prefs_common.savemsg) < 0)
                                alertpanel_error(_("Some errors occurred while "
                                                   "sending queued messages."));
-                       folder_item_scan(folder->queue);
                }
        }
 }