[Commits] action.c 1.12.2.73 1.12.2.74 addr_compl.c 1.27.2.64 1.27.2.65 addrharvest.c 1.6.10.28 1.6.10.29 compose.c 1.382.2.612 1.382.2.613 edittags.c 1.1.2.29 1.1.2.30 folderview.c 1.207.2.228 1.207.2.229 imap_gtk.c 1.1.2.72 1.1.2.73 matcher.c 1.75.2.74 1.75.2.75 mh_gtk.c 1.2.2.44 1.2.2.45 news.c 1.101.2.70 1.101.2.71 prefs_account.c 1.105.2.175 1.105.2.176 prefs_actions.c 1.60.2.82 1.60.2.83 prefs_customheader.c 1.16.2.44 1.16.2.45 prefs_filtering.c 1.59.2.92 1.59.2.93 prefs_template.c 1.12.2.82 1.12.2.83 prefs_toolbar.c 1.30.2.74 1.30.2.75 printing.c 1.1.2.39 1.1.2.40 procmsg.c 1.150.2.128 1.150.2.129
mones at claws-mail.org
mones at claws-mail.org
Sun Sep 16 23:56:23 CEST 2012
Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv31257/src
Modified Files:
Tag: gtk2
action.c addr_compl.c addrharvest.c compose.c edittags.c
folderview.c imap_gtk.c matcher.c mh_gtk.c news.c
prefs_account.c prefs_actions.c prefs_customheader.c
prefs_filtering.c prefs_template.c prefs_toolbar.c printing.c
procmsg.c
Log Message:
2012-09-16 [mones] 3.8.1cvs60
* src/action.c
Removed dup calls with ignored result
* src/addr_compl.c
Removed unused var is_group and simplified logic around it
* src/addrharvest.c
* src/matcher.c
* src/procmsg.c
* src/etpan/etpan-thread-manager.c
Use unused var r to verify result and emit messages on error
* src/compose.c
Move color variable into conditional usage blocks
Remove assigned but not used vars: lock, titles, count
* src/edittags.c
Remove assigned but not used var actions
* src/folderview.c
Remove assigned but not used vars: from_parent, src_node
* src/imap_gtk.c
* src/mh_gtk.c
Remove malloc-ed but not used var: old_path
* src/news.c
Comment unused vars from commented block: tofetch, fetched
* src/prefs_account.c
Remove assigned but not used var: privacy_enabled
* src/prefs_actions.c
* src/prefs_customheader.c
Remove assigned but not used var: store
* src/prefs_filtering.c
Remove assigned but not used var: n_rows
* src/prefs_template.c
Remove assigned but not used vars: model, list_store
* src/prefs_toolbar.c
Remove assigned but not used var: win_titles
* src/printing.c
Remove assigned but not used vars: orientation, line, baseline,
off_chars
* src/etpan/imap-thread.c
Remove assigned but not used var: value, r
Refactor to check correct memory allocation
* src/etpan/nntp-thread.c
Remove assigned but not used var: value
* src/gtk/gtkaspell.c
Remove assigned but not used vars: textbuf, exist
Remove unused function: find_gtkaspeller
* src/gtk/gtkcmctree.c
Remove unused function: gtk_cmctree_get_offset
* src/gtk/gtkshruler.c
Remove assigned but not used vars: ruler, priv
Index: edittags.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/edittags.c,v
retrieving revision 1.1.2.29
retrieving revision 1.1.2.30
diff -u -d -r1.1.2.29 -r1.1.2.30
--- edittags.c 12 Sep 2012 09:23:11 -0000 1.1.2.29
+++ edittags.c 16 Sep 2012 21:56:20 -0000 1.1.2.30
@@ -275,7 +275,6 @@
static gint apply_list_btn_pressed(GtkWidget *widget, GdkEventButton *event,
GtkTreeView *list_view)
{
- GtkActionGroup *actions;
GtkUIManager *gui_manager = gtkut_ui_manager();
if (applywindow.busy)
@@ -287,7 +286,7 @@
gboolean non_empty;
if (!apply_popup_menu) {
- actions = cm_menu_create_action_group("EditTags", apply_popup_actions,
+ (void) cm_menu_create_action_group("EditTags", apply_popup_actions,
G_N_ELEMENTS(apply_popup_actions), (gpointer)list_view);
MENUITEM_ADDUI("/Menus", "EditTags", "EditTags", GTK_UI_MANAGER_MENU)
Index: addrharvest.c
===================================================================
RCS file: /home/claws-mail/claws/src/addrharvest.c,v
retrieving revision 1.6.10.28
retrieving revision 1.6.10.29
diff -u -d -r1.6.10.28 -r1.6.10.29
--- addrharvest.c 12 Sep 2012 09:23:11 -0000 1.6.10.28
+++ addrharvest.c 16 Sep 2012 21:56:20 -0000 1.6.10.29
@@ -813,11 +813,16 @@
int r;
if( ( dp = opendir( harvester->path ) ) == NULL ) {
+ g_message("cannot opendir %s\n", harvester->path);
return;
}
/* Process message list */
r = chdir( harvester->path );
+ if (r != 0) {
+ g_message("cannot chdir %s\n", harvester->path);
+ return;
+ }
node = msgList;
while( node ) {
num = GPOINTER_TO_UINT( node->data );
Index: folderview.c
===================================================================
RCS file: /home/claws-mail/claws/src/folderview.c,v
retrieving revision 1.207.2.228
retrieving revision 1.207.2.229
diff -u -d -r1.207.2.228 -r1.207.2.229
--- folderview.c 27 May 2012 17:30:50 -0000 1.207.2.228
+++ folderview.c 16 Sep 2012 21:56:20 -0000 1.207.2.229
@@ -2473,9 +2473,7 @@
void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
FolderItem *to_folder, gboolean copy)
{
- FolderItem *from_parent = NULL;
FolderItem *new_folder = NULL;
- GtkCMCTreeNode *src_node = NULL;
gchar *buf;
gint status;
@@ -2483,9 +2481,6 @@
cm_return_if_fail(from_folder != NULL);
cm_return_if_fail(to_folder != NULL);
- src_node = gtk_cmctree_find_by_row_data(GTK_CMCTREE(folderview->ctree), NULL, from_folder);
- from_parent = folder_item_parent(from_folder);
-
if (prefs_common.warn_dnd) {
buf = g_strdup_printf(copy ? _("Do you really want to copy folder '%s' in '%s' ?"):
_("Do you really want to make folder '%s' a subfolder of '%s' ?"),
Index: matcher.c
===================================================================
RCS file: /home/claws-mail/claws/src/matcher.c,v
retrieving revision 1.75.2.74
retrieving revision 1.75.2.75
diff -u -d -r1.75.2.74 -r1.75.2.75
--- matcher.c 8 Sep 2012 20:23:10 -0000 1.75.2.74
+++ matcher.c 16 Sep 2012 21:56:20 -0000 1.75.2.75
@@ -2400,8 +2400,14 @@
&& strncmp(buf, "disabled rulename \"", 18)) {
r = fwrite("enabled rulename \"\" ",
strlen("enabled rulename \"\" "), 1, dst);
+ if (r != 1) {
+ g_message("cannot fwrite rulename\n");
+ }
}
r = fwrite(buf, strlen(buf), 1, dst);
+ if (r != 1) {
+ g_message("cannot fwrite rule\n");
+ }
}
fclose(dst);
fclose(src);
Index: prefs_template.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_template.c,v
retrieving revision 1.12.2.82
retrieving revision 1.12.2.83
diff -u -d -r1.12.2.82 -r1.12.2.83
--- prefs_template.c 8 Sep 2012 20:23:11 -0000 1.12.2.82
+++ prefs_template.c 16 Sep 2012 21:56:20 -0000 1.12.2.83
@@ -734,11 +734,8 @@
gchar *value;
GtkTextBuffer *buffer;
GtkTextIter start, end;
- GtkTreeModel *model;
gint line;
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(templates.list_view));
-
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(templates.text_value));
gtk_text_buffer_get_start_iter(buffer, &start);
gtk_text_buffer_get_iter_at_offset(buffer, &end, -1);
@@ -901,14 +898,11 @@
static void prefs_template_delete_all_cb(gpointer action, gpointer data)
{
- GtkListStore *list_store;
-
if (alertpanel(_("Delete all templates"),
_("Do you really want to delete all the templates?"),
GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL) == G_ALERTDEFAULT)
return;
- list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(templates.list_view)));
prefs_template_clear_list();
modified = FALSE;
Index: mh_gtk.c
===================================================================
RCS file: /home/claws-mail/claws/src/mh_gtk.c,v
retrieving revision 1.2.2.44
retrieving revision 1.2.2.45
diff -u -d -r1.2.2.44 -r1.2.2.45
--- mh_gtk.c 8 Sep 2012 20:23:10 -0000 1.2.2.44
+++ mh_gtk.c 16 Sep 2012 21:56:20 -0000 1.2.2.45
@@ -186,7 +186,6 @@
FolderItem *item;
gchar *message, *name;
AlertValue avalue;
- gchar *old_path;
gchar *old_id;
item = folderview_get_selected_item(folderview);
@@ -206,7 +205,6 @@
g_free(message);
if (avalue != G_ALERTALTERNATE) return;
- Xstrdup_a(old_path, item->path, return);
old_id = folder_item_get_identifier(item);
if (folderview->opened == folderview->selected ||
@@ -238,7 +236,6 @@
gchar *new_folder;
gchar *name;
gchar *message;
- gchar *old_path;
gchar *old_id;
gchar *new_id;
gchar *base;
@@ -271,8 +268,6 @@
return;
}
- Xstrdup_a(old_path, item->path, {g_free(new_folder); return;});
-
old_id = folder_item_get_identifier(item);
if (folder_item_rename(item, new_folder) < 0) {
Index: compose.c
===================================================================
RCS file: /home/claws-mail/claws/src/compose.c,v
retrieving revision 1.382.2.612
retrieving revision 1.382.2.613
diff -u -d -r1.382.2.612 -r1.382.2.613
--- compose.c 12 Sep 2012 09:23:11 -0000 1.382.2.612
+++ compose.c 16 Sep 2012 21:56:20 -0000 1.382.2.613
@@ -812,8 +812,8 @@
GdkColormap *cmap;
gboolean success[8];
int i;
-#endif
GdkColor color[8];
+#endif
buffer = gtk_text_view_get_buffer(text);
@@ -875,6 +875,7 @@
compose->no_wrap_tag = gtk_text_buffer_create_tag(buffer, "no_wrap", NULL);
compose->no_join_tag = gtk_text_buffer_create_tag(buffer, "no_join", NULL);
+#if !GTK_CHECK_VERSION(2, 24, 0)
color[0] = quote_color1;
color[1] = quote_color2;
color[2] = quote_color3;
@@ -883,7 +884,7 @@
color[5] = quote_bgcolor3;
color[6] = signature_color;
color[7] = uri_color;
-#if !GTK_CHECK_VERSION(2, 24, 0)
+
cmap = gdk_drawable_get_colormap(gtk_widget_get_window(compose->window));
gdk_colormap_alloc_colors(cmap, color, 8, FALSE, TRUE, success);
@@ -5749,17 +5750,13 @@
FILE *fp;
GSList *cur;
gint num;
- static gboolean lock = FALSE;
PrefsAccount *mailac = NULL, *newsac = NULL;
gboolean err = FALSE;
debug_print("queueing message...\n");
cm_return_val_if_fail(compose->account != NULL, -1);
- lock = TRUE;
-
if (compose_check_entries(compose, check_subject) == FALSE) {
- lock = FALSE;
if (compose->batch) {
gtk_widget_show_all(compose->window);
}
@@ -5768,7 +5765,6 @@
if (!compose->to_list && !compose->newsgroup_list) {
g_warning("can't get recipient list.");
- lock = FALSE;
return -1;
}
@@ -5778,7 +5774,6 @@
else if (cur_account && cur_account->protocol != A_NNTP)
mailac = cur_account;
else if (!(mailac = compose_current_mail_account())) {
- lock = FALSE;
alertpanel_error(_("No account for sending mails available!"));
return -1;
}
@@ -5788,7 +5783,6 @@
if (compose->account->protocol == A_NNTP)
newsac = compose->account;
else {
- lock = FALSE;
alertpanel_error(_("Selected account isn't NNTP: Posting is impossible."));
return -1;
}
@@ -5801,7 +5795,6 @@
if ((fp = g_fopen(tmp, "wb")) == NULL) {
FILE_OP_ERROR(tmp, "fopen");
g_free(tmp);
- lock = FALSE;
return -2;
}
@@ -5863,7 +5856,6 @@
if (compose->use_encryption) {
gchar *encdata;
if (!compose_warn_encryption(compose)) {
- lock = FALSE;
fclose(fp);
claws_unlink(tmp);
g_free(tmp);
@@ -5889,7 +5881,6 @@
* key selection */
if (err == TRUE)
g_warning("failed to write queue message");
- lock = FALSE;
fclose(fp);
claws_unlink(tmp);
g_free(tmp);
@@ -5936,7 +5927,6 @@
if (compose->redirect_filename != NULL) {
if (compose_redirect_write_to_file(compose, fp) < 0) {
- lock = FALSE;
fclose(fp);
claws_unlink(tmp);
g_free(tmp);
@@ -5945,7 +5935,6 @@
} else {
gint result = 0;
if ((result = compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_SEND, TRUE)) < 0) {
- lock = FALSE;
fclose(fp);
claws_unlink(tmp);
g_free(tmp);
@@ -5957,14 +5946,12 @@
fclose(fp);
claws_unlink(tmp);
g_free(tmp);
- lock = FALSE;
return -2;
}
if (fclose(fp) == EOF) {
FILE_OP_ERROR(tmp, "fclose");
claws_unlink(tmp);
g_free(tmp);
- lock = FALSE;
return -2;
}
@@ -5977,7 +5964,6 @@
g_warning("can't find queue folder\n");
claws_unlink(tmp);
g_free(tmp);
- lock = FALSE;
return -1;
}
folder_item_scan(queue);
@@ -5985,7 +5971,6 @@
g_warning("can't queue the message\n");
claws_unlink(tmp);
g_free(tmp);
- lock = FALSE;
return -1;
}
@@ -7220,7 +7205,6 @@
UndoMain *undostruct;
- gchar *titles[N_ATTACH_COLS];
GtkWidget *popupmenu;
GtkWidget *tmpl_menu;
GtkActionGroup *action_group = NULL;
@@ -7236,11 +7220,6 @@
debug_print("Creating compose window...\n");
compose = g_new0(Compose, 1);
- titles[COL_MIMETYPE] = _("MIME type");
- titles[COL_SIZE] = _("Size");
- titles[COL_NAME] = _("Name");
- titles[COL_CHARSET] = _("Charset");
-
compose->batch = batch;
compose->account = account;
compose->folder = folder;
@@ -10366,14 +10345,12 @@
GtkTextBuffer *buffer;
GtkTextMark *mark;
GtkTextIter ins;
- gint count;
cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
mark = gtk_text_buffer_get_insert(buffer);
gtk_text_buffer_get_iter_at_mark(buffer, &ins, mark);
- count = gtk_text_iter_inside_word (&ins) ? 2 : 1;
if (gtk_text_iter_backward_word_starts(&ins, 1))
gtk_text_buffer_place_cursor(buffer, &ins);
}
Index: news.c
===================================================================
RCS file: /home/claws-mail/claws/src/news.c,v
retrieving revision 1.101.2.70
retrieving revision 1.101.2.71
diff -u -d -r1.101.2.70 -r1.101.2.71
--- news.c 7 Jul 2012 07:09:28 -0000 1.101.2.70
+++ news.c 16 Sep 2012 21:56:20 -0000 1.101.2.71
@@ -1255,7 +1255,8 @@
NewsSession *session;
GSList *elem, *msginfo_list = NULL, *tmp_msgnum_list, *tmp_msginfo_list;
guint first, last, next;
- guint tofetch, fetched;
+/* guint tofetch, fetched;
+*/
cm_return_val_if_fail(folder != NULL, NULL);
cm_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, NULL);
@@ -1269,8 +1270,9 @@
tmp_msgnum_list = g_slist_sort(tmp_msgnum_list, g_int_compare);
progressindicator_start(PROGRESS_TYPE_NETWORK);
- tofetch = g_slist_length(tmp_msgnum_list);
+/* tofetch = g_slist_length(tmp_msgnum_list);
fetched = 0;
+*/
first = GPOINTER_TO_INT(tmp_msgnum_list->data);
last = first;
@@ -1285,7 +1287,8 @@
*/
tmp_msginfo_list = news_get_msginfos_for_range(session, item, first, last);
msginfo_list = g_slist_concat(msginfo_list, tmp_msginfo_list);
- fetched = last - first + 1;
+/* fetched = last - first + 1;
+*/
first = next;
}
last = next;
Index: procmsg.c
===================================================================
RCS file: /home/claws-mail/claws/src/procmsg.c,v
retrieving revision 1.150.2.128
retrieving revision 1.150.2.129
diff -u -d -r1.150.2.128 -r1.150.2.129
--- procmsg.c 12 Sep 2012 09:27:42 -0000 1.150.2.128
+++ procmsg.c 16 Sep 2012 21:56:21 -0000 1.150.2.129
@@ -1138,6 +1138,7 @@
return 0;
}
+
void procmsg_print_message(MsgInfo *msginfo, const gchar *cmdline)
{
static const gchar *def_cmd = "lpr %s";
@@ -1168,17 +1169,20 @@
return;
}
- if (msginfo->date) r = fprintf(prfp, "Date: %s\n", msginfo->date);
- if (msginfo->from) r = fprintf(prfp, "From: %s\n", msginfo->from);
- if (msginfo->to) r = fprintf(prfp, "To: %s\n", msginfo->to);
- if (msginfo->cc) r = fprintf(prfp, "Cc: %s\n", msginfo->cc);
- if (msginfo->newsgroups)
- r = fprintf(prfp, "Newsgroups: %s\n", msginfo->newsgroups);
- if (msginfo->subject) r = fprintf(prfp, "Subject: %s\n", msginfo->subject);
- fputc('\n', prfp);
+ if (msginfo->date) { r = fprintf(prfp, "Date: %s\n", msginfo->date); if (r < 0) goto fpferr; }
+ if (msginfo->from) { r = fprintf(prfp, "From: %s\n", msginfo->from); if (r < 0) goto fpferr; }
+ if (msginfo->to) { r = fprintf(prfp, "To: %s\n", msginfo->to); if (r < 0) goto fpferr; }
+ if (msginfo->cc) { r = fprintf(prfp, "Cc: %s\n", msginfo->cc); if (r < 0) goto fpferr; }
+ if (msginfo->newsgroups) {
+ r = fprintf(prfp, "Newsgroups: %s\n", msginfo->newsgroups); if (r < 0) goto fpferr;
+ }
+ if (msginfo->subject) { r = fprintf(prfp, "Subject: %s\n", msginfo->subject); if (r < 0) goto fpferr; }
+ if (fputc('\n', prfp) == EOF) goto fpferr;
- while (fgets(buf, sizeof(buf), tmpfp) != NULL)
+ while (fgets(buf, sizeof(buf), tmpfp) != NULL) {
r = fputs(buf, prfp);
+ if (r == EOF) goto fpferr;
+ }
fclose(prfp);
fclose(tmpfp);
@@ -1200,6 +1204,12 @@
strncat(buf, "&", sizeof(buf) - strlen(buf) - 1);
if (system(buf) == -1)
g_warning("system(%s) failed.", buf);
+ return;
+fpferr:
+ FILE_OP_ERROR(prtmp, "fprintf/fputc/fputs");
+ g_free(prtmp);
+ fclose(tmpfp);
+ fclose(prfp);
}
MsgInfo *procmsg_msginfo_new_ref(MsgInfo *msginfo)
Index: prefs_account.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_account.c,v
retrieving revision 1.105.2.175
retrieving revision 1.105.2.176
diff -u -d -r1.105.2.175 -r1.105.2.176
--- prefs_account.c 8 Sep 2012 20:23:10 -0000 1.105.2.175
+++ prefs_account.c 16 Sep 2012 21:56:20 -0000 1.105.2.176
@@ -906,7 +906,6 @@
static void privacy_system_activated(GtkWidget *combobox)
{
const gchar *system_id;
- gboolean privacy_enabled = FALSE;
gint privacy_enabled_int;
GtkTreeIter iter;
GtkListStore *menu = GTK_LIST_STORE(gtk_combo_box_get_model(
@@ -919,11 +918,6 @@
COMBOBOX_DATA, &privacy_enabled_int,
-1);
- privacy_enabled = strcmp(system_id, "");
-
- if( privacy_enabled_int == 0 )
- privacy_enabled = FALSE;
-
gtk_widget_set_sensitive (privacy_page.save_clear_text_checkbtn,
!gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(privacy_page.encrypt_to_self_checkbtn)));
Index: prefs_customheader.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_customheader.c,v
retrieving revision 1.16.2.44
retrieving revision 1.16.2.45
diff -u -d -r1.16.2.44 -r1.16.2.45
--- prefs_customheader.c 7 Jul 2012 07:09:29 -0000 1.16.2.44
+++ prefs_customheader.c 16 Sep 2012 21:56:20 -0000 1.16.2.45
@@ -501,10 +501,6 @@
CustomHeader *ch;
const gchar *entry_text;
gchar *ch_str;
- GtkListStore *store;
-
- store = GTK_LIST_STORE(gtk_tree_view_get_model
- (GTK_TREE_VIEW(customhdr.list_view)));
entry_text = gtk_entry_get_text(GTK_ENTRY(customhdr.hdr_entry));
if (entry_text[0] == '\0') {
Index: prefs_toolbar.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_toolbar.c,v
retrieving revision 1.30.2.74
retrieving revision 1.30.2.75
diff -u -d -r1.30.2.74 -r1.30.2.75
--- prefs_toolbar.c 12 Sep 2012 09:23:12 -0000 1.30.2.74
+++ prefs_toolbar.c 16 Sep 2012 21:56:21 -0000 1.30.2.75
@@ -249,10 +249,6 @@
static void prefs_toolbar_create_widget(PrefsPage *_page, GtkWindow *window, gpointer data)
{
ToolbarPage *prefs_toolbar = (ToolbarPage *) _page;
- gchar *win_titles[3];
- win_titles[TOOLBAR_MAIN] = _("Main toolbar configuration");
- win_titles[TOOLBAR_COMPOSE] = _("Compose toolbar configuration");
- win_titles[TOOLBAR_MSGVIEW] = _("Message view toolbar configuration");
prefs_toolbar->window = GTK_WIDGET(window);
Index: addr_compl.c
===================================================================
RCS file: /home/claws-mail/claws/src/addr_compl.c,v
retrieving revision 1.27.2.64
retrieving revision 1.27.2.65
diff -u -d -r1.27.2.64 -r1.27.2.65
--- addr_compl.c 8 Sep 2012 20:23:09 -0000 1.27.2.64
+++ addr_compl.c 16 Sep 2012 21:56:20 -0000 1.27.2.65
@@ -254,13 +254,10 @@
static gint add_address(const gchar *name, const gchar *address,
const gchar *nick, const gchar *alias, GList *grp_emails)
{
- address_entry *ae;
- gboolean is_group = FALSE;
+ address_entry *ae;
if (!name || !address) {
- if (!address && !nick && !alias && grp_emails) {
- is_group = TRUE;
- } else
+ if (address || nick || alias || !grp_emails)
return -1;
}
Index: prefs_filtering.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_filtering.c,v
retrieving revision 1.59.2.92
retrieving revision 1.59.2.93
diff -u -d -r1.59.2.92 -r1.59.2.93
--- prefs_filtering.c 8 Sep 2012 20:23:10 -0000 1.59.2.92
+++ prefs_filtering.c 16 Sep 2012 21:56:20 -0000 1.59.2.93
@@ -1289,14 +1289,13 @@
static void prefs_filtering_page_up(gpointer action, gpointer data)
{
- gint row, target_row, n_rows;
+ gint row, target_row;
GtkTreeIter selected, target;
GtkTreeModel *model;
GtkTreePath *path;
GdkRectangle cell_rect, view_rect;
model = gtk_tree_view_get_model(GTK_TREE_VIEW(filtering.cond_list_view));
- n_rows = gtk_tree_model_iter_n_children(model, NULL);
row = gtkut_list_view_get_selected_row(filtering.cond_list_view);
if (row <= 1)
return;
Index: prefs_actions.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_actions.c,v
retrieving revision 1.60.2.82
retrieving revision 1.60.2.83
diff -u -d -r1.60.2.82 -r1.60.2.83
--- prefs_actions.c 7 Jul 2012 07:09:28 -0000 1.60.2.82
+++ prefs_actions.c 16 Sep 2012 21:56:20 -0000 1.60.2.83
@@ -590,10 +590,6 @@
gint len, action_nb;
gchar action[PREFSBUFSIZE];
gchar *new_action;
- GtkListStore *store;
-
- store = GTK_LIST_STORE(gtk_tree_view_get_model
- (GTK_TREE_VIEW(actions.actions_list_view)));
GET_ENTRY(actions.name_entry);
if (entry_text[0] == '\0') {
Index: printing.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/printing.c,v
retrieving revision 1.1.2.39
retrieving revision 1.1.2.40
diff -u -d -r1.1.2.39 -r1.1.2.40
--- printing.c 12 Sep 2012 09:23:12 -0000 1.1.2.39
+++ printing.c 16 Sep 2012 21:56:21 -0000 1.1.2.40
@@ -634,14 +634,12 @@
gpointer data)
{
PreviewData *preview_data;
- GtkPageOrientation orientation;
GtkPaperSize *paper_size;
gint paper_width;
gint paper_height;
preview_data = (PreviewData*) data;
debug_print("got_page_size\n");
- orientation = gtk_page_setup_get_orientation(page_setup);
paper_size = gtk_page_setup_get_paper_size(page_setup);
paper_width = (gint)(gtk_paper_size_get_width(paper_size, GTK_UNIT_INCH)
* PREVIEW_SCALE);
@@ -950,15 +948,10 @@
do {
PangoRectangle logical_rect;
- PangoLayoutLine *line;
PangoAttrShape *attr = NULL;
- int baseline;
if (ii >= start) {
- line = pango_layout_iter_get_line(iter);
-
pango_layout_iter_get_line_extents(iter, NULL, &logical_rect);
- baseline = pango_layout_iter_get_baseline(iter);
if ((attr = g_hash_table_lookup(print_data->images,
GINT_TO_POINTER(pango_layout_iter_get_index(iter)))) != NULL) {
@@ -1429,12 +1422,10 @@
*/
static gint printing_text_iter_get_offset_bytes(PrintData *print_data, const GtkTextIter *iter)
{
- gint off_chars;
gint off_bytes;
gchar *text;
GtkTextIter start;
- off_chars = gtk_text_iter_get_offset(iter);
if (print_data->sel_start < 0 || print_data->sel_end <= print_data->sel_start) {
gtk_text_buffer_get_start_iter(gtk_text_iter_get_buffer(iter), &start);
} else {
Index: action.c
===================================================================
RCS file: /home/claws-mail/claws/src/action.c,v
retrieving revision 1.12.2.73
retrieving revision 1.12.2.74
diff -u -d -r1.12.2.73 -r1.12.2.74
--- action.c 8 Sep 2012 20:23:09 -0000 1.12.2.73
+++ action.c 16 Sep 2012 21:56:20 -0000 1.12.2.74
@@ -973,18 +973,15 @@
ACTION_USER_IN |
ACTION_USER_HIDDEN_IN)) {
r |= close(fileno(stdin));
- (void) dup (chld_in[0]);
}
r |= close(chld_in[0]);
r |= close(chld_in[1]);
r |= close(fileno(stdout));
- (void) dup (chld_out[1]);
r |= close(chld_out[0]);
r |= close(chld_out[1]);
r |= close(fileno(stderr));
- (void) dup (chld_err[1]);
r |= close(chld_err[0]);
r |= close(chld_err[1]);
Index: imap_gtk.c
===================================================================
RCS file: /home/claws-mail/claws/src/imap_gtk.c,v
retrieving revision 1.1.2.72
retrieving revision 1.1.2.73
diff -u -d -r1.1.2.72 -r1.1.2.73
--- imap_gtk.c 8 Sep 2012 20:23:10 -0000 1.1.2.72
+++ imap_gtk.c 16 Sep 2012 21:56:20 -0000 1.1.2.73
@@ -247,7 +247,6 @@
gchar *new_folder;
gchar *name;
gchar *message;
- gchar *old_path;
gchar *old_id;
gchar *new_id;
gchar *base;
@@ -287,8 +286,6 @@
return;
}
- Xstrdup_a(old_path, item->path, {g_free(new_folder); return;});
-
old_id = folder_item_get_identifier(item);
if (folder_item_rename(item, new_folder) < 0) {
@@ -348,7 +345,6 @@
FolderItem *item;
gchar *message, *name;
AlertValue avalue;
- gchar *old_path;
gchar *old_id;
if (!folderview->selected) return;
@@ -370,7 +366,6 @@
g_free(message);
if (avalue != G_ALERTALTERNATE) return;
- Xstrdup_a(old_path, item->path, return);
old_id = folder_item_get_identifier(item);
if (folderview->opened == folderview->selected ||
More information about the Commits
mailing list