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

diff --git a/ChangeLog b/ChangeLog
index 07df5a2707ae06291869a597ca427a139407a7d6..c7b6f60b4c15738fce90af296ca51f26b95cb9b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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
+
 2006-12-23 [paul]      
 
        2.7.0-rc2 released

diff --git a/PATCHSETS b/PATCHSETS
index b7d27485b1a5cdbd92f30387e702286ac850d023..8ac234243fe40cbeea574e20e279936a5616dd1a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2172,3 +2172,4 @@
 ( cvs diff -u -r 1.9.2.45 -r 1.9.2.46 src/gtk/gtkaspell.c;  ) > 2.6.1cvs62.patchset
 ( cvs diff -u -r 1.382.2.343 -r 1.382.2.344 src/compose.c;  cvs diff -u -r 1.204.2.114 -r 1.204.2.115 src/prefs_common.c;  cvs diff -u -r 1.103.2.71 -r 1.103.2.72 src/prefs_common.h;  cvs diff -u -r 1.5.2.28 -r 1.5.2.29 src/prefs_spelling.c;  cvs diff -u -r 1.9.2.46 -r 1.9.2.47 src/gtk/gtkaspell.c;  cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/gtk/gtkaspell.h;  ) > 2.6.1cvs63.patchset
 ( cvs diff -u -r 1.43.2.57 -r 1.43.2.58 src/toolbar.c;  cvs diff -u -r 1.19.2.13 -r 1.19.2.14 src/toolbar.h;  cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/bogofilter/bogofilter.h;  ) > 2.6.1cvs64.patchset
+( cvs diff -u -r 1.5.2.46 -r 1.5.2.47 src/gtk/gtkutils.c;  cvs diff -u -r 1.179.2.141 -r 1.179.2.142 src/imap.c;  cvs diff -u -r 1.18.2.20 -r 1.18.2.21 src/jpilot.c;  cvs diff -u -r 1.15.2.39 -r 1.15.2.40 src/summary_search.c;  ) > 2.6.1cvs65.patchset

diff --git a/configure.ac b/configure.ac
index 6cfb53a3dc28a2b3ac8bfe457c807f7afd31c593..3225a0cee5d27439ab045a6301740d25dd08827e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=64
+EXTRA_VERSION=65
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 9659f8200e090260588e659a9615860bb00ec4d9..fa34ab65d2f93e1959689ec7326f51255529f126 100644 (file)
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -807,22 +807,22 @@ void gtkut_widget_init(void)
        GtkWidget *clist;
 
        clist = gtk_clist_new(1);
-       g_object_ref(G_OBJECT(clist));
-       gtk_object_sink(G_OBJECT(clist));
+       gtk_object_ref(GTK_OBJECT(clist));
+       gtk_object_sink(GTK_OBJECT(clist));
        gtkut_clist_bindings_add(clist);
-       g_object_unref(G_OBJECT(clist));
+       gtk_object_unref(GTK_OBJECT(clist));
 
        clist = gtk_ctree_new(1, 0);
-       g_object_ref(G_OBJECT(clist));
-       gtk_object_sink(G_OBJECT(clist));
+       gtk_object_ref(GTK_OBJECT(clist));
+       gtk_object_sink(GTK_OBJECT(clist));
        gtkut_clist_bindings_add(clist);
-       g_object_unref(G_OBJECT(clist));
+       gtk_object_unref(GTK_OBJECT(clist));
 
        clist = gtk_sctree_new_with_titles(1, 0, NULL);
-       g_object_ref(G_OBJECT(clist));
-       gtk_object_sink(G_OBJECT(clist));
+       gtk_object_ref(GTK_OBJECT(clist));
+       gtk_object_sink(GTK_OBJECT(clist));
        gtkut_clist_bindings_add(clist);
-       g_object_unref(G_OBJECT(clist));
+       gtk_object_unref(GTK_OBJECT(clist));
 }
 
 void gtkut_widget_set_app_icon(GtkWidget *widget)

diff --git a/src/imap.c b/src/imap.c
index dc0d851b6734a47b36f21601f26a19b0c7c02dfc..72bf7cf5ddb70006d104d1ed4f37d5ae1edfc787 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -293,8 +293,6 @@ static gint imap_status                     (IMAPSession    *session,
                                         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 @@ static void imap_delete_all_cached_messages(FolderItem *item)
        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_refresh_path_separator(IMAPFolder *folder, const gchar *subfol
 
 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, '/');

diff --git a/src/jpilot.c b/src/jpilot.c
index 83daba2dab165d8830be0cdd581435aa3c457a27..ea966ec139bcb239d8ccec2769f644a0d432168a 100644 (file)
--- a/src/jpilot.c
+++ b/src/jpilot.c
@@ -1147,7 +1147,7 @@ static void jpilot_load_address(
 {
        struct Address addr;
        gchar **addrEnt;
-       gint num, k;
+       gint k;
        gint cat_id = 0;
        guint unique_id;
        guchar attrib;
@@ -1162,16 +1162,8 @@ static void jpilot_load_address(
        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 @@ static void jpilot_load_address(
                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;

diff --git a/src/summary_search.c b/src/summary_search.c
index ba5148d8c1f7b9e2fa8ba325582a0dd607b91571..b861db7261f3dd2c60cd2c058b220bc3ad96927f 100644 (file)
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -114,12 +114,6 @@ static void summary_search_stop_clicked    (GtkButton      *button,
 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,
@@ -845,36 +839,6 @@ static void adv_condition_btn_clicked(GtkButton *button, gpointer data)
        }
 };
 
-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)
 {