Re: Warning fixes

On Thu, 2006-09-21 at 08:33 -0400, Matthew Barnes wrote:
> I'd prefer to see GINT_TO_POINTER (1).

Sorry, I didn't realize I was supposed to re-send the patch.  Here's
that patch again, with GINT_TO_POINTER and without changes in
addressbook, which have been applied in the meantime.

--- composer/ChangeLog
+++ composer/ChangeLog
@@ -1 +1,6 @@
+2006-09-20  Pavel Roskin  <[email protected]>
+
+	* composer/e-msg-composer.c (e_msg_composer_show_attachments):
+	Comment out, it's unused and not declared in the headers.
+
 2006-08-24  Ushveen Kaur <[email protected]>
--- composer/e-msg-composer.c
+++ composer/e-msg-composer.c
@@ -4929,6 +4929,7 @@ e_msg_composer_new_from_url (const char 
 * 	 
 * If @show is %FALSE, hide the attachment bar.  Otherwise, show it. 	 
 **/ 	 
+#if 0
 void 	 
 e_msg_composer_show_attachments (EMsgComposer *composer, 	 
 				 gboolean show) 	 
@@ -4937,6 +4938,7 @@ e_msg_composer_show_attachments (EMsgCom
 
 	show_attachments (composer, show); 	 
 }
+#endif
 
 /**
  * e_msg_composer_set_headers:
--- e-util/ChangeLog
+++ e-util/ChangeLog
@@ -1 +1,8 @@
+2006-09-20  Pavel Roskin  <[email protected]>
+
+	* e-profile-event.c (e_profile_event_emit): Provide declaration
+	if ENABLE_PROFILING is not defined to suppress gcc warning.
+	* e-util.h (get_font_options): Fix argument list.
+	* e-util.c (get_font_options): Likewise.
+
 2006-09-18  Matthew Barnes  <[email protected]>
--- e-util/e-profile-event.c
+++ e-util/e-profile-event.c
@@ -135,6 +135,7 @@ e_profile_event_emit(const char *id, con
 }
 #else
 #undef e_profile_event_emit
+void e_profile_event_emit(const char *id, const char *uid, guint32 flags);
 void
 e_profile_event_emit(const char *id, const char *uid, guint32 flags)
 {
--- e-util/e-util.c
+++ e-util/e-util.c
@@ -1127,7 +1127,7 @@ e_gettext (const char *msgid)
 }
 
 cairo_font_options_t *
-get_font_options ()
+get_font_options (void)
 {
 	char *antialiasing, *hinting, *subpixel_order;
 	GConfClient *gconf = gconf_client_get_default ();
--- e-util/e-util.h
+++ e-util/e-util.h
@@ -215,7 +215,7 @@
    Less than 0 for the int means copy the whole string. */
 gchar    *e_strdup_append_strings                                          (gchar             *first_string,
 									    ...);
-cairo_font_options_t * get_font_options ();
+cairo_font_options_t * get_font_options (void);
 
 #ifdef __cplusplus
 }
--- mail/ChangeLog
+++ mail/ChangeLog
@@ -1 +1,8 @@
+2006-09-20  Pavel Roskin  <[email protected]>
+
+	* mail-send-recv.c (dialog_map): Make static.
+	* message-list.c (message_list_set_threaded): Comment out,
+	it's currently unused.
+	(message_list_setup_etree): Make cast to gpointer explicit.
+
 2006-10-16  Tor Lillqvist  <[email protected]>
--- mail/em-utils.c
+++ mail/em-utils.c
@@ -343,7 +343,7 @@ em_utils_edit_filters (GtkWidget *parent
  * Picked this from e-d-s/libedataserver/e-data. 
  * But it allows more characters to occur in filenames, especially when saving attachment.
  */
-void
+static void
 em_filename_make_safe (gchar *string)
 {
 	gchar *p, *ts;
--- mail/mail-send-recv.c
+++ mail/mail-send-recv.c
@@ -312,7 +312,7 @@ static send_info_t get_receive_type(cons
 	return SEND_INVALID;
 }
 
-gboolean
+static gboolean
 dialog_map (GtkWidget *window, GdkEvent  *event, GtkWidget *table)
 {
 	int h, w;
--- mail/message-list.c
+++ mail/message-list.c
@@ -1719,7 +1719,7 @@ message_list_setup_etree (MessageList *m
 		d(printf ("folder name is '%s'\n", name));
 		
 		path = mail_config_folder_to_cachename (message_list->folder, "et-expanded-");
-		g_object_set_data (((GnomeCanvasItem *) item)->canvas, "freeze-cursor", 1);
+		g_object_set_data (((GnomeCanvasItem *) item)->canvas, "freeze-cursor", GINT_TO_POINTER (1));
 
 		if (path && g_stat (path, &st) == 0 && st.st_size > 0 && S_ISREG (st.st_mode)) {
 			/* build based on saved file */
@@ -3351,6 +3351,7 @@ message_list_set_threaded (MessageList *
 	}
 }
 
+#if 0
 void
 message_list_set_expand_all (MessageList *ml, gboolean threaded)
 {
@@ -3361,6 +3362,7 @@ message_list_set_expand_all (MessageList
 			mail_regen_list (ml, ml->search, NULL, NULL);
 	}
 }
+#endif
 
 void
 message_list_set_hidedeleted (MessageList *ml, gboolean hidedeleted)
--- plugins/sa-junk-plugin/ChangeLog
+++ plugins/sa-junk-plugin/ChangeLog
@@ -1 +1,5 @@
+2006-09-20  Pavel Roskin  <[email protected]>
+
+	* em-junk-filter.c (em_junk_sa_get_name): Remove, it's unused.
+
 2006-08-22  Kjartan Maraas  <[email protected]>
--- plugins/sa-junk-plugin/em-junk-filter.c
+++ plugins/sa-junk-plugin/em-junk-filter.c
@@ -57,7 +57,6 @@ static pthread_mutex_t em_junk_sa_prefer
 static pthread_mutex_t em_junk_sa_spamd_restart_lock = PTHREAD_MUTEX_INITIALIZER;
 
 int e_plugin_lib_enable (EPluginLib *ep, int enable);
-static const char *em_junk_sa_get_name (void);
 gboolean em_junk_sa_check_junk (EPlugin *ep, EMJunkHookTarget *target);
 void em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target);
 void em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target);
@@ -95,14 +94,6 @@ static int em_junk_sa_spamd_restarts_cou
 char *em_junk_sa_spamc_gconf_binary = NULL;
 char *em_junk_sa_spamd_gconf_binary = NULL;
 
-#if 0
-static const char *
-em_junk_sa_get_name (void)
-{
-	return _("Spamassassin (built-in)");
-}
-#endif
-
 static int
 pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, int wait_for_termination, GByteArray *output_buffer)
 {
--- shell/ChangeLog
+++ shell/ChangeLog
@@ -1 +1,8 @@
+2006-09-20  Pavel Roskin  <[email protected]>
+
+	* e-shell-window.c: Move some declarations ...
+	* e-shell-nm.h: ... to a separate header.
+	* e-shell-nm-glib.c: Include e-shell-nm.h.
+	* e-shell-nm.c: Likewise.
+
 2006-10-17  Harish Krishnaswamy  <[email protected]>
--- shell/e-shell-nm-glib.c
+++ shell/e-shell-nm-glib.c
@@ -30,6 +30,8 @@
 #include <NetworkManager/libnm_glib.h>
 #include <e-shell-window.h>
 
+#include "e-shell-nm.h"
+
 static libnm_glib_ctx *nm_ctx = NULL;
 static guint id = 0;
 
--- shell/e-shell-nm.c
+++ shell/e-shell-nm.c
@@ -35,6 +35,8 @@
 #include <dbus/dbus-glib.h>
 #include <NetworkManager/NetworkManager.h>
 
+#include "e-shell-nm.h"
+
 typedef enum _ShellLineStatus {
 	E_SHELL_LINE_DOWN,
 	E_SHELL_LINE_UP
--- /dev/null
+++ shell/e-shell-nm.h
@@ -0,0 +1,32 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Copyright (C) 2006  Pavel Roskin
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ *
+ * Author: Pavel Roskin <[email protected]>
+ */
+
+#ifndef _E_SHELL_NM_H_
+
+#ifdef NM_SUPPORT_GLIB
+int e_shell_nm_glib_initialise (EShellWindow *window);
+void e_shell_nm_glib_dispose (EShellWindow *window);
+#elif NM_SUPPORT
+int e_shell_dbus_initialise (EShellWindow *window);
+void e_shell_dbus_dispose (EShellWindow *window);
+#endif
+
+#endif /* _E_SHELL_NM_H_ */
--- shell/e-shell-window.c
+++ shell/e-shell-window.c
@@ -58,13 +58,7 @@
 
 #include <string.h>
 
-#ifdef NM_SUPPORT_GLIB
-void e_shell_nm_glib_initialise (EShellWindow *window);
-void e_shell_nm_glib_dispose (EShellWindow *window);
-#elif NM_SUPPORT
-void e_shell_dbus_initialise (EShellWindow *window);
-void e_shell_dbus_dispose (EShellWindow *window);
-#endif
+#include "e-shell-nm.h"
 
 /* A view for each component.  These are all created when EShellWindow is
    instantiated, but with the widget pointers to NULL and the page number set
--- widgets/misc/ChangeLog
+++ widgets/misc/ChangeLog
@@ -1 +1,6 @@
+2006-09-20  Pavel Roskin  <[email protected]>
+
+	* misc/e-filter-bar.c: Fix initialization of an integer field
+	with a pointer.
+
 2006-10-11  Srinivasa Ragavan  <[email protected]>
--- widgets/misc/e-filter-bar.c
+++ widgets/misc/e-filter-bar.c
@@ -933,7 +933,7 @@ e_filter_bar_new (RuleContext *context,
 		  void *data)
 {
 	EFilterBar *bar;
-	ESearchBarItem item = { NULL, -1, NULL };
+	ESearchBarItem item = { NULL, -1, 0 };
 	
 	bar = gtk_type_new (e_filter_bar_get_type ());
 
--- widgets/table/ChangeLog
+++ widgets/table/ChangeLog
@@ -1 +1,5 @@
+2006-09-20  Pavel Roskin  <[email protected]>
+
+	* e-tree-table-adapter.c (resort_model): Make static.
+
 2006-08-24  Hiroyuki Ikezoe  <[email protected]>
--- widgets/table/e-tree-table-adapter.c
+++ widgets/table/e-tree-table-adapter.c
@@ -746,7 +746,8 @@ etta_proxy_no_change (ETreeModel *etm, E
 	e_table_model_no_change(E_TABLE_MODEL(etta));
 }
 
-guint resort_model (ETreeTableAdapter *etta)
+static guint
+resort_model (ETreeTableAdapter *etta)
 {
 	etta_sort_info_changed (NULL, etta);
 	return FALSE;


-- 
Regards,
Pavel Roskin