CVS: sylpheedclaws/sylpheed-claws/src imap.c,1.179.2.141,1.179.2.142 jpilot.c,1.18.2.20,1.18.2.21 summary_search.c,1.15.2.39,1.15.2.40

Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws/src
In directory sunsite.dk:/tmp/cvs-serv16426/src

Modified Files:
      Tag: gtk2
	imap.c jpilot.c summary_search.c 
Log Message:
2006-12-22 [colin]	2.6.1cvs65

	* src/gtk/gtkutils.c
	* src/imap.c
	* src/jpilot.c
	* src/summary_search.c
		A few warning fixes

Index: imap.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/imap.c,v
retrieving revision 1.179.2.141
retrieving revision 1.179.2.142
diff -u -d -r1.179.2.141 -r1.179.2.142
--- imap.c	2006/12/18 21:30:57	1.179.2.141
+++ imap.c	2006/12/22 21:01:09	1.179.2.142
@@ -293,8 +293,6 @@
 					 gint		*unseen,
 					 gboolean	 block);
 
-static IMAPNameSpace *imap_find_namespace	(IMAPFolder	*folder,
-						 const gchar	*path);
 static gchar imap_get_path_separator		(IMAPFolder	*folder,
 						 const gchar	*path);
 static gchar *imap_get_real_path		(IMAPFolder	*folder,
@@ -2266,47 +2264,6 @@
 	debug_print("done.\n");
 }
 
-static IMAPNameSpace *imap_find_namespace_from_list(GList *ns_list,
-						    const gchar *path)
-{
-	IMAPNameSpace *namespace = NULL;
-	gchar *tmp_path, *name;
-
-	if (!path) path = "";
-
-	for (; ns_list != NULL; ns_list = ns_list->next) {
-		IMAPNameSpace *tmp_ns = ns_list->data;
-
-		Xstrcat_a(tmp_path, path, "/", return namespace);
-		Xstrdup_a(name, tmp_ns->name, return namespace);
-		if (tmp_ns->separator && tmp_ns->separator != '/') {
-			subst_char(tmp_path, tmp_ns->separator, '/');
-			subst_char(name, tmp_ns->separator, '/');
-		}
-		if (strncmp(tmp_path, name, strlen(name)) == 0)
-			namespace = tmp_ns;
-	}
-
-	return namespace;
-}
-
-static IMAPNameSpace *imap_find_namespace(IMAPFolder *folder,
-					  const gchar *path)
-{
-	IMAPNameSpace *namespace;
-
-	g_return_val_if_fail(folder != NULL, NULL);
-
-	namespace = imap_find_namespace_from_list(folder->ns_personal, path);
-	if (namespace) return namespace;
-	namespace = imap_find_namespace_from_list(folder->ns_others, path);
-	if (namespace) return namespace;
-	namespace = imap_find_namespace_from_list(folder->ns_shared, path);
-	if (namespace) return namespace;
-
-	return NULL;
-}
-
 gchar imap_get_path_separator_for_item(FolderItem *item)
 {
 	Folder *folder = NULL;
@@ -2355,7 +2312,6 @@
 
 static gchar imap_get_path_separator(IMAPFolder *folder, const gchar *path)
 {
-	IMAPNameSpace *namespace;
 	gchar separator = '/';
 	IMAPSession *session = imap_session_get(FOLDER(folder));
 	g_return_val_if_fail(session != NULL, '/');

Index: jpilot.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/jpilot.c,v
retrieving revision 1.18.2.20
retrieving revision 1.18.2.21
diff -u -d -r1.18.2.20 -r1.18.2.21
--- jpilot.c	2006/12/19 20:02:04	1.18.2.20
+++ jpilot.c	2006/12/22 21:01:10	1.18.2.21
@@ -1147,7 +1147,7 @@
 {
 	struct Address addr;
 	gchar **addrEnt;
-	gint num, k;
+	gint k;
 	gint cat_id = 0;
 	guint unique_id;
 	guchar attrib;
@@ -1162,16 +1162,8 @@
 	gchar **lastName = NULL;
 #if (PILOT_LINK_MAJOR > 11)
 	pi_buffer_t *RecordBuffer;
-#endif /* PILOT_LINK_0_12 */
-
-	/* Retrieve address */
-#if (PILOT_LINK_MAJOR < 12)
-	num = unpack_Address(&addr, buf->buf, buf->size);
-	if (num <= 0) {
-		return;
-	}
-#else /* PILOT_LINK_0_12 */
 	RecordBuffer = pi_buffer_new(buf->size);
+
 	memcpy(RecordBuffer->data, buf->buf, buf->size);
 	RecordBuffer->used = buf->size;
 	if (unpack_Address(&addr, RecordBuffer, address_v1) == -1) {
@@ -1179,7 +1171,15 @@
 		return;
 	}
 	pi_buffer_free(RecordBuffer);
-#endif
+#else
+	gint num;
+
+	num = unpack_Address(&addr, buf->buf, buf->size);
+	if (num <= 0) {
+		return;
+	}
+#endif /* PILOT_LINK_0_12 */
+
 	addrEnt = addr.entry;
 	attrib = buf->attrib;
 	unique_id = buf->unique_id;

Index: summary_search.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/summary_search.c,v
retrieving revision 1.15.2.39
retrieving revision 1.15.2.40
diff -u -d -r1.15.2.39 -r1.15.2.40
--- summary_search.c	2006/12/05 14:59:16	1.15.2.39
+++ summary_search.c	2006/12/22 21:01:11	1.15.2.40
@@ -114,12 +114,6 @@
 static void adv_condition_btn_clicked	(GtkButton	*button,
 					 gpointer	 data);
 
-static void from_changed			(void);
-static void to_changed				(void);
-static void subject_changed			(void);
-static void body_changed			(void);
-static void adv_condition_changed	(void);
-
 static gboolean from_entry_focus_evt_in(GtkWidget *widget, GdkEventFocus *event,
 			      	  gpointer data);
 static gboolean from_entry_focus_evt_out(GtkWidget *widget, GdkEventFocus *event,
@@ -844,36 +838,6 @@
 		matcherlist_free(matchers);
 	}
 };
-
-static void from_changed(void)
-{
-	if (!search_window.from_entry_has_focus)
-		gtk_widget_grab_focus(search_window.from_entry);
-}
-
-static void to_changed(void)
-{
-	if (!search_window.to_entry_has_focus)
-		gtk_widget_grab_focus(search_window.to_entry);
-}
-
-static void subject_changed(void)
-{
-	if (!search_window.subject_entry_has_focus)
-		gtk_widget_grab_focus(search_window.subject_entry);
-}
-
-static void body_changed(void)
-{
-	if (!search_window.body_entry_has_focus)
-		gtk_widget_grab_focus(search_window.body_entry);
-}
-
-static void adv_condition_changed(void)
-{
-	if (!search_window.adv_condition_entry_has_focus)
-		gtk_widget_grab_focus(search_window.adv_condition_entry);
-}
 
 static gboolean from_entry_focus_evt_in(GtkWidget *widget, GdkEventFocus *event,
 			      	  gpointer data)