+2001-06-30 [alfons]
+
+ * lots of files changed; first attempt to merge the changes
+ and bugfixes submitted by Andre Eibel (ae@baltic-online.de).
+
2001-06-30 [paul]
* po/pt_BR.po
#include "main.h"
#define LOG_MESSAGE \
- debug_mode == 0 ? (debug_mode == debug_mode) : (void)debug_print
+ debug_mode == 0 ? (debug_mode == debug_mode) : debug_print
/* How it works:
*
guint get_completion_count(void)
{
- if (is_completion_pending)
+ if (is_completion_pending())
return g_completion_count;
else
return 0;
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(window), _("Address book"));
gtk_widget_set_usize(window, ADDRESSBOOK_WIDTH, ADDRESSBOOK_HEIGHT);
- //gtk_container_set_border_width(GTK_CONTAINER(window), BORDER_WIDTH);
+ /* gtk_container_set_border_width(GTK_CONTAINER(window), BORDER_WIDTH); */
gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE);
gtk_widget_realize(window);
gint len;
gint row;
- //if (clist->selection && clist->selection->next) return;
+ /* if (clist->selection && clist->selection->next) return; */
str = gtk_entry_get_text(entry);
if (*str == '\0') {
hbox, TRUE, TRUE, 16);
/* title label */
- //pixmapwid = create_pixmapwid(dialog, GNUstep_xpm);
- //gtk_box_pack_start(GTK_BOX(hbox), pixmapwid, FALSE, FALSE, 16);
+ /* pixmapwid = create_pixmapwid(dialog, GNUstep_xpm); */
+ /* gtk_box_pack_start(GTK_BOX(hbox), pixmapwid, FALSE, FALSE, 16); */
label = gtk_label_new(title);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 16);
style = gtk_style_copy(gtk_widget_get_style(label));
gchar *mimehdr_enctype = "?B?";
const gchar *mimehdr_charset;
- //g_print("src = %s\n", src);
+ /* g_print("src = %s\n", src); */
mimehdr_charset = conv_get_outgoing_charset_str();
/* convert to wide-character string */
strlen(mimehdr_charset) + strlen(mimehdr_enctype);
mimehdr_begin_len = strlen(mimehdr_init) +
strlen(mimehdr_charset) + strlen(mimehdr_enctype);
- //line_len = 1;
+ /* line_len = 1; */
line_len = header_len;
destp = dest;
*dest = '\0';
}
/* g_free(raw); */
src_codeset = conv_get_current_charset_str();
- //printf ("tmp = %s, tlen = %d, mbl\n",
- // tmp, tlen, mbl);
+ /* printf ("tmp = %s, tlen = %d, mbl\n",
+ tmp, tlen, mbl); */
if (jconv_alloc_conv(tmp, tlen + mbl,
&raw_new, &raw_new_len,
&src_codeset, 1,
wtmpp++;
}
- //g_print("tmp = %s, tlen = %d, mb_seqlen = %d\n",
- // tmp, tlen, mb_seqlen);
+ /*
+ g_print("tmp = %s, tlen = %d, mb_seqlen = %d\n",
+ tmp, tlen, mb_seqlen);
+ */
if (tlen == 0 || raw_len == 0) {
g_free(tmp);
g_free(tmp);
g_free(raw);
- //g_print("line_len = %d\n\n", line_len);
+ /* g_print("line_len = %d\n\n", line_len); */
} while (*wtmpp != (wchar_t)0);
while (iswspace(*wsrcp)) {
g_free(wsrc);
- //g_print("dest = %s\n", dest);
+ /g_print("dest = %s\n", dest);
}
#else /* !HAVE_LIBJCONV */
gchar *mimehdr_enctype = "?B?";
const gchar *mimehdr_charset;
- //g_print("src = %s\n", src);
+ /* g_print("src = %s\n", src); */
mimehdr_charset = conv_get_outgoing_charset_str();
if (strcmp(mimehdr_charset, "ISO-2022-JP") != 0) {
/* currently only supports Japanese */
strlen(mimehdr_charset) + strlen(mimehdr_enctype);
mimehdr_begin_len = strlen(mimehdr_init) +
strlen(mimehdr_charset) + strlen(mimehdr_enctype);
- //line_len = 1;
+ /* line_len = 1; */
line_len = header_len;
destp = dest;
*dest = '\0';
wtmpp++;
}
- //g_print("tmp = %s, tlen = %d, mb_seqlen = %d\n",
- // tmp, tlen, mb_seqlen);
+ /* g_print("tmp = %s, tlen = %d, mb_seqlen = %d\n",
+ tmp, tlen, mb_seqlen);
+ */
if (tlen == 0) {
g_free(tmp);
}
g_free(tmp);
- //g_print("line_len = %d\n\n", line_len);
+ /* g_print("line_len = %d\n\n", line_len); */
} while (*wtmpp != (wchar_t)0);
while (iswspace(*wsrcp)) {
g_free(wsrc);
- //g_print("dest = %s\n", dest);
+ /* g_print("dest = %s\n", dest); */
}
#endif /* HAVE_LIBJCONV */
guchar hexdigest[33];
gchar *challenge, *response, *response64;
gint challengelen;
- //const gchar delimiters[]=" ";
+ /* const gchar delimiters[]=" "; */
gchar *token;
switch (authtype) {
news_folder_destroy(NEWS_FOLDER(folder));
break;
default:
+ break;
}
folder_tree_destroy(folder);
break;
default:
+ break;
}
switch (type) {
REMOTE_FOLDER(folder)->session = NULL;
break;
default:
+ break;
}
}
case F_QUEUE: folder->queue = item; break;
case F_TRASH: folder->trash = item; break;
default:
+ break;
}
prefs_folder_item_read_config(item);
gtk_ctree_set_indent(GTK_CTREE(ctree), CTREE_INDENT);
GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[0].button,
GTK_CAN_FOCUS);
- //gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
- // GTK_SIGNAL_FUNC(foldersel_selected), NULL);
+ /*
+ gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
+ GTK_SIGNAL_FUNC(foldersel_selected), NULL);
gtk_signal_connect(GTK_OBJECT(ctree), "select_row",
GTK_SIGNAL_FUNC(foldersel_selected), NULL);
+ */
entry = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
name = " (News)"; break;
default:
name = "";
+ break;
}
name = g_strconcat(item->name, name, NULL);
} else
name = g_strdup(item->name);
+ break;
}
if (!GTK_CTREE_ROW(node)->expanded &&
BREAK_ON_MODIFIER_KEY();
summary_pass_key_press_event(folderview->summaryview, event);
default:
+ break;
}
}
prefs_common.folder_col_total = width;
break;
default:
+ break;
}
}
acceptable = TRUE;
break;
default:
+ break;
}
}
}
break;
case GDK_Down:
move_cursor_to_display_row_down(text);
-// move_cursor_ver (text, +1);
+/* move_cursor_ver (text, +1); */
break;
case GDK_Left:
if (event->state & GDK_CONTROL_MASK)
void header_window_init(HeaderWindow *headerwin)
{
- //if (!normalfont)
- // normalfont = gdk_fontset_load(NORMAL_FONT);
+ /*
+ if (!normalfont)
+ normalfont = gdk_fontset_load(NORMAL_FONT);
+ */
if (!boldfont)
boldfont = gdk_fontset_load(BOLD_FONT);
}
recv_set_ui_func(NULL, NULL);
#if USE_THREADS
- //pthread_join(sockinfo->connect_thr, NULL);
+/*
+ pthread_join(sockinfo->connect_thr, NULL);
+*/
#endif
automaton_destroy(atm);
IncProgressDialog *inc_dialog = state->session->data;
SockInfo *sockinfo = state->sockinfo;
- //g_print("connection check\n");
+ /* g_print("connection check\n"); */
if (sockinfo->state == CONN_LOOKUPFAILED ||
sockinfo->state == CONN_FAILED) {
progress_dialog_set_label(dialog, _("Quitting"));
break;
default:
+ break;
}
}
alertpanel_error(_("No disk space left."));
break;
default:
+ break;
}
}
if (sockinfo->state == CONN_READY ||
sockinfo->state == CONN_LOOKUPSUCCESS) {
pthread_cancel(sockinfo->connect_thr);
- //pthread_kill(sockinfo->connect_thr, SIGINT);
+ /* pthread_kill(sockinfo->connect_thr, SIGINT); */
g_print("connection was cancelled.\n");
}
#endif
text = GTK_TEXT(logwindow->text);
- //gtk_text_freeze(text);
+ /*gtk_text_freeze(text);*/
switch (type) {
case LOG_WARN:
if (head) gtk_text_insert(text, NULL, color, NULL, head, -1);
gtk_text_insert(text, NULL, color, NULL, str, -1);
- //gtk_text_thaw(text);
+ /*gtk_text_thaw(text);*/
}
static void key_pressed(GtkWidget *widget, GdkEventKey *event,
gdk_window_raise(widget->window);
break;
default:
+ break;
}
}
textview_init(messageview->textview);
imageview_init(messageview->imageview);
mimeview_init(messageview->mimeview);
- //messageview_set_font(messageview);
+ /*messageview_set_font(messageview);*/
}
static void notification_convert_header(gchar *dest, gint len, gchar *src,
static void mimeview_show_image_part (MimeView *mimeview,
MimeInfo *partinfo);
static void mimeview_change_view_type (MimeView *mimeview,
- ContentType type);
+ MimeViewType type);
static void mimeview_clear (MimeView *mimeview);
static void mimeview_selected (GtkCTree *ctree,
mimeview_launch(mimeview);
return;
default:
+ break;
}
if (!mimeview->messageview->mainwin) return;
{
Pop3State *state = (Pop3State *)data;
- //inc_progress_update(state, POP3_DELETE_SEND);
+ /*inc_progress_update(state, POP3_DELETE_SEND);*/
pop3_gen_send(sock, "DELE %d", state->cur_msg);
(gushort)atoi(value);
break;
default:
+ break;
}
}
}
*((gushort *)param[i].data) = 0;
break;
default:
+ break;
}
}
}
g_free(*((gchar **)param[i].data));
break;
default:
+ break;
}
}
}
tmpparam.data = &enum_data;
break;
case P_OTHER:
+ break;
}
tmpparam.widget_set_func(&tmpparam);
g_free(str_data);
break;
*/
default:
+ break;
}
menu = gtk_option_menu_get_menu(optmenu);
GtkWidget *uri_label;
GtkWidget *hbbox;
GtkWidget *ok_btn;
- //GtkWidget *cancel_btn;
+ /*GtkWidget *cancel_btn;*/
GtkWidget *recycle_colors_btn;
GtkWidget *frame_colors;
msginfo->fromspace = g_strdup(hp);
break;
default:
+ break;
}
}
msginfo->inreplyto = reference;
if (eom) break;
}
- //g_message ("** at " __PRETTY_FUNCTION__ ":%d:", __LINE__);
+ /*g_message ("** at " __PRETTY_FUNCTION__ ":%d:", __LINE__);*/
}
void procmime_scan_encoding(MimeInfo *mimeinfo, const gchar *encoding)
news_session_destroy(NNTP_SESSION(session));
break;
default:
+ break;
}
g_free(session->server);
result = _("Error verifying the signature");
break;
default:
+ break;
}
return result;
window = gtk_window_new (GTK_WINDOW_DIALOG);
gtk_window_set_title (GTK_WINDOW (window), _("Search"));
gtk_widget_set_usize (window, 450, -1);
- //gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+ /*gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);*/
gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE);
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
gtk_signal_connect(GTK_OBJECT(window), "delete_event",
GtkCTreeNode *best_node = NULL;
if (current_node)
- //node = current_node;
+ /*node = current_node;*/
node = GTK_CTREE_NODE_NEXT(current_node);
else
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
GtkCTreeNode *best_node = NULL;
if (current_node)
- //node = current_node;
+ /*node = current_node;*/
node = GTK_CTREE_NODE_PREV(current_node);
else
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
if (current_node)
node = current_node;
- //node = GTK_CTREE_NODE_NEXT(current_node);
+ /*node = GTK_CTREE_NODE_NEXT(current_node);*/
else
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
if (current_node)
node = current_node;
- //node = GTK_CTREE_NODE_PREV(current_node);
+ /*node = GTK_CTREE_NODE_PREV(current_node);*/
else
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
gtk_ctree_sort_node(ctree, NULL);
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
- //gtkut_ctree_set_focus_row(ctree, summaryview->selected);
+ /*gtkut_ctree_set_focus_row(ctree, summaryview->selected);*/
prefs_folder_item_set_config(summaryview->folder_item,
summaryview->sort_type,
gtk_widget_grab_focus(summaryview->folderview->ctree);
return;
default:
+ break;
}
if (!summaryview->selected) {
summary_save_as(summaryview);
break;
default:
+ break;
}
}
}
break;
default:
+ break;
}
if (summaryview->display_msg)
prefs_common.summary_col_subject = width;
break;
default:
+ break;
}
}
if (!*str1 || !*str2) return -1;
retval = strcmp(str1, str2);
- //if (retval == 0)
- // g_print("\ns1 = %s\ns2 = %s\n"
- // "str1 = %s\nstr2 = %s\nmatched.\n",
- // s1, s2, str1, str2);
-
+ /*
+ if (retval == 0)
+ g_print("\ns1 = %s\ns2 = %s\n"
+ "str1 = %s\nstr2 = %s\nmatched.\n",
+ s1, s2, str1, str2);
+ */
return retval;
}
struct dirent *d;
gchar *prev_dir;
- //g_print("dir = %s\n", dir);
+ /*g_print("dir = %s\n", dir);*/
if (stat(dir, &s) < 0) {
FILE_OP_ERROR(dir, "stat");
}
prev_dir = g_get_current_dir();
- //g_print("prev_dir = %s\n", prev_dir);
+ /*g_print("prev_dir = %s\n", prev_dir);*/
if (!path_cmp(prev_dir, dir)) {
g_free(prev_dir);
continue;
}
- //g_print("removing %s\n", d->d_name);
+ /*g_print("removing %s\n", d->d_name);*/
if (S_ISDIR(s.st_mode)) {
if (remove_dir_recursive(d->d_name) < 0) {