2007-10-19 [colin] 3.0.2cvs92
authorColin Leroy <colin@colino.net>
Fri, 19 Oct 2007 06:50:41 +0000 (06:50 +0000)
committerColin Leroy <colin@colino.net>
Fri, 19 Oct 2007 06:50:41 +0000 (06:50 +0000)
* src/imap_gtk.c
* src/mimeview.c
* src/textview.c
* src/gtk/inputdialog.c
* src/gtk/inputdialog.h
Remove the last old combo; patch by
Pawel

ChangeLog
PATCHSETS
configure.ac
src/gtk/inputdialog.c
src/gtk/inputdialog.h
src/imap_gtk.c
src/mimeview.c
src/textview.c

index ddb2c5f..28d1472 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-10-19 [colin]     3.0.2cvs92
+
+       * src/imap_gtk.c
+       * src/mimeview.c
+       * src/textview.c
+       * src/gtk/inputdialog.c
+       * src/gtk/inputdialog.h
+               Remove the last old combo; patch by
+               Pawel
+
 2007-10-19 [colin]     3.0.2cvs91
 
        * src/common/ssl.c
 2007-10-19 [colin]     3.0.2cvs91
 
        * src/common/ssl.c
index 351cba2..73a31b5 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.4.2.21 -r 1.4.2.22 src/common/ssl_certificate.c;  ) > 3.0.2cvs89.patchset
 ( cvs diff -u -r 1.9.2.22 -r 1.9.2.23 src/common/ssl.c;  ) > 3.0.2cvs90.patchset
 ( cvs diff -u -r 1.9.2.23 -r 1.9.2.24 src/common/ssl.c;  ) > 3.0.2cvs91.patchset
 ( cvs diff -u -r 1.4.2.21 -r 1.4.2.22 src/common/ssl_certificate.c;  ) > 3.0.2cvs89.patchset
 ( cvs diff -u -r 1.9.2.22 -r 1.9.2.23 src/common/ssl.c;  ) > 3.0.2cvs90.patchset
 ( cvs diff -u -r 1.9.2.23 -r 1.9.2.24 src/common/ssl.c;  ) > 3.0.2cvs91.patchset
+( cvs diff -u -r 1.1.2.50 -r 1.1.2.51 src/imap_gtk.c;  cvs diff -u -r 1.83.2.120 -r 1.83.2.121 src/mimeview.c;  cvs diff -u -r 1.96.2.188 -r 1.96.2.189 src/textview.c;  cvs diff -u -r 1.2.2.25 -r 1.2.2.26 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/inputdialog.h;  ) > 3.0.2cvs92.patchset
index dc4e946..6a89774 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=91
+EXTRA_VERSION=92
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 5be55ab..46b02f4 100644 (file)
@@ -33,7 +33,7 @@
 #include <gtk/gtkhbox.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkentry.h>
 #include <gtk/gtkhbox.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkentry.h>
-#include <gtk/gtkcombo.h>
+#include <gtk/gtkcomboboxentry.h>
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkhbbox.h>
 #include <gtk/gtkstock.h>
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkhbbox.h>
 #include <gtk/gtkstock.h>
@@ -45,6 +45,7 @@
 #include "manage_window.h"
 #include "gtkutils.h"
 #include "utils.h"
 #include "manage_window.h"
 #include "gtkutils.h"
 #include "utils.h"
+#include "combobox.h"
 
 #define INPUT_DIALOG_WIDTH     420
 
 
 #define INPUT_DIALOG_WIDTH     420
 
@@ -136,16 +137,15 @@ gchar *input_dialog_with_invisible(const gchar *title, const gchar *message,
 }
 
 gchar *input_dialog_combo(const gchar *title, const gchar *message,
 }
 
 gchar *input_dialog_combo(const gchar *title, const gchar *message,
-                         const gchar *default_string, GList *list,
-                         gboolean case_sensitive)
+                         const gchar *default_string, GList *list)
 {
        return input_dialog_combo_remember(title, message, 
 {
        return input_dialog_combo_remember(title, message, 
-               default_string, list, case_sensitive, NULL);
+               default_string, list, FALSE);
 }
 
 gchar *input_dialog_combo_remember(const gchar *title, const gchar *message,
                          const gchar *default_string, GList *list,
 }
 
 gchar *input_dialog_combo_remember(const gchar *title, const gchar *message,
                          const gchar *default_string, GList *list,
-                         gboolean case_sensitive, gboolean *remember)
+                         gboolean *remember)
 {
        if (dialog && GTK_WIDGET_VISIBLE(dialog)) return NULL;
 
 {
        if (dialog && GTK_WIDGET_VISIBLE(dialog)) return NULL;
 
@@ -166,17 +166,8 @@ gchar *input_dialog_combo_remember(const gchar *title, const gchar *message,
        gtk_widget_hide(icon_p);
        is_pass = FALSE;
 
        gtk_widget_hide(icon_p);
        is_pass = FALSE;
 
-       if (!list) {
-               GList empty_list;
-
-               empty_list.data = (gpointer)"";
-               empty_list.next = NULL;
-               empty_list.prev = NULL;
-               gtk_combo_set_popdown_strings(GTK_COMBO(combo), &empty_list);
-       } else
-               gtk_combo_set_popdown_strings(GTK_COMBO(combo), list);
-
-       gtk_combo_set_case_sensitive(GTK_COMBO(combo), case_sensitive);
+       combobox_unset_popdown_strings(GTK_COMBO_BOX(combo));
+       combobox_set_popdown_strings(GTK_COMBO_BOX(combo), list);
 
        return input_dialog_open(title, message, default_string, remember);
 }
 
        return input_dialog_open(title, message, default_string, remember);
 }
@@ -270,9 +261,9 @@ static void input_dialog_create(gboolean is_password)
        g_signal_connect(G_OBJECT(entry), "activate",
                         G_CALLBACK(entry_activated), NULL);
 
        g_signal_connect(G_OBJECT(entry), "activate",
                         G_CALLBACK(entry_activated), NULL);
 
-       combo = gtk_combo_new();
+       combo = gtk_combo_box_entry_new_text();
        gtk_box_pack_start(GTK_BOX(vbox), combo, FALSE, FALSE, 0);
        gtk_box_pack_start(GTK_BOX(vbox), combo, FALSE, FALSE, 0);
-       g_signal_connect(G_OBJECT(GTK_COMBO(combo)->entry), "activate",
+       g_signal_connect(G_OBJECT(GTK_BIN(combo)->child), "activate",
                         G_CALLBACK(combo_activated), NULL);
 
        remember_checkbtn = gtk_check_button_new_with_label(_("Remember this"));
                         G_CALLBACK(combo_activated), NULL);
 
        remember_checkbtn = gtk_check_button_new_with_label(_("Remember this"));
@@ -342,7 +333,7 @@ static gchar *input_dialog_open(const gchar *title, const gchar *message,
                GtkEditable *editable;
 
                if (type == INPUT_DIALOG_COMBO)
                GtkEditable *editable;
 
                if (type == INPUT_DIALOG_COMBO)
-                       editable = GTK_EDITABLE(GTK_COMBO(combo)->entry);
+                       editable = GTK_EDITABLE(GTK_BIN(combo)->child);
                else
                        editable = GTK_EDITABLE(entry);
 
                else
                        editable = GTK_EDITABLE(entry);
 
@@ -372,7 +363,7 @@ static void input_dialog_set(const gchar *title, const gchar *message,
        GtkWidget *entry_;
 
        if (type == INPUT_DIALOG_COMBO)
        GtkWidget *entry_;
 
        if (type == INPUT_DIALOG_COMBO)
-               entry_ = GTK_COMBO(combo)->entry;
+               entry_ = GTK_BIN(combo)->child;
        else
                entry_ = entry;
 
        else
                entry_ = entry;
 
index 1784a09..992635e 100644 (file)
@@ -31,13 +31,11 @@ gchar *input_dialog_with_invisible  (const gchar    *title,
 gchar *input_dialog_combo              (const gchar    *title,
                                         const gchar    *message,
                                         const gchar    *default_string,
 gchar *input_dialog_combo              (const gchar    *title,
                                         const gchar    *message,
                                         const gchar    *default_string,
-                                        GList          *list,
-                                        gboolean        case_sensitive);
+                                        GList          *list);
 gchar *input_dialog_combo_remember     (const gchar    *title,
                                         const gchar    *message,
                                         const gchar    *default_string,
                                         GList          *list,
 gchar *input_dialog_combo_remember     (const gchar    *title,
                                         const gchar    *message,
                                         const gchar    *default_string,
                                         GList          *list,
-                                        gboolean        case_sensitive,
                                         gboolean       *remember);
 gchar *input_dialog_query_password     (const gchar    *server,
                                         const gchar    *user);
                                         gboolean       *remember);
 gchar *input_dialog_query_password     (const gchar    *server,
                                         const gchar    *user);
index ab3a55e..c080ff7 100644 (file)
@@ -466,7 +466,7 @@ static void subscribe_cb(FolderView *folderview, guint action,
                                        item->name); 
                        gchar *child_folder = input_dialog_combo(_("Subscribe"), 
                                        msg,
                                        item->name); 
                        gchar *child_folder = input_dialog_combo(_("Subscribe"), 
                                        msg,
-                                       child_list->next?_("All of them"):child_list->data, child_list, TRUE);
+                                       child_list->next?_("All of them"):child_list->data, child_list);
                        g_free(msg);
                        if (child_folder && strcmp(child_folder, _("All of them"))) {
                                r = imap_subscribe(item->folder, NULL, child_folder, TRUE);
                        g_free(msg);
                        if (child_folder && strcmp(child_folder, _("All of them"))) {
                                r = imap_subscribe(item->folder, NULL, child_folder, TRUE);
index 595d62f..7283de3 100644 (file)
@@ -1861,16 +1861,14 @@ static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboo
                                 _("Enter the command line to open file:\n"
                                   "('%s' will be replaced with file name)"),
                                 mime_command ? mime_command : prefs_common.mime_open_cmd,
                                 _("Enter the command line to open file:\n"
                                   "('%s' will be replaced with file name)"),
                                 mime_command ? mime_command : prefs_common.mime_open_cmd,
-                                prefs_common.mime_open_cmd_history,
-                                TRUE, &remember);
+                                prefs_common.mime_open_cmd_history, &remember);
                else
                        cmd = input_dialog_combo
                                (_("Open with"),
                                 _("Enter the command line to open file:\n"
                                   "('%s' will be replaced with file name)"),
                                 mime_command ? mime_command : prefs_common.mime_open_cmd,
                else
                        cmd = input_dialog_combo
                                (_("Open with"),
                                 _("Enter the command line to open file:\n"
                                   "('%s' will be replaced with file name)"),
                                 mime_command ? mime_command : prefs_common.mime_open_cmd,
-                                prefs_common.mime_open_cmd_history,
-                                TRUE);
+                                prefs_common.mime_open_cmd_history);
                if (cmd && remember) {
                        mailcap_update_default(content_type, cmd);
                }
                if (cmd && remember) {
                        mailcap_update_default(content_type, cmd);
                }
index aec14f0..eb97a00 100644 (file)
@@ -2786,7 +2786,7 @@ static void open_image_cb (TextView *textview, guint action, void *data)
                           "('%s' will be replaced with file name)"),
                         prefs_common.mime_open_cmd,
                         prefs_common.mime_open_cmd_history,
                           "('%s' will be replaced with file name)"),
                         prefs_common.mime_open_cmd,
                         prefs_common.mime_open_cmd_history,
-                        TRUE, &remember);
+                        &remember);
                if (cmd && remember) {
                        mailcap_update_default("image/jpeg", cmd);
                }
                if (cmd && remember) {
                        mailcap_update_default("image/jpeg", cmd);
                }