From: Colin Leroy Date: Sat, 17 Jul 2004 16:58:04 +0000 (+0000) Subject: squash warnings X-Git-Tag: gtk2_win32_last_merge~336 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=907537be5d42ab5a904cac1ffba538c9b81eac0e squash warnings --- diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 5f7b80aec..e3d4bc64f 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,11 @@ +2004-07-17 [colin] 0.9.12cvs28.2 + + * src/mimeview.c + * src/procmime.c + * src/summaryview.c + * src/gtk/menu.c + Squash some compile and glib warnings + 2004-07-17 [paul] 0.9.12cvs28.1 * src/mimeview.c diff --git a/PATCHSETS b/PATCHSETS index 262d7baa5..4e703132e 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -31,3 +31,4 @@ ( cvs diff -u -r 1.213.2.9 -r 1.213.2.10 src/folder.c; ) > 0.9.12cvs18.14.patchset ( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/gtk/quicksearch.c; cvs diff -u -r 1.61.2.6 -r 1.61.2.7 src/account.c; cvs diff -u -r 1.11 -r 1.11.2.1 src/account.h; cvs diff -u -r 1.382.2.20 -r 1.382.2.21 src/compose.c; cvs diff -u -r 1.5.2.1 -r 1.5.2.2 src/customheader.c; cvs diff -u -r 1.2.2.2 -r 1.2.2.3 src/folder_item_prefs.c; cvs diff -u -r 1.115.2.9 -r 1.115.2.10 src/main.c; cvs diff -u -r 1.274.2.8 -r 1.274.2.9 src/mainwindow.c; cvs diff -u -r 1.94.2.20 -r 1.94.2.21 src/messageview.c; cvs diff -u -r 1.83.2.8 -r 1.83.2.9 src/mimeview.c; cvs diff -u -r 1.101.2.4 -r 1.101.2.5 src/news.c; cvs diff -u -r 1.10.2.2 -r 1.10.2.3 src/pgpmime.c; cvs diff -u -r 1.56.2.17 -r 1.56.2.18 src/pop.c; cvs diff -u -r 1.17.2.11 -r 1.17.2.12 src/pop.h; cvs diff -u -r 1.105.2.6 -r 1.105.2.7 src/prefs_account.c; cvs diff -u -r 1.49.2.2 -r 1.49.2.3 src/prefs_account.h; cvs diff -u -r 1.204.2.13 -r 1.204.2.14 src/prefs_common.c; cvs diff -u -r 1.103.2.6 -r 1.103.2.7 src/prefs_common.h; cvs diff -u -r 1.16.2.2 -r 1.16.2.3 src/prefs_display_header.c; cvs diff -u -r 1.10.2.3 -r 1.10.2.4 src/prefs_gtk.c; cvs diff -u -r 1.5.2.1 -r 1.5.2.2 src/prefs_gtk.h; cvs diff -u -r 1.47.2.7 -r 1.47.2.8 src/procheader.c; cvs diff -u -r 1.49.2.6 -r 1.49.2.7 src/procmime.c; ) > 0.9.12cvs26.1.patchset ( cvs diff -u -r 1.2504.2.7 -r 1.2504.2.8 ChangeLog.claws; cvs diff -u -r 1.654.2.60 -r 1.654.2.61 configure.ac; cvs diff -u -r 1.83.2.9 -r 1.83.2.10 src/mimeview.c; ) > 0.9.12cvs28.1.patchset +( cvs diff -u -r 1.83.2.10 -r 1.83.2.11 src/mimeview.c; cvs diff -u -r 1.49.2.7 -r 1.49.2.8 src/procmime.c; cvs diff -u -r 1.395.2.18 -r 1.395.2.19 src/summaryview.c; cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/gtk/menu.c; ) > 0.9.12cvs28.2.patchset diff --git a/configure.ac b/configure.ac index d33427c7d..71a60ab35 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ INTERFACE_AGE=0 BINARY_AGE=0 EXTRA_VERSION=28 EXTRA_RELEASE= -EXTRA_GTK2_VERSION=.1 +EXTRA_GTK2_VERSION=.2 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION} diff --git a/src/gtk/menu.c b/src/gtk/menu.c index f3b1fc7cc..f6ec17126 100644 --- a/src/gtk/menu.c +++ b/src/gtk/menu.c @@ -224,10 +224,13 @@ static void menu_item_remove_accel(GtkWidget *widget, GtkAccelGroup *accel_group static void connect_accel_change_signals(GtkWidget* widget, GtkWidget *wid2) { +#warning FIXME_GTK2 +#if 0 g_signal_connect_after(G_OBJECT(widget), "add_accelerator", G_CALLBACK(menu_item_add_accel), wid2); g_signal_connect_after(G_OBJECT(widget), "remove_accelerator", G_CALLBACK(menu_item_remove_accel), wid2); +#endif } void menu_connect_identical_items(void) diff --git a/src/mimeview.c b/src/mimeview.c index 49a81545e..33fa522fb 100644 --- a/src/mimeview.c +++ b/src/mimeview.c @@ -630,7 +630,7 @@ static void display_full_info_cb(GtkWidget *widget, gpointer user_data); static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo) { gchar *text = NULL, *button_text = NULL; - GtkSignalFunc func = NULL; + void *func = NULL; StockPixmap icon = STOCK_PIXMAP_PRIVACY_SIGNED; g_return_if_fail(mimeview != NULL); @@ -670,7 +670,7 @@ static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo) noticeview_set_button_text(mimeview->siginfoview, button_text); noticeview_set_button_press_callback( mimeview->siginfoview, - func, + GTK_SIGNAL_FUNC(func), (gpointer) mimeview); noticeview_set_icon(mimeview->siginfoview, icon); } @@ -940,7 +940,7 @@ static void mimeview_drag_data_get(GtkWidget *widget, guint time, MimeView *mimeview) { - gchar *filename, *uriname; + gchar *filename, *uriname, *tmp; MimeInfo *partinfo; if (!mimeview->opened) return; @@ -949,12 +949,16 @@ static void mimeview_drag_data_get(GtkWidget *widget, partinfo = mimeview_get_selected_part(mimeview); if (!partinfo) return; - filename = g_basename(get_part_name(partinfo)); + filename = g_path_get_basename(get_part_name(partinfo)); if (*filename == '\0') return; + tmp = filename; + filename = g_strconcat(get_mime_tmp_dir(), G_DIR_SEPARATOR_S, filename, NULL); + g_free(tmp); + if (procmime_get_part(filename, partinfo) < 0) alertpanel_error (_("Can't save the part of multipart message.")); @@ -1616,7 +1620,6 @@ static void icon_list_clear (MimeView *mimeview) mimeview->icon_count = 0; adj = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll)); adj->value = adj->lower; - g_signal_stop_emission_by_name(G_OBJECT (adj), "value_changed"); } static void icon_list_toggle_by_mime_info(MimeView *mimeview, diff --git a/src/procmime.c b/src/procmime.c index bc7800ac2..aa1ff357a 100644 --- a/src/procmime.c +++ b/src/procmime.c @@ -100,7 +100,8 @@ void procmime_mimeinfo_free_all(MimeInfo *mimeinfo) { GNode *node; - g_return_if_fail(mimeinfo); + if (!mimeinfo) + return; node = mimeinfo->node; g_node_traverse(node, G_IN_ORDER, G_TRAVERSE_ALL, -1, free_func, NULL); @@ -227,7 +228,6 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo) gchar buf[BUFFSIZE]; gint readend; gchar *tmpfilename; - gchar *mimetmpdir; FILE *outfp, *infp; struct stat statbuf; @@ -243,8 +243,7 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo) } fseek(infp, mimeinfo->offset, SEEK_SET); - mimetmpdir = get_mime_tmp_dir(); - outfp = get_tmpfile_in_dir(mimetmpdir, &tmpfilename); + outfp = get_tmpfile_in_dir(get_mime_tmp_dir(), &tmpfilename); if (!outfp) { perror("tmpfile"); return FALSE; diff --git a/src/summaryview.c b/src/summaryview.c index 43e47bd0c..54e84d206 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -861,9 +861,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item) summaryview->folder_item = item; item->opened = TRUE; - g_signal_handlers_unblock_matched(G_OBJECT(ctree), G_SIGNAL_MATCH_DATA, - 0, 0, NULL, NULL, summaryview); - buf = g_strdup_printf(_("Scanning folder (%s)..."), item->path); debug_print("%s\n", buf); STATUSBAR_PUSH(summaryview->mainwin, buf); @@ -964,9 +961,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item) if (summaryview->sort_key != SORT_BY_NONE) summary_sort(summaryview, summaryview->sort_key, summaryview->sort_type); - g_signal_handlers_unblock_matched(G_OBJECT(ctree), G_SIGNAL_MATCH_DATA, - 0, 0, NULL, NULL, summaryview); - gtk_clist_thaw(GTK_CLIST(ctree)); if (is_refresh) {