commit d1523ad7ac4311e28c57b1d6ddb9baa0f326d7a5
parent 6438ecda776a5d16f33e6157df75aaf9130610c8
Author: Colin Leroy <colin@colino.net>
Date: Fri, 1 Aug 2008 11:12:08 +0000
2008-08-01 [colin] 3.5.0cvs42
* src/compose.c
* src/foldersel.c
* src/mainwindow.c
* src/prefs_account.c
* src/prefs_folder_item.c
* src/prefs_quote.c
* src/summaryview.c
* src/gtk/gtkaspell.c
* src/gtk/gtkutils.c
* src/gtk/gtkvscrollbutton.c
Replace a few deprecated function calls
Diffstat:
13 files changed, 52 insertions(+), 38 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,17 @@
+2008-08-01 [colin] 3.5.0cvs42
+
+ * src/compose.c
+ * src/foldersel.c
+ * src/mainwindow.c
+ * src/prefs_account.c
+ * src/prefs_folder_item.c
+ * src/prefs_quote.c
+ * src/summaryview.c
+ * src/gtk/gtkaspell.c
+ * src/gtk/gtkutils.c
+ * src/gtk/gtkvscrollbutton.c
+ Replace a few deprecated function calls
+
2008-08-01 [paul] 3.5.0cvs41
* src/action.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3453,3 +3453,4 @@
( cvs diff -u -r 1.207.2.203 -r 1.207.2.204 src/folderview.c; cvs diff -u -r 1.20.2.22 -r 1.20.2.23 src/folderview.h; cvs diff -u -r 1.1.2.59 -r 1.1.2.60 src/imap_gtk.c; cvs diff -u -r 1.2.2.32 -r 1.2.2.33 src/mh_gtk.c; cvs diff -u -r 1.2.2.27 -r 1.2.2.28 src/news_gtk.c; ) > 3.5.0cvs39.patchset
( cvs diff -u -r 1.60.2.121 -r 1.60.2.122 src/addressbook.c; cvs diff -u -r 1.382.2.460 -r 1.382.2.461 src/compose.c; cvs diff -u -r 1.274.2.258 -r 1.274.2.259 src/mainwindow.c; cvs diff -u -r 1.94.2.182 -r 1.94.2.183 src/messageview.c; cvs diff -u -r 1.5.2.33 -r 1.5.2.34 src/gtk/menu.c; cvs diff -u -r 1.4.2.18 -r 1.4.2.19 src/gtk/menu.h; ) > 3.5.0cvs40.patchset
( cvs diff -u -r 1.12.2.52 -r 1.12.2.53 src/action.c; ) > 3.5.0cvs41.patchset
+( cvs diff -u -r 1.382.2.461 -r 1.382.2.462 src/compose.c; cvs diff -u -r 1.26.2.37 -r 1.26.2.38 src/foldersel.c; cvs diff -u -r 1.274.2.259 -r 1.274.2.260 src/mainwindow.c; cvs diff -u -r 1.105.2.138 -r 1.105.2.139 src/prefs_account.c; cvs diff -u -r 1.52.2.65 -r 1.52.2.66 src/prefs_folder_item.c; cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/prefs_quote.c; cvs diff -u -r 1.395.2.378 -r 1.395.2.379 src/summaryview.c; cvs diff -u -r 1.9.2.56 -r 1.9.2.57 src/gtk/gtkaspell.c; cvs diff -u -r 1.5.2.76 -r 1.5.2.77 src/gtk/gtkutils.c; cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/gtk/gtkvscrollbutton.c; ) > 3.5.0cvs42.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=41
+EXTRA_VERSION=42
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/compose.c b/src/compose.c
@@ -6539,7 +6539,7 @@ static void compose_spell_menu_changed(void *data)
if (parent_item == NULL) {
parent_item = compose->aspell_options_menu;
- gtk_menu_item_remove_submenu(GTK_MENU_ITEM(parent_item));
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(parent_item), NULL);
} else
compose->aspell_options_menu = parent_item;
diff --git a/src/foldersel.c b/src/foldersel.c
@@ -311,7 +311,7 @@ static void foldersel_create(void)
gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
entry = gtk_entry_new();
- gtk_entry_set_editable(GTK_ENTRY(entry), FALSE);
+ gtk_editable_set_editable(GTK_EDITABLE(entry), FALSE);
gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(entry), "activate",
G_CALLBACK(foldersel_entry_activated), NULL);
diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
@@ -1171,7 +1171,7 @@ static gboolean check_next_prev(GtkAspell *gtkaspell, gboolean forward)
list = make_sug_menu(gtkaspell);
menu = gtk_menu_new();
for (cur = list; cur; cur = cur->next)
- gtk_menu_append(menu, GTK_WIDGET(cur->data));
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(cur->data));
g_slist_free(list);
gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
set_menu_pos, gtkaspell, 0, GDK_CURRENT_TIME);
@@ -1477,7 +1477,7 @@ static void check_with_alternate_cb(GtkWidget *w, gpointer data)
list = make_sug_menu(gtkaspell);
menu = gtk_menu_new();
for (cur = list; cur; cur = cur->next)
- gtk_menu_append(menu, GTK_WIDGET(cur->data));
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(cur->data));
g_slist_free(list);
gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
set_menu_pos, gtkaspell, 0,
@@ -2029,7 +2029,7 @@ static GSList *make_sug_menu(GtkAspell *gtkaspell)
item = gtk_menu_item_new_with_label(_("More..."));
gtk_widget_show(item);
if (curmenu)
- gtk_menu_append(GTK_MENU(curmenu), item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(curmenu), item);
else
list = g_slist_append(list, item);
@@ -2047,7 +2047,7 @@ static GSList *make_sug_menu(GtkAspell *gtkaspell)
if (curmenu == NULL) {
list = g_slist_append(list, item);
} else {
- gtk_menu_append(GTK_MENU(curmenu), item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(curmenu), item);
}
g_signal_connect(G_OBJECT(item), "activate",
G_CALLBACK(replace_word_cb),
@@ -2209,7 +2209,7 @@ static GSList *populate_submenu(GtkAspell *gtkaspell)
gtk_menu_item_set_submenu(GTK_MENU_ITEM(item),
newmenu);
- gtk_menu_append(GTK_MENU(curmenu), item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(curmenu), item);
gtk_widget_show(item);
curmenu = newmenu;
count = 0;
@@ -2230,7 +2230,7 @@ static GSList *populate_submenu(GtkAspell *gtkaspell)
G_CALLBACK(change_dict_cb),
gtkaspell);
gtk_widget_show(item);
- gtk_menu_append(GTK_MENU(curmenu), item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(curmenu), item);
count++;
}
diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
@@ -669,22 +669,22 @@ void gtkut_widget_init(void)
GtkWidget *clist;
clist = gtk_clist_new(1);
- gtk_object_ref(GTK_OBJECT(clist));
- gtk_object_sink(GTK_OBJECT(clist));
+ g_object_ref(GTK_OBJECT(clist));
+ g_object_sink(GTK_OBJECT(clist));
gtkut_clist_bindings_add(clist);
- gtk_object_unref(GTK_OBJECT(clist));
+ g_object_unref(GTK_OBJECT(clist));
clist = gtk_ctree_new(1, 0);
- gtk_object_ref(GTK_OBJECT(clist));
- gtk_object_sink(GTK_OBJECT(clist));
+ g_object_ref(GTK_OBJECT(clist));
+ g_object_sink(GTK_OBJECT(clist));
gtkut_clist_bindings_add(clist);
- gtk_object_unref(GTK_OBJECT(clist));
+ g_object_unref(GTK_OBJECT(clist));
clist = gtk_sctree_new_with_titles(1, 0, NULL);
- gtk_object_ref(GTK_OBJECT(clist));
- gtk_object_sink(GTK_OBJECT(clist));
+ g_object_ref(GTK_OBJECT(clist));
+ g_object_sink(GTK_OBJECT(clist));
gtkut_clist_bindings_add(clist);
- gtk_object_unref(GTK_OBJECT(clist));
+ g_object_unref(GTK_OBJECT(clist));
}
void gtkut_widget_set_app_icon(GtkWidget *widget)
diff --git a/src/gtk/gtkvscrollbutton.c b/src/gtk/gtkvscrollbutton.c
@@ -244,7 +244,7 @@ void gtk_vscrollbutton_set_adjustment(GtkVScrollbutton *scrollbutton,
scrollbutton->adjustment = adjustment;
g_object_ref(G_OBJECT(adjustment));
- gtk_object_sink(GTK_OBJECT(adjustment));
+ g_object_sink(GTK_OBJECT(adjustment));
}
}
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -2374,7 +2374,7 @@ void main_window_reflect_prefs_custom_colors(MainWindow *mainwin)
/* clear items. get item pointers. */
for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
- gtk_menu_item_remove_submenu(GTK_MENU_ITEM(cur->data));
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(cur->data), NULL);
}
mainwindow_colorlabel_menu_create(mainwin, TRUE);
summary_reflect_prefs_custom_colors(mainwin->summaryview);
@@ -2398,7 +2398,7 @@ static gboolean main_window_reflect_tags_changes_real(gpointer data)
/* clear items. get item pointers. */
for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
- gtk_menu_item_remove_submenu(GTK_MENU_ITEM(cur->data));
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(cur->data), NULL);
}
mainwindow_tags_menu_create(mainwin, TRUE);
summary_reflect_tags_changes(mainwin->summaryview);
@@ -2465,7 +2465,7 @@ static void main_window_set_account_selector_menu(MainWindow *mainwin,
(ac_prefs->account_name
? ac_prefs->account_name : _("Untitled"));
gtk_widget_show(menuitem);
- gtk_menu_append(GTK_MENU(menu), menuitem);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
g_signal_connect(G_OBJECT(menuitem), "activate",
G_CALLBACK(account_selector_menu_cb),
ac_prefs);
@@ -2514,7 +2514,7 @@ static void main_window_set_account_receive_menu(MainWindow *mainwin,
(ac_prefs->account_name ? ac_prefs->account_name
: _("Untitled"));
gtk_widget_show(menuitem);
- gtk_menu_append(GTK_MENU(menu), menuitem);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
g_signal_connect(G_OBJECT(menuitem), "activate",
G_CALLBACK(account_receive_menu_cb),
ac_prefs);
@@ -2547,7 +2547,7 @@ static void main_window_set_toolbar_combo_receive_menu(MainWindow *mainwin,
(ac_prefs->account_name
? ac_prefs->account_name : _("Untitled"));
gtk_widget_show(menuitem);
- gtk_menu_append(GTK_MENU(menu), menuitem);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
g_signal_connect(G_OBJECT(menuitem), "activate",
G_CALLBACK(account_receive_menu_cb),
ac_prefs);
@@ -2579,7 +2579,7 @@ static void main_window_set_toolbar_combo_compose_menu(MainWindow *mainwin,
(ac_prefs->account_name
? ac_prefs->account_name : _("Untitled"));
gtk_widget_show(menuitem);
- gtk_menu_append(GTK_MENU(menu), menuitem);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
g_signal_connect(G_OBJECT(menuitem), "activate",
G_CALLBACK(account_compose_menu_cb),
ac_prefs);
@@ -3337,7 +3337,7 @@ static gint mailing_list_populate_submenu (GtkWidget *menuitem, const gchar * li
NULL);
}
if (item) {
- gtk_menu_append (GTK_MENU(menu), item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
gtk_widget_show (item);
menu_nb++;
}
@@ -3414,19 +3414,21 @@ static void get_url_part (const gchar **buffer, gchar *url_decoded, gint maxlen)
static void mailing_list_compose (GtkWidget *w, gpointer *data)
{
- gchar *mailto;
+ const gchar *mailto;
- gtk_label_get (GTK_LABEL (GTK_BIN (w)->child), (gchar **) &mailto);
- compose_new(NULL, mailto+7, NULL);
+ mailto = gtk_label_get_text(GTK_LABEL (GTK_BIN (w)->child));
+ if (mailto)
+ compose_new(NULL, mailto+7, NULL);
}
static void mailing_list_open_uri (GtkWidget *w, gpointer *data)
{
- gchar *mailto;
+ const gchar *mailto;
- gtk_label_get (GTK_LABEL (GTK_BIN (w)->child), (gchar **) &mailto);
- open_uri (mailto, prefs_common_get_uri_cmd());
+ mailto = gtk_label_get_text(GTK_LABEL (GTK_BIN (w)->child));
+ if (mailto)
+ open_uri (mailto, prefs_common_get_uri_cmd());
}
static void fix_folderview_scroll(MainWindow *mainwin)
diff --git a/src/prefs_account.c b/src/prefs_account.c
@@ -2064,7 +2064,6 @@ static void templates_create_widget_func(PrefsPage * _page,
notebook = gtk_notebook_new();
gtk_widget_show(notebook);
- gtk_notebook_set_homogeneous_tabs(GTK_NOTEBOOK(notebook), TRUE);
gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
/* compose format */
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
@@ -367,7 +367,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
entry_regexp_test_result = gtk_entry_new();
gtk_box_pack_end (GTK_BOX(hbox_regexp), entry_regexp_test_result, TRUE, TRUE, 0);
SET_TOGGLE_SENSITIVITY(checkbtn_simplify_subject, entry_regexp_test_result);
- gtk_entry_set_editable(GTK_ENTRY(entry_regexp_test_result), FALSE);
+ gtk_editable_set_editable(GTK_EDITABLE(entry_regexp_test_result), FALSE);
rowcount++;
@@ -1176,7 +1176,6 @@ static void prefs_folder_item_templates_create_widget_func(PrefsPage * page_,
/* Notebook */
notebook = gtk_notebook_new();
gtk_widget_show(notebook);
- gtk_notebook_set_homogeneous_tabs(GTK_NOTEBOOK(notebook), TRUE);
gtk_box_pack_start(GTK_BOX(page_vbox), notebook, TRUE, TRUE, 0);
/* compose format */
diff --git a/src/prefs_quote.c b/src/prefs_quote.c
@@ -100,7 +100,6 @@ static void prefs_quote_create_widget(PrefsPage *_page, GtkWindow *window,
notebook = gtk_notebook_new();
gtk_widget_show(notebook);
- gtk_notebook_set_homogeneous_tabs(GTK_NOTEBOOK(notebook), TRUE);
gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
/* new message */
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -2862,7 +2862,7 @@ void summary_reflect_tags_changes(SummaryView *summaryview)
/* clear items. get item pointers. */
for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
- gtk_menu_item_remove_submenu(GTK_MENU_ITEM(cur->data));
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(cur->data), NULL);
}
summary_tags_menu_create(summaryview, TRUE);
@@ -7536,7 +7536,7 @@ void summary_reflect_prefs_custom_colors(SummaryView *summaryview)
/* clear items. get item pointers. */
for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
- gtk_menu_item_remove_submenu(GTK_MENU_ITEM(cur->data));
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(cur->data), NULL);
}
summary_colorlabel_menu_create(summaryview, TRUE);
}
