replace deprecated gtk_signal... functions
authorPaul Mangan <paul@claws-mail.org>
Tue, 25 May 2004 08:39:41 +0000 (08:39 +0000)
committerPaul Mangan <paul@claws-mail.org>
Tue, 25 May 2004 08:39:41 +0000 (08:39 +0000)
50 files changed:
src/account.c
src/action.c
src/addr_compl.c
src/addrgather.c
src/browseldap.c
src/compose.c
src/crash.c
src/exphtmldlg.c
src/expldifdlg.c
src/folderview.c
src/gtk/colorsel.c
src/gtk/description_window.c
src/gtk/filesel.c
src/gtk/foldersort.c
src/gtk/gtkaspell.c
src/gtk/gtksctree.c
src/gtk/gtkutils.c
src/gtk/gtkutils.h
src/gtk/gtkvscrollbutton.c
src/gtk/menu.c
src/gtk/pluginwindow.c
src/gtk/prefswindow.c
src/gtk/sslcertwindow.c
src/importmutt.c
src/importpine.c
src/mainwindow.c
src/mimeview.c
src/noticeview.c
src/plugins/clamav/clamav_plugin_gtk.c
src/plugins/dillo_viewer/dillo_viewer.c
src/plugins/image_viewer/viewer.c
src/plugins/spamassassin/spamassassin_gtk.c
src/plugins/trayicon/libeggtrayicon/gtkplugxembed.c
src/plugins/trayicon/trayicon.c
src/prefs_account.c
src/prefs_common.c
src/prefs_filtering.c
src/prefs_filtering_action.c
src/prefs_fonts.c
src/prefs_gtk.h
src/prefs_matcher.c
src/prefs_spelling.c
src/prefs_themes.c
src/prefs_toolbar.c
src/select-keys.c
src/send_message.c
src/ssl_manager.c
src/summary_search.c
src/summaryview.c
src/textview.c

index 252f8c3..3569620 100644 (file)
@@ -650,8 +650,8 @@ static void account_edit_create(void)
        clone_btn = gtk_button_new_with_label (_(" Clone "));
        gtk_widget_show (clone_btn);
        gtk_box_pack_start (GTK_BOX (vbox2), clone_btn, FALSE, FALSE, 4);
-       gtk_signal_connect (GTK_OBJECT(clone_btn), "clicked",
-                           GTK_SIGNAL_FUNC (account_clone), NULL);
+       g_signal_connect(G_OBJECT(clone_btn), "clicked",
+                        G_CALLBACK(account_clone), NULL);
        
        down_btn = gtk_button_new_with_label (_("Down"));
        gtk_widget_show (down_btn);
index c097785..2987b1e 100644 (file)
@@ -985,8 +985,9 @@ static void hide_io_dialog_cb(GtkWidget *w, gpointer data)
        Children *children = (Children *)data;
 
        if (!children->nb) {
-               gtk_signal_disconnect_by_data(GTK_OBJECT(children->dialog),
-                                             children);
+               g_signal_handlers_disconnect_matched
+                       (G_OBJECT(children->dialog), G_SIGNAL_MATCH_DATA,
+                        0, 0, NULL, NULL, children);
                gtk_widget_destroy(children->dialog);
                free_children(children);
        }
@@ -1073,8 +1074,8 @@ static void update_io_dialog(Children *children)
                GtkTextIter iter, start_iter, end_iter;
                GdkFont *font;
 
-               font = gtk_object_get_data(GTK_OBJECT(children->dialog), 
-                                          "s_txtfont");
+               font = g_object_get_data(G_OBJECT(children->dialog), 
+                                        "s_txtfont");
                gtk_widget_show(children->scrolledwin);
                textbuf = gtk_text_view_get_buffer (GTK_TEXT_VIEW(text));
                gtk_text_buffer_get_start_iter (textbuf, &start_iter);
index 4a41bfa..bb37d2d 100644 (file)
@@ -944,7 +944,7 @@ void address_completion_register_entry(GtkEntry *entry)
 
        /* add keypress event */
        g_signal_connect_closure
-               (GTK_OBJECT(entry), "key_press_event",
+               (G_OBJECT(entry), "key_press_event",
                 g_cclosure_new(G_CALLBACK(address_completion_entry_key_pressed),
                                COMPLETION_UNIQUE_DATA,
                                NULL),
@@ -964,7 +964,7 @@ void address_completion_unregister_entry(GtkEntry *entry)
 
        entry_obj = g_object_get_data(G_OBJECT(entry), ENTRY_DATA_TAB_HOOK);
        g_return_if_fail(entry_obj);
-       g_return_if_fail(entry_obj == GTK_OBJECT(entry));
+       g_return_if_fail(entry_obj == G_OBJECT(entry));
 
        /* has the hooked property? */
        g_object_set_data(G_OBJECT(entry), ENTRY_DATA_TAB_HOOK, NULL);
index 31134e0..369f505 100644 (file)
@@ -476,10 +476,10 @@ static void addrgather_dlg_create( void ) {
        gtk_container_set_border_width(GTK_CONTAINER(window), 0);
        gtk_window_set_position( GTK_WINDOW(window), GTK_WIN_POS_CENTER );
        gtk_window_set_modal( GTK_WINDOW(window), TRUE );       
-       gtk_signal_connect( GTK_OBJECT(window), "delete_event",
-               GTK_SIGNAL_FUNC( addrgather_dlg_delete_event ), NULL );
-       gtk_signal_connect( GTK_OBJECT(window), "key_press_event",
-               GTK_SIGNAL_FUNC( addrgather_dlg_key_pressed ), NULL );
+       g_signal_connect(G_OBJECT(window), "delete_event",
+                        G_CALLBACK(addrgather_dlg_delete_event), NULL);
+       g_signal_connect(G_OBJECT(window), "key_press_event",
+                        G_CALLBACK(addrgather_dlg_key_pressed), NULL);
 
        vbox = gtk_vbox_new( FALSE, 8 );
        gtk_container_add( GTK_CONTAINER(window), vbox );
@@ -510,10 +510,10 @@ static void addrgather_dlg_create( void ) {
        gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
 
        /* Signal handlers */
-       gtk_signal_connect( GTK_OBJECT(btnOk), "clicked",
-               GTK_SIGNAL_FUNC(addrgather_dlg_ok), NULL );
-       gtk_signal_connect( GTK_OBJECT(btnCancel), "clicked",
-               GTK_SIGNAL_FUNC(addrgather_dlg_cancel), NULL );
+       g_signal_connect(G_OBJECT(btnOk), "clicked",
+                        G_CALLBACK(addrgather_dlg_ok), NULL);
+       g_signal_connect(G_OBJECT(btnCancel), "clicked",
+                        G_CALLBACK(addrgather_dlg_cancel), NULL);
 
        gtk_widget_show_all( vbox );
        addrgather_dlg.window     = window;
index 7192693..7bbd148 100644 (file)
@@ -238,10 +238,10 @@ static void browse_create( void ) {
        gtk_window_set_title( GTK_WINDOW(window), _("Browse Directory Entry") );
        gtk_window_set_position( GTK_WINDOW(window), GTK_WIN_POS_MOUSE );
        gtk_window_set_modal( GTK_WINDOW(window), TRUE );
-       gtk_signal_connect( GTK_OBJECT(window), "delete_event",
-                           GTK_SIGNAL_FUNC(browse_delete_event), NULL );
-       gtk_signal_connect( GTK_OBJECT(window), "key_press_event",
-                           GTK_SIGNAL_FUNC(browse_key_pressed), NULL );
+       g_signal_connect(G_OBJECT(window), "delete_event",
+                        G_CALLBACK(browse_delete_event), NULL);
+       g_signal_connect(G_OBJECT(window), "key_press_event",
+                        G_CALLBACK(browse_key_pressed), NULL);
 
        vbox = gtk_vbox_new(FALSE, 8);
        gtk_container_add(GTK_CONTAINER(window), vbox);
@@ -309,8 +309,8 @@ static void browse_create( void ) {
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
        gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
 
-       gtk_signal_connect(GTK_OBJECT(close_btn), "clicked",
-                          GTK_SIGNAL_FUNC(browse_close), NULL);
+       g_signal_connect(G_OBJECT(close_btn), "clicked",
+                        G_CALLBACK(browse_close), NULL);
        gtk_widget_grab_default(close_btn);
 
        gtk_widget_show_all(vbox);
index 64159d8..bf988c0 100644 (file)
@@ -4742,14 +4742,19 @@ static void compose_create_header_entry(Compose *compose)
        gtk_widget_show(entry);
        gtk_table_attach(GTK_TABLE(compose->header_table), entry, 1, 2, compose->header_nextrow, compose->header_nextrow+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
 
-        gtk_signal_connect(GTK_OBJECT(entry), "key-press-event", GTK_SIGNAL_FUNC(compose_headerentry_key_press_event_cb), headerentry);
-       gtk_signal_connect(GTK_OBJECT(entry), "changed", GTK_SIGNAL_FUNC(compose_headerentry_changed_cb), headerentry);
-       gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(text_activated), compose);
+        g_signal_connect(G_OBJECT(entry), "key-press-event", 
+                        G_CALLBACK(compose_headerentry_key_press_event_cb), 
+                        headerentry);
+       g_signal_connect(G_OBJECT(entry), "changed", 
+                        G_CALLBACK(compose_headerentry_changed_cb), 
+                        headerentry);
+       g_signal_connect(G_OBJECT(entry), "activate", 
+                        G_CALLBACK(text_activated), compose);
        g_signal_connect(G_OBJECT(entry), "grab_focus",
                         G_CALLBACK(compose_grab_focus_cb), compose);
-       gtk_signal_connect(GTK_OBJECT(entry), "button-press-event", 
-                          GTK_SIGNAL_FUNC(compose_headerentry_button_pressed),
-                          NULL);
+       g_signal_connect(G_OBJECT(entry), "button-press-event", 
+                        G_CALLBACK(compose_headerentry_button_pressed),
+                        NULL);
 
        address_completion_register_entry(GTK_ENTRY(entry));
 
@@ -4987,8 +4992,8 @@ static GtkWidget *compose_create_others(Compose *compose)
        if (account_get_special_folder(compose->account, F_OUTBOX)) {
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(savemsg_checkbtn), prefs_common.savemsg);
        }
-       gtk_signal_connect(GTK_OBJECT(savemsg_checkbtn), "toggled",
-                           GTK_SIGNAL_FUNC(compose_savemsg_checkbtn_cb), compose);
+       g_signal_connect(G_OBJECT(savemsg_checkbtn), "toggled",
+                        G_CALLBACK(compose_savemsg_checkbtn_cb), compose);
 
        savemsg_entry = gtk_entry_new();
        gtk_widget_show(savemsg_entry);
@@ -5004,11 +5009,11 @@ static GtkWidget *compose_create_others(Compose *compose)
        }
 
        savemsg_select = gtk_button_new_with_label (_("Select ..."));
-       gtk_widget_show (savemsg_select);
+       gtk_widget_show(savemsg_select);
        gtk_table_attach(GTK_TABLE(table), savemsg_select, 2, 3, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
-       gtk_signal_connect (GTK_OBJECT (savemsg_select), "clicked",
-                           GTK_SIGNAL_FUNC (compose_savemsg_select_cb),
-                           compose);
+       g_signal_connect(G_OBJECT(savemsg_select), "clicked",
+                        G_CALLBACK(compose_savemsg_select_cb),
+                        compose);
 
        rowcount++;
 
@@ -5168,7 +5173,8 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
 
        subject_entry = gtk_entry_new();
        gtk_box_pack_start(GTK_BOX(subject), subject_entry, TRUE, TRUE, 2);
-       gtk_signal_connect(GTK_OBJECT(subject_entry), "activate", GTK_SIGNAL_FUNC(text_activated), compose);
+       g_signal_connect(G_OBJECT(subject_entry), "activate", 
+                        G_CALLBACK(text_activated), compose);
        g_signal_connect(G_OBJECT(subject_entry), "grab_focus",
                         G_CALLBACK(compose_grab_focus_cb), compose);
        gtk_widget_show(subject_entry);
@@ -6472,8 +6478,8 @@ static void account_activated(GtkMenuItem *menuitem, gpointer data)
        if (account_get_special_folder(compose->account, F_OUTBOX)) {
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), prefs_common.savemsg);
        }
-       gtk_signal_connect(GTK_OBJECT(compose->savemsg_checkbtn), "toggled",
-                          GTK_SIGNAL_FUNC(compose_savemsg_checkbtn_cb), compose);
+       g_signal_connect(G_OBJECT(compose->savemsg_checkbtn), "toggled",
+                        G_CALLBACK(compose_savemsg_checkbtn_cb), compose);
                           
        gtk_editable_delete_text(GTK_EDITABLE(compose->savemsg_entry), 0, -1);
        if (account_get_special_folder(compose->account, F_OUTBOX)) {
@@ -6916,10 +6922,10 @@ static void compose_paste_as_quote_cb(Compose *compose)
                 * after the gtk_editable_paste_clipboard) know that 
                 * text is to be inserted as a quotation. implemented
                 * by using a simple refcount... */
-               gint paste_as_quotation = GPOINTER_TO_INT(gtk_object_get_data(
-                                               GTK_OBJECT(compose->focused_editable),
+               gint paste_as_quotation = GPOINTER_TO_INT(g_object_get_data(
+                                               G_OBJECT(compose->focused_editable),
                                                "paste_as_quotation"));
-               gtk_object_set_data(GTK_OBJECT(compose->focused_editable),
+               g_object_set_data(G_OBJECT(compose->focused_editable),
                                    "paste_as_quotation",
                                    GINT_TO_POINTER(paste_as_quotation + 1));
                entry_paste_clipboard(compose->focused_editable);
@@ -7579,7 +7585,7 @@ gboolean compose_headerentry_key_press_event_cb(GtkWidget *entry,
                        /* Override default next focus, and give it to subject_entry
                         * instead of notebook tabs
                         */
-                       gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key-press-event"); 
+                       g_signal_stop_emission_by_name(G_OBJECT(entry), "key-press-event"); 
                        gtk_widget_grab_focus(headerentry->compose->subject_entry);
                        return TRUE;
                }
@@ -7596,8 +7602,9 @@ gboolean compose_headerentry_changed_cb(GtkWidget *entry,
                                       headerentry);
                
                compose_create_header_entry(headerentry->compose);
-               gtk_signal_disconnect_by_data
-                       (GTK_OBJECT(entry), headerentry);
+               g_signal_handlers_disconnect_matched
+                       (G_OBJECT(entry), G_SIGNAL_MATCH_DATA,
+                        0, 0, NULL, NULL, headerentry);
                
                /* Automatically scroll down */
                compose_show_first_last_header(headerentry->compose, FALSE);
index 8989318..04a1f53 100644 (file)
@@ -254,16 +254,14 @@ static GtkWidget *crash_dialog_show(const gchar *text, const gchar *debug_output
        gtk_container_add(GTK_CONTAINER(hbuttonbox4), button5);
        GTK_WIDGET_SET_FLAGS(button5, GTK_CAN_DEFAULT);
        
-       gtk_signal_connect(GTK_OBJECT(window1), "delete_event",
-                          GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
-       gtk_signal_connect(GTK_OBJECT(button3),   "clicked",
-                          GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
-       gtk_signal_connect(GTK_OBJECT(button4), "clicked",
-                          GTK_SIGNAL_FUNC(crash_save_crash_log),
-                          crash_report);
-       gtk_signal_connect(GTK_OBJECT(button5), "clicked",
-                          GTK_SIGNAL_FUNC(crash_create_bug_report),
-                          NULL);
+       g_signal_connect(G_OBJECT(window1), "delete_event",
+                        G_CALLBACK(gtk_main_quit), NULL);
+       g_signal_connect(G_OBJECT(button3),   "clicked",
+                        G_CALLBACK(gtk_main_quit), NULL);
+       g_signal_connect(G_OBJECT(button4), "clicked",
+                        G_CALLBACK(crash_save_crash_log), crash_report);
+       g_signal_connect(G_OBJECT(button5), "clicked",
+                        G_CALLBACK(crash_create_bug_report), NULL);
 
        gtk_widget_show(window1);
 
index b0d85a8..bf37c1c 100644 (file)
@@ -362,10 +362,12 @@ static void exp_html_file_select_create( AddressFileSelection *afs ) {
        fileSelector = gtk_file_selection_new( _("Select HTML Output File") );
        gtk_file_selection_hide_fileop_buttons( GTK_FILE_SELECTION(fileSelector) );
        gtk_file_selection_complete( GTK_FILE_SELECTION(fileSelector), "*.html" );
-       gtk_signal_connect( GTK_OBJECT (GTK_FILE_SELECTION(fileSelector)->ok_button),
-               "clicked", GTK_SIGNAL_FUNC (exp_html_file_ok), ( gpointer ) afs );
-       gtk_signal_connect( GTK_OBJECT (GTK_FILE_SELECTION(fileSelector)->cancel_button),
-               "clicked", GTK_SIGNAL_FUNC (exp_html_file_cancel), ( gpointer ) afs );
+       g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(fileSelector)->ok_button),
+                        "clicked", 
+                        G_CALLBACK(exp_html_file_ok), (gpointer)afs);
+       g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(fileSelector)->cancel_button),
+                        "clicked", 
+                        G_CALLBACK(exp_html_file_cancel), (gpointer)afs);
        afs->fileSelector = fileSelector;
        afs->cancelled = TRUE;
 }
@@ -449,8 +451,8 @@ static void export_html_page_file( gint pageNum, gchar *pageLbl ) {
        gtk_widget_show_all(vbox);
 
        /* Button handler */
-       gtk_signal_connect(GTK_OBJECT(btnFile), "clicked",
-                          GTK_SIGNAL_FUNC(exp_html_file_select), NULL);
+       g_signal_connect(G_OBJECT(btnFile), "clicked",
+                        G_CALLBACK(exp_html_file_select), NULL);
 
        exphtml_dlg.labelBook = labelBook;
        exphtml_dlg.entryHtml = entryHtml;
@@ -661,8 +663,8 @@ static void export_html_page_finish( gint pageNum, gchar *pageLbl ) {
        gtk_widget_show_all(vbox);
 
        /* Button handlers */
-       gtk_signal_connect( GTK_OBJECT(btnBrowse), "clicked",
-               GTK_SIGNAL_FUNC(export_html_browse), NULL );
+       g_signal_connect(G_OBJECT(btnBrowse), "clicked",
+                        G_CALLBACK(export_html_browse), NULL);
 
        exphtml_dlg.labelOutBook = labelBook;
        exphtml_dlg.labelOutFile = labelFile;
@@ -690,12 +692,12 @@ static void export_html_dialog_create( void ) {
                _("Export Address Book to HTML File") );
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
        gtk_window_set_modal(GTK_WINDOW(window), TRUE); 
-       gtk_signal_connect(GTK_OBJECT(window), "delete_event",
-                          GTK_SIGNAL_FUNC(export_html_delete_event),
-                          NULL );
-       gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
-                          GTK_SIGNAL_FUNC(export_html_key_pressed),
-                          NULL );
+       g_signal_connect(G_OBJECT(window), "delete_event",
+                        G_CALLBACK(export_html_delete_event),
+                        NULL );
+       g_signal_connect(G_OBJECT(window), "key_press_event",
+                        G_CALLBACK(export_html_key_pressed),
+                        NULL );
 
        vbox = gtk_vbox_new(FALSE, 4);
        gtk_widget_show(vbox);
@@ -729,12 +731,12 @@ static void export_html_dialog_create( void ) {
        gtk_widget_grab_default(btnNext);
 
        /* Button handlers */
-       gtk_signal_connect(GTK_OBJECT(btnPrev), "clicked",
-                          GTK_SIGNAL_FUNC(export_html_prev), NULL);
-       gtk_signal_connect(GTK_OBJECT(btnNext), "clicked",
-                          GTK_SIGNAL_FUNC(export_html_next), NULL);
-       gtk_signal_connect(GTK_OBJECT(btnCancel), "clicked",
-                          GTK_SIGNAL_FUNC(export_html_cancel), NULL);
+       g_signal_connect(G_OBJECT(btnPrev), "clicked",
+                        G_CALLBACK(export_html_prev), NULL);
+       g_signal_connect(G_OBJECT(btnNext), "clicked",
+                        G_CALLBACK(export_html_next), NULL);
+       g_signal_connect(G_OBJECT(btnCancel), "clicked",
+                        G_CALLBACK(export_html_cancel), NULL);
 
        gtk_widget_show_all(vbox);
 
index ae7611b..c4162d0 100644 (file)
@@ -373,10 +373,12 @@ static void exp_ldif_file_select_create( AddressFileSelection *afs ) {
        fileSelector = gtk_file_selection_new( _("Select LDIF Output File") );
        gtk_file_selection_hide_fileop_buttons( GTK_FILE_SELECTION(fileSelector) );
        gtk_file_selection_complete( GTK_FILE_SELECTION(fileSelector), "*.html" );
-       gtk_signal_connect( GTK_OBJECT (GTK_FILE_SELECTION(fileSelector)->ok_button),
-               "clicked", GTK_SIGNAL_FUNC (exp_ldif_file_ok), ( gpointer ) afs );
-       gtk_signal_connect( GTK_OBJECT (GTK_FILE_SELECTION(fileSelector)->cancel_button),
-               "clicked", GTK_SIGNAL_FUNC (exp_ldif_file_cancel), ( gpointer ) afs );
+       g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(fileSelector)->ok_button),
+                        "clicked", 
+                        G_CALLBACK(exp_ldif_file_ok), (gpointer)afs);
+       g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(fileSelector)->cancel_button),
+                        "clicked", 
+                        G_CALLBACK(exp_ldif_file_cancel), (gpointer)afs);
        afs->fileSelector = fileSelector;
        afs->cancelled = TRUE;
 }
@@ -460,8 +462,8 @@ static void export_ldif_page_file( gint pageNum, gchar *pageLbl ) {
        gtk_widget_show_all(vbox);
 
        /* Button handler */
-       gtk_signal_connect(GTK_OBJECT(btnFile), "clicked",
-                          GTK_SIGNAL_FUNC(exp_ldif_file_select), NULL);
+       g_signal_connect(G_OBJECT(btnFile), "clicked",
+                        G_CALLBACK(exp_ldif_file_select), NULL);
 
        expldif_dlg.labelBook = labelBook;
        expldif_dlg.entryLdif = entryLdif;
@@ -710,12 +712,12 @@ static void export_ldif_dialog_create( void ) {
                _("Export Address Book to LDIF File") );
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
        gtk_window_set_modal(GTK_WINDOW(window), TRUE); 
-       gtk_signal_connect(GTK_OBJECT(window), "delete_event",
-                          GTK_SIGNAL_FUNC(export_ldif_delete_event),
-                          NULL );
-       gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
-                          GTK_SIGNAL_FUNC(export_ldif_key_pressed),
-                          NULL );
+       g_signal_connect(G_OBJECT(window), "delete_event",
+                        G_CALLBACK(export_ldif_delete_event),
+                        NULL );
+       g_signal_connect(G_OBJECT(window), "key_press_event",
+                        G_CALLBACK(export_ldif_key_pressed),
+                        NULL );
 
        vbox = gtk_vbox_new(FALSE, 4);
        gtk_widget_show(vbox);
@@ -749,12 +751,12 @@ static void export_ldif_dialog_create( void ) {
        gtk_widget_grab_default(btnNext);
 
        /* Button handlers */
-       gtk_signal_connect(GTK_OBJECT(btnPrev), "clicked",
-                          GTK_SIGNAL_FUNC(export_ldif_prev), NULL);
-       gtk_signal_connect(GTK_OBJECT(btnNext), "clicked",
-                          GTK_SIGNAL_FUNC(export_ldif_next), NULL);
-       gtk_signal_connect(GTK_OBJECT(btnCancel), "clicked",
-                          GTK_SIGNAL_FUNC(export_ldif_cancel), NULL);
+       g_signal_connect(G_OBJECT(btnPrev), "clicked",
+                        G_CALLBACK(export_ldif_prev), NULL);
+       g_signal_connect(G_OBJECT(btnNext), "clicked",
+                        G_CALLBACK(export_ldif_next), NULL);
+       g_signal_connect(G_OBJECT(btnCancel), "clicked",
+                        G_CALLBACK(export_ldif_cancel), NULL);
 
        gtk_widget_show_all(vbox);
 
index 332b9d4..4668267 100644 (file)
@@ -282,9 +282,9 @@ static GtkItemFactory *create_ifactory(FolderView *folderview, FolderViewPopup *
                        gtk_item_factory_create_item(factory, entries->data, folderview, 1);
 
        popup = gtk_item_factory_get_widget(factory, fpopup->path);
-        gtk_signal_connect(GTK_OBJECT(popup), "selection_done",
-                           GTK_SIGNAL_FUNC(folderview_popup_close),
-                           folderview);
+        g_signal_connect(G_OBJECT(popup), "selection_done",
+                         G_CALLBACK(folderview_popup_close),
+                         folderview);
 
        return factory;
 }
index 1920307..6d8c56a 100644 (file)
@@ -53,13 +53,14 @@ gint colorsel_select_color_rgb(gchar *title, gint rgbvalue)
        gtk_window_set_policy(GTK_WINDOW(color_dialog), FALSE, FALSE, FALSE);
        manage_window_set_transient(GTK_WINDOW(color_dialog));
 
-       gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->ok_button),
-                          "clicked", GTK_SIGNAL_FUNC(quote_colors_set_dialog_ok), &result);
-       gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->cancel_button),
-                          "clicked", GTK_SIGNAL_FUNC(quote_colors_set_dialog_cancel), &result);
-       gtk_signal_connect(GTK_OBJECT(color_dialog), "key_press_event",
-                          GTK_SIGNAL_FUNC(quote_colors_set_dialog_key_pressed),
-                          &result);
+       g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->ok_button),
+                        "clicked", 
+                        G_CALLBACK(quote_colors_set_dialog_ok), &result);
+       g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->cancel_button),
+                        "clicked", 
+                        G_CALLBACK(quote_colors_set_dialog_cancel), &result);
+       g_signal_connect(G_OBJECT(color_dialog), "key_press_event",
+                        G_CALLBACK(quote_colors_set_dialog_key_pressed), &result);
 
        /* preselect the previous color in the color selection dialog */
        color[0] = (gdouble) ((rgbvalue & 0xff0000) >> 16) / 255.0;
index 5482de8..7f7fdc7 100644 (file)
@@ -134,14 +134,12 @@ static void description_create(DescriptionWindow * dwindow)
                                  1, 2, i, i+1);
 */
        gtk_widget_grab_default(ok_btn);
-       gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
-                          GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
-       gtk_signal_connect
-               (GTK_OBJECT(dwindow->window), "key_press_event",
-                GTK_SIGNAL_FUNC(description_window_key_pressed),
-                NULL);
-       gtk_signal_connect(GTK_OBJECT(dwindow->window), "delete_event",
-                          GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
+       g_signal_connect(G_OBJECT(ok_btn), "clicked",
+                        G_CALLBACK(gtk_main_quit), NULL);
+       g_signal_connect(G_OBJECT(dwindow->window), "key_press_event",
+                        G_CALLBACK(description_window_key_pressed), NULL);
+       g_signal_connect(G_OBJECT(dwindow->window), "delete_event",
+                        G_CALLBACK(gtk_main_quit), NULL);
 
        gtk_widget_show_all(table);
 }
index e74cb2b..bcb8f4e 100644 (file)
@@ -224,27 +224,27 @@ static void filesel_create(const gchar *title, gboolean multiple_files)
                         GTK_SELECTION_MULTIPLE);
 #endif
 
-               gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(filesel)->file_list),
-                                  "select_row", 
-                                  GTK_SIGNAL_FUNC(filesel_file_list_select_row_multi),
-                                  NULL);
-               gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(filesel)->file_list),
-                                  "unselect_row",
-                                  GTK_SIGNAL_FUNC(filesel_file_list_select_row_multi),
-                                  NULL);
-               gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(filesel)->dir_list),
-                                  "select_row",
-                                  GTK_SIGNAL_FUNC(filesel_dir_list_select_row_multi),
-                                  NULL);
+               g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(filesel)->file_list),
+                                "select_row", 
+                                G_CALLBACK(filesel_file_list_select_row_multi),
+                                NULL);
+               g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(filesel)->file_list),
+                                "unselect_row",
+                                G_CALLBACK(filesel_file_list_select_row_multi),
+                                NULL);
+               g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(filesel)->dir_list),
+                                "select_row",
+                                G_CALLBACK(filesel_dir_list_select_row_multi),
+                                NULL);
        } else {
-               gtk_signal_connect_after(GTK_OBJECT(GTK_FILE_SELECTION(filesel)->file_list),
-                                        "select_row", 
-                                        GTK_SIGNAL_FUNC(filesel_file_list_select_row_single),
-                                        NULL);
-               gtk_signal_connect_after(GTK_OBJECT(GTK_FILE_SELECTION(filesel)->dir_list),
-                                        "select_row",
-                                        GTK_SIGNAL_FUNC(filesel_dir_list_select_row_single),
-                                        NULL);
+               g_signal_connect_after(G_OBJECT(GTK_FILE_SELECTION(filesel)->file_list),
+                                      "select_row", 
+                                      G_CALLBACK(filesel_file_list_select_row_single),
+                                      NULL);
+               g_signal_connect_after(G_OBJECT(GTK_FILE_SELECTION(filesel)->dir_list),
+                                      "select_row",
+                                      G_CALLBACK(filesel_dir_list_select_row_single),
+                                      NULL);
        }
 }
 
index c06597a..0643c7f 100644 (file)
@@ -133,7 +133,7 @@ void foldersort_open()
        GtkWidget *label2;
 
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_object_set_data(GTK_OBJECT(window), "window", window);
+       g_object_set_data(G_OBJECT(window), "window", window);
        gtk_container_set_border_width(GTK_CONTAINER(window), 4);
        gtk_window_set_title(GTK_WINDOW(window),
                             _("Set folder sortorder"));
@@ -234,21 +234,21 @@ void foldersort_open()
        gtk_widget_set_sensitive(movedown_btn, FALSE);
        gtk_clist_set_reorderable(GTK_CLIST(folderlist), TRUE);
 
-       gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
-                           GTK_SIGNAL_FUNC(ok_clicked), dialog);
-       gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
-                           GTK_SIGNAL_FUNC(cancel_clicked), dialog);
-       gtk_signal_connect(GTK_OBJECT(moveup_btn), "clicked",
-                           GTK_SIGNAL_FUNC(moveup_clicked), dialog);
-       gtk_signal_connect(GTK_OBJECT(movedown_btn), "clicked",
-                           GTK_SIGNAL_FUNC(movedown_clicked), dialog);
-
-       gtk_signal_connect(GTK_OBJECT(folderlist), "select-row",
-                          GTK_SIGNAL_FUNC(row_selected), dialog);
-       gtk_signal_connect(GTK_OBJECT(folderlist), "unselect-row",
-                          GTK_SIGNAL_FUNC(row_unselected), dialog);
-       gtk_signal_connect(GTK_OBJECT(folderlist), "row-move",
-                          GTK_SIGNAL_FUNC(row_moved), dialog);
+       g_signal_connect(G_OBJECT(ok_btn), "clicked",
+                         G_CALLBACK(ok_clicked), dialog);
+       g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+                         G_CALLBACK(cancel_clicked), dialog);
+       g_signal_connect(G_OBJECT(moveup_btn), "clicked",
+                         G_CALLBACK(moveup_clicked), dialog);
+       g_signal_connect(G_OBJECT(movedown_btn), "clicked",
+                         G_CALLBACK(movedown_clicked), dialog);
+
+       g_signal_connect(G_OBJECT(folderlist), "select-row",
+                        G_CALLBACK(row_selected), dialog);
+       g_signal_connect(G_OBJECT(folderlist), "unselect-row",
+                        G_CALLBACK(row_unselected), dialog);
+       g_signal_connect(G_OBJECT(folderlist), "row-move",
+                        G_CALLBACK(row_moved), dialog);
 
        dialog->rows = 0;
        dialog->selected = -1;
index 89299d9..01a480a 100644 (file)
@@ -422,10 +422,10 @@ GtkAspell *gtkaspell_new(const gchar *dictionary_path,
        g_signal_connect_after(G_OBJECT(buffer), "insert-text",
                               G_CALLBACK(entry_insert_cb), gtkaspell);
        g_signal_connect_after(G_OBJECT(buffer), "delete-range",
-                                GTK_SIGNAL_FUNC(entry_delete_cb), gtkaspell);
-       gtk_signal_connect(GTK_OBJECT(gtktext), "button-press-event",
-                          GTK_SIGNAL_FUNC(button_press_intercept_cb),
-                          gtkaspell);
+                              G_CALLBACK(entry_delete_cb), gtkaspell);
+       g_signal_connect(G_OBJECT(gtktext), "button-press-event",
+                        G_CALLBACK(button_press_intercept_cb),
+                        gtkaspell);
        
        debug_print("Aspell: created gtkaspell %0x\n", (guint) gtkaspell);
 
@@ -441,10 +441,10 @@ void gtkaspell_delete(GtkAspell * gtkaspell)
                                      gtkaspell);
        g_signal_handlers_disconnect_by_func(G_OBJECT(gtktext),
                                             G_CALLBACK(entry_delete_cb),
-                                     gtkaspell);
-       gtk_signal_disconnect_by_func(GTK_OBJECT(gtktext),
-                                      GTK_SIGNAL_FUNC(button_press_intercept_cb),
-                                     gtkaspell);
+                                            gtkaspell);
+       g_signal_handlers_disconnect_by_func(G_OBJECT(gtktext),
+                                            G_CALLBACK(button_press_intercept_cb),
+                                            gtkaspell);
 
        gtkaspell_uncheck_all(gtkaspell);
        
@@ -567,17 +567,17 @@ static gint button_press_intercept_cb(GtkTextView *gtktext,
        /* forge the leftclick */
        eb->button = 1;
 
-        gtk_signal_handler_block_by_func(GTK_OBJECT(gtktext),
-                                        GTK_SIGNAL_FUNC(button_press_intercept_cb), 
-                                        gtkaspell);
-       gtk_signal_emit_by_name(GTK_OBJECT(gtktext), "button-press-event",
-                               e, &retval);
-       gtk_signal_emit_by_name(GTK_OBJECT(gtktext), "button-release-event",
-                               e, &retval);
-       gtk_signal_handler_unblock_by_func(GTK_OBJECT(gtktext),
-                                          GTK_SIGNAL_FUNC(button_press_intercept_cb), 
+        g_signal_handlers_block_by_func(G_OBJECT(gtktext),
+                                       G_CALLBACK(button_press_intercept_cb), 
+                                       gtkaspell);
+       g_signal_emit_by_name(G_OBJECT(gtktext), "button-press-event",
+                             e, &retval);
+       g_signal_emit_by_name(G_OBJECT(gtktext), "button-release-event",
+                             e, &retval);
+       g_signal_handlers_unblock_by_func(G_OBJECT(gtktext),
+                                         G_CALLBACK(button_press_intercept_cb), 
                                           gtkaspell);
-       gtk_signal_emit_stop_by_name(GTK_OBJECT(gtktext), "button-press-event");
+       g_signal_stop_emission_by_name(G_OBJECT(gtktext), "button-press-event");
     
        /* now do the menu wackiness */
        popup_menu(gtkaspell, eb);
@@ -1420,9 +1420,9 @@ static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data)
        gtk_window_set_title(GTK_WINDOW(dialog),_("Replace unknown word"));
        gtk_widget_set_uposition(dialog, xx, yy);
 
-       gtk_signal_connect_object(GTK_OBJECT(dialog), "destroy",
-                                 GTK_SIGNAL_FUNC(gtk_widget_destroy), 
-                                 GTK_OBJECT(dialog));
+       g_signal_connect_swapped(G_OBJECT(dialog), "destroy",
+                                G_CALLBACK(gtk_widget_destroy), 
+                                G_OBJECT(dialog));
 
        hbox = gtk_hbox_new(FALSE, 0);
        gtk_container_set_border_width(GTK_CONTAINER(hbox), 8);
@@ -1437,12 +1437,12 @@ static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data)
        gtkaspell->replace_entry = entry;
        gtk_entry_set_text(GTK_ENTRY(entry), gtkaspell->theword);
        gtk_editable_select_region(GTK_EDITABLE(entry), 0, -1);
-       gtk_signal_connect(GTK_OBJECT(entry), "activate",
-                          GTK_SIGNAL_FUNC(replace_with_supplied_word_cb), 
-                          gtkaspell);
-       gtk_signal_connect_object(GTK_OBJECT(entry), "activate",
-                          GTK_SIGNAL_FUNC(gtk_widget_destroy), 
-                          GTK_OBJECT(dialog));
+       g_signal_connect(G_OBJECT(entry), "activate",
+                        G_CALLBACK(replace_with_supplied_word_cb), 
+                        gtkaspell);
+       g_signal_connect_swapped(G_OBJECT(entry), "activate",
+                                G_CALLBACK(gtk_widget_destroy), 
+                                G_OBJECT(dialog));
        gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
 
        gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, TRUE, 
@@ -1459,18 +1459,18 @@ static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data)
 
        ok_button = gtk_button_new_with_label(_("OK"));
        gtk_box_pack_start(GTK_BOX(hbox), ok_button, TRUE, TRUE, 8);
-       gtk_signal_connect(GTK_OBJECT(ok_button), "clicked",
-                       GTK_SIGNAL_FUNC(replace_with_supplied_word_cb), 
-                       gtkaspell);
-       gtk_signal_connect_object(GTK_OBJECT(ok_button), "clicked",
-                       GTK_SIGNAL_FUNC(gtk_widget_destroy), 
-                       GTK_OBJECT(dialog));
+       g_signal_connect(G_OBJECT(ok_button), "clicked",
+                        G_CALLBACK(replace_with_supplied_word_cb), 
+                        gtkaspell);
+       g_signal_connect_swapped(G_OBJECT(ok_button), "clicked",
+                                  G_CALLBACK(gtk_widget_destroy), 
+                                  G_OBJECT(dialog));
 
        cancel_button = gtk_button_new_with_label(_("Cancel"));
        gtk_box_pack_start(GTK_BOX(hbox), cancel_button, TRUE, TRUE, 8);
-       gtk_signal_connect_object(GTK_OBJECT(cancel_button), "clicked",
-                       GTK_SIGNAL_FUNC(gtk_widget_destroy), 
-                       GTK_OBJECT(dialog));
+       g_signal_connect_swapped(G_OBJECT(cancel_button), "clicked",
+                                G_CALLBACK(gtk_widget_destroy), 
+                                G_OBJECT(dialog));
 
        gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), hbox);
 
@@ -1627,8 +1627,8 @@ GtkWidget *gtkaspell_dictionary_option_menu_new(const gchar *aspell_path)
        for (tmp = dict_list; tmp != NULL; tmp = g_slist_next(tmp)) {
                dict = (Dictionary *) tmp->data;
                item = gtk_menu_item_new_with_label(dict->dictname);
-               gtk_object_set_data(GTK_OBJECT(item), "dict_name",
-                                   dict->fullname); 
+               g_object_set_data(G_OBJECT(item), "dict_name",
+                                 dict->fullname); 
                                         
                gtk_menu_append(GTK_MENU(menu), item);                                   
                gtk_widget_show(item);
@@ -1648,8 +1648,8 @@ gchar *gtkaspell_get_dictionary_menu_active_item(GtkWidget *menu)
        g_return_val_if_fail(GTK_IS_MENU(menu), NULL);
 
        menuitem = gtk_menu_get_active(GTK_MENU(menu));
-        dict_fullname = (gchar *) gtk_object_get_data(GTK_OBJECT(menuitem), 
-                                                     "dict_name");
+        dict_fullname = (gchar *) g_object_get_data(G_OBJECT(menuitem), 
+                                                   "dict_name");
         g_return_val_if_fail(dict_fullname, NULL);
 
        label = g_strdup(dict_fullname);
@@ -1676,8 +1676,8 @@ gint gtkaspell_set_dictionary_menu_active_item(GtkWidget *menu,
                gchar *dict_name;
 
                menuitem = GTK_WIDGET(cur->data);
-               dict_name = gtk_object_get_data(GTK_OBJECT(menuitem), 
-                                               "dict_name");
+               dict_name = g_object_get_data(G_OBJECT(menuitem), 
+                                             "dict_name");
                if ((dict_name != NULL) && !strcmp2(dict_name, dictionary)) {
                        gtk_option_menu_set_history(GTK_OPTION_MENU(menu), n);
 
@@ -1700,20 +1700,20 @@ GtkWidget *gtkaspell_sugmode_option_menu_new(gint sugmode)
        item = gtk_menu_item_new_with_label(_("Fast Mode"));
         gtk_widget_show(item);
        gtk_menu_append(GTK_MENU(menu), item);
-       gtk_object_set_data(GTK_OBJECT(item), "sugmode",
-                           GINT_TO_POINTER(ASPELL_FASTMODE));
+       g_object_set_data(G_OBJECT(item), "sugmode",
+                         GINT_TO_POINTER(ASPELL_FASTMODE));
 
        item = gtk_menu_item_new_with_label(_("Normal Mode"));
         gtk_widget_show(item);
        gtk_menu_append(GTK_MENU(menu), item);
-       gtk_object_set_data(GTK_OBJECT(item), "sugmode",
-                           GINT_TO_POINTER(ASPELL_NORMALMODE));
+       g_object_set_data(G_OBJECT(item), "sugmode",
+                         GINT_TO_POINTER(ASPELL_NORMALMODE));
        
        item = gtk_menu_item_new_with_label(_("Bad Spellers Mode"));
         gtk_widget_show(item);
        gtk_menu_append(GTK_MENU(menu), item);
-       gtk_object_set_data(GTK_OBJECT(item), "sugmode",
-                           GINT_TO_POINTER(ASPELL_BADSPELLERMODE));
+       g_object_set_data(G_OBJECT(item), "sugmode",
+                         GINT_TO_POINTER(ASPELL_BADSPELLERMODE));
 
        return menu;
 }
@@ -1738,8 +1738,8 @@ gint gtkaspell_get_sugmode_from_option_menu(GtkOptionMenu *optmenu)
 
        item = gtk_menu_get_active(GTK_MENU(gtk_option_menu_get_menu(optmenu)));
        
-       sugmode = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(item),
-                                                     "sugmode"));
+       sugmode = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item),
+                                                   "sugmode"));
 
        return sugmode;
 }
@@ -1806,8 +1806,8 @@ static GtkMenu *make_sug_menu(GtkAspell *gtkaspell)
 
        gtkaspell->sug_menu = menu;     
 
-       gtk_signal_connect(GTK_OBJECT(menu), "cancel",
-               GTK_SIGNAL_FUNC(cancel_menu_cb), gtkaspell);
+       g_signal_connect(G_OBJECT(menu), "cancel",
+                        G_CALLBACK(cancel_menu_cb), gtkaspell);
 
        caption = g_strdup_printf(_("\"%s\" unknown in %s"), 
                                  (unsigned char*) l->data, 
@@ -1825,9 +1825,9 @@ static GtkMenu *make_sug_menu(GtkAspell *gtkaspell)
        item = gtk_menu_item_new_with_label(_("Accept in this session"));
        gtk_widget_show(item);
        gtk_menu_append(GTK_MENU(menu), item);
-        gtk_signal_connect(GTK_OBJECT(item), "activate",
-                          GTK_SIGNAL_FUNC(add_word_to_session_cb), 
-                          gtkaspell);
+        g_signal_connect(G_OBJECT(item), "activate",
+                        G_CALLBACK(add_word_to_session_cb), 
+                        gtkaspell);
        gtk_widget_add_accelerator(item, "activate", accel, GDK_space,
                                   GDK_MOD1_MASK,
                                   GTK_ACCEL_LOCKED | GTK_ACCEL_VISIBLE);
@@ -1835,9 +1835,9 @@ static GtkMenu *make_sug_menu(GtkAspell *gtkaspell)
        item = gtk_menu_item_new_with_label(_("Add to personal dictionary"));
        gtk_widget_show(item);
        gtk_menu_append(GTK_MENU(menu), item);
-        gtk_signal_connect(GTK_OBJECT(item), "activate",
-                          GTK_SIGNAL_FUNC(add_word_to_personal_cb), 
-                          gtkaspell);
+        g_signal_connect(G_OBJECT(item), "activate",
+                        G_CALLBACK(add_word_to_personal_cb), 
+                        gtkaspell);
        gtk_widget_add_accelerator(item, "activate", accel, GDK_Return,
                                   GDK_MOD1_MASK,
                                   GTK_ACCEL_LOCKED | GTK_ACCEL_VISIBLE);
@@ -1845,9 +1845,9 @@ static GtkMenu *make_sug_menu(GtkAspell *gtkaspell)
         item = gtk_menu_item_new_with_label(_("Replace with..."));
        gtk_widget_show(item);
        gtk_menu_append(GTK_MENU(menu), item);
-        gtk_signal_connect(GTK_OBJECT(item), "activate",
-                          GTK_SIGNAL_FUNC(replace_with_create_dialog_cb), 
-                          gtkaspell);
+        g_signal_connect(G_OBJECT(item), "activate",
+                        G_CALLBACK(replace_with_create_dialog_cb), 
+                        gtkaspell);
        gtk_widget_add_accelerator(item, "activate", accel, GDK_R, 0,
                                   GTK_ACCEL_LOCKED | GTK_ACCEL_VISIBLE);
 
@@ -1858,9 +1858,9 @@ static GtkMenu *make_sug_menu(GtkAspell *gtkaspell)
                g_free(caption);
                gtk_widget_show(item);
                gtk_menu_append(GTK_MENU(menu), item);
-               gtk_signal_connect(GTK_OBJECT(item), "activate",
-                               GTK_SIGNAL_FUNC(check_with_alternate_cb),
-                               gtkaspell);
+               g_signal_connect(G_OBJECT(item), "activate",
+                                G_CALLBACK(check_with_alternate_cb),
+                                gtkaspell);
                gtk_widget_add_accelerator(item, "activate", accel, GDK_X, 0,
                                           GTK_ACCEL_LOCKED | GTK_ACCEL_VISIBLE);
        }
@@ -1897,9 +1897,9 @@ static GtkMenu *make_sug_menu(GtkAspell *gtkaspell)
                        item = gtk_menu_item_new_with_label(utf8buf);
                        gtk_widget_show(item);
                        gtk_menu_append(GTK_MENU(curmenu), item);
-                       gtk_signal_connect(GTK_OBJECT(item), "activate",
-                                          GTK_SIGNAL_FUNC(replace_word_cb),
-                                          gtkaspell);
+                       g_signal_connect(G_OBJECT(item), "activate",
+                                        G_CALLBACK(replace_word_cb),
+                                        gtkaspell);
 
                        if (curmenu == menu && count < MENUCOUNT) {
                                gtk_widget_add_accelerator(item, "activate",
@@ -1924,7 +1924,7 @@ static GtkMenu *make_sug_menu(GtkAspell *gtkaspell)
 #endif
 /* XXX:GTK2 */
 #if 0
-       gtk_accel_group_attach(accel, GTK_OBJECT(menu));
+       gtk_accel_group_attach(accel, G_OBJECT(menu));
        gtk_accel_group_unref(accel);
 #endif
        
@@ -1963,9 +1963,9 @@ static void populate_submenu(GtkAspell *gtkaspell, GtkWidget *menu)
                                gtkaspell->alternate_speller->dictionary->dictname);
                item = gtk_menu_item_new_with_label(dictname);
                g_free(dictname);
-               gtk_signal_connect(GTK_OBJECT(item), "activate",
-                                  GTK_SIGNAL_FUNC(switch_to_alternate_cb),
-                                  gtkaspell);
+               g_signal_connect(G_OBJECT(item), "activate",
+                                G_CALLBACK(switch_to_alternate_cb),
+                                gtkaspell);
                gtk_widget_show(item);
                gtk_menu_append(GTK_MENU(menu), item);
        }
@@ -1975,9 +1975,9 @@ static void populate_submenu(GtkAspell *gtkaspell, GtkWidget *menu)
                gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item),TRUE);
                gtk_widget_set_sensitive(GTK_WIDGET(item),FALSE);
        } else
-               gtk_signal_connect(GTK_OBJECT(item), "activate",
-                                  GTK_SIGNAL_FUNC(set_sug_mode_cb),
-                                  gtkaspell);
+               g_signal_connect(G_OBJECT(item), "activate",
+                                G_CALLBACK(set_sug_mode_cb),
+                                gtkaspell);
        gtk_widget_show(item);
        gtk_menu_append(GTK_MENU(menu), item);
 
@@ -1986,9 +1986,9 @@ static void populate_submenu(GtkAspell *gtkaspell, GtkWidget *menu)
                gtk_widget_set_sensitive(GTK_WIDGET(item), FALSE);
                gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), TRUE);
        } else
-               gtk_signal_connect(GTK_OBJECT(item), "activate",
-                                  GTK_SIGNAL_FUNC(set_sug_mode_cb),
-                                  gtkaspell);
+               g_signal_connect(G_OBJECT(item), "activate",
+                                G_CALLBACK(set_sug_mode_cb),
+                                gtkaspell);
        gtk_widget_show(item);
        gtk_menu_append(GTK_MENU(menu),item);
 
@@ -1997,9 +1997,9 @@ static void populate_submenu(GtkAspell *gtkaspell, GtkWidget *menu)
                gtk_widget_set_sensitive(GTK_WIDGET(item), FALSE);
                gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), TRUE);
        } else
-               gtk_signal_connect(GTK_OBJECT(item), "activate",
-                                  GTK_SIGNAL_FUNC(set_sug_mode_cb),
-                                  gtkaspell);
+               g_signal_connect(G_OBJECT(item), "activate",
+                                G_CALLBACK(set_sug_mode_cb),
+                                gtkaspell);
        gtk_widget_show(item);
        gtk_menu_append(GTK_MENU(menu), item);
        
@@ -2012,9 +2012,9 @@ static void populate_submenu(GtkAspell *gtkaspell, GtkWidget *menu)
                gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), TRUE);
        else    
                gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), FALSE);
-       gtk_signal_connect(GTK_OBJECT(item), "activate",
-                          GTK_SIGNAL_FUNC(toggle_check_while_typing_cb),
-                          gtkaspell);
+       g_signal_connect(G_OBJECT(item), "activate",
+                        G_CALLBACK(toggle_check_while_typing_cb),
+                        gtkaspell);
        gtk_widget_show(item);
        gtk_menu_append(GTK_MENU(menu), item);
 
@@ -2055,8 +2055,8 @@ static void populate_submenu(GtkAspell *gtkaspell, GtkWidget *menu)
                        }
                        dict = (Dictionary *) tmp->data;
                        item = gtk_check_menu_item_new_with_label(dict->dictname);
-                       gtk_object_set_data(GTK_OBJECT(item), "dict_name",
-                                           dict->fullname); 
+                       g_object_set_data(G_OBJECT(item), "dict_name",
+                                         dict->fullname); 
                        if (strcmp2(dict->fullname,
                            gtkaspell->gtkaspeller->dictionary->fullname))
                                gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), FALSE);
@@ -2065,9 +2065,9 @@ static void populate_submenu(GtkAspell *gtkaspell, GtkWidget *menu)
                                gtk_widget_set_sensitive(GTK_WIDGET(item),
                                                         FALSE);
                        }
-                       gtk_signal_connect(GTK_OBJECT(item), "activate",
-                                          GTK_SIGNAL_FUNC(change_dict_cb),
-                                          gtkaspell);
+                       g_signal_connect(G_OBJECT(item), "activate",
+                                        G_CALLBACK(change_dict_cb),
+                                        gtkaspell);
                        gtk_widget_show(item);
                        gtk_menu_append(GTK_MENU(curmenu), item);
                        
@@ -2215,7 +2215,7 @@ static void change_dict_cb(GtkWidget *w, GtkAspell *gtkaspell)
 {
        gchar           *fullname;
   
-        fullname = (gchar *) gtk_object_get_data(GTK_OBJECT(w), "dict_name");
+        fullname = (gchar *) g_object_get_data(G_OBJECT(w), "dict_name");
        
        if (!strcmp2(fullname, _("None")))
                return;
@@ -2407,9 +2407,9 @@ static void gtkaspell_alert_dialog(gchar *message)
        dialog = gtk_dialog_new();
        gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, FALSE, FALSE);
        gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE);
-       gtk_signal_connect_object(GTK_OBJECT(dialog), "destroy",
-                                  GTK_SIGNAL_FUNC(gtk_widget_destroy), 
-                                  GTK_OBJECT(dialog));
+       g_signal_connect_swapped(G_OBJECT(dialog), "destroy",
+                                G_CALLBACK(gtk_widget_destroy), 
+                                G_OBJECT(dialog));
 
        label  = gtk_label_new(message);
        gtk_misc_set_padding(GTK_MISC(label), 8, 8);
@@ -2422,9 +2422,9 @@ static void gtkaspell_alert_dialog(gchar *message)
        GTK_WIDGET_SET_FLAGS(ok_button, GTK_CAN_DEFAULT);
        gtk_box_pack_start(GTK_BOX(hbox), ok_button, TRUE, TRUE, 8);    
 
-       gtk_signal_connect_object(GTK_OBJECT(ok_button), "clicked",
-                                  GTK_SIGNAL_FUNC(gtk_widget_destroy), 
-                                  GTK_OBJECT(dialog));
+       g_signal_connect_swapped(G_OBJECT(ok_button), "clicked",
+                                G_CALLBACK(gtk_widget_destroy), 
+                                G_OBJECT(dialog));
        gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), hbox);
                        
        gtk_widget_grab_default(ok_button);
index 3e400cf..2e5380b 100644 (file)
@@ -351,7 +351,7 @@ gtk_sctree_button_press (GtkWidget *widget, GdkEventButton *event)
                sctree->dnd_select_pending_state = 0;
 
                if (on_row)
-                       g_signal_emit (GTK_OBJECT (sctree),
+                       g_signal_emit (G_OBJECT (sctree),
                                       sctree_signals[OPEN_ROW], 0);
 
                retval = TRUE;
index fa5efcb..5a244b0 100644 (file)
@@ -193,20 +193,20 @@ ComboButton *gtkut_combo_button_create(GtkWidget *button,
                                        &combo->factory, data);
        combo->data = data;
 
-       gtk_signal_connect(GTK_OBJECT(combo->button), "size_request",
-                          GTK_SIGNAL_FUNC(combo_button_size_request), combo);
-       gtk_signal_connect(GTK_OBJECT(combo->button), "enter",
-                          GTK_SIGNAL_FUNC(combo_button_enter), combo);
-       gtk_signal_connect(GTK_OBJECT(combo->button), "leave",
-                          GTK_SIGNAL_FUNC(combo_button_leave), combo);
-       gtk_signal_connect(GTK_OBJECT(combo->arrow), "enter",
-                          GTK_SIGNAL_FUNC(combo_button_enter), combo);
-       gtk_signal_connect(GTK_OBJECT(combo->arrow), "leave",
-                          GTK_SIGNAL_FUNC(combo_button_leave), combo);
-       gtk_signal_connect(GTK_OBJECT(combo->arrow), "button_press_event",
-                          GTK_SIGNAL_FUNC(combo_button_arrow_pressed), combo);
-       gtk_signal_connect(GTK_OBJECT(combo->arrow), "destroy",
-                          GTK_SIGNAL_FUNC(combo_button_destroy), combo);
+       g_signal_connect(G_OBJECT(combo->button), "size_request",
+                        G_CALLBACK(combo_button_size_request), combo);
+       g_signal_connect(G_OBJECT(combo->button), "enter",
+                        G_CALLBACK(combo_button_enter), combo);
+       g_signal_connect(G_OBJECT(combo->button), "leave",
+                        G_CALLBACK(combo_button_leave), combo);
+       g_signal_connect(G_OBJECT(combo->arrow), "enter",
+                        G_CALLBACK(combo_button_enter), combo);
+       g_signal_connect(G_OBJECT(combo->arrow), "leave",
+                        G_CALLBACK(combo_button_leave), combo);
+       g_signal_connect(G_OBJECT(combo->arrow), "button_press_event",
+                        G_CALLBACK(combo_button_arrow_pressed), combo);
+       g_signal_connect(G_OBJECT(combo->arrow), "destroy",
+                        G_CALLBACK(combo_button_destroy), combo);
 
        return combo;
 }
@@ -603,7 +603,7 @@ void gtkut_widget_set_composer_icon(GtkWidget *widget)
 }
 
 GtkWidget *gtkut_account_menu_new(GList                        *ac_list,
-                                 GtkSignalFunc          callback,
+                                 GCallback              callback,
                                  gpointer               data)
 {
        GList *cur_ac;
@@ -631,9 +631,8 @@ GtkWidget *gtkut_account_menu_new(GList                     *ac_list,
                MENUITEM_ADD(menu, menuitem, name, account->account_id);
                g_free(name);
                if (callback != NULL)
-                       gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
-                                          callback,
-                                          data);
+                       g_signal_connect(G_OBJECT(menuitem), "activate",
+                                        callback, data);
        }
        return menu;
 }
index f806118..143d42c 100644 (file)
@@ -157,7 +157,7 @@ void gtkut_widget_set_app_icon              (GtkWidget      *widget);
 void gtkut_widget_set_composer_icon    (GtkWidget      *widget);
 
 GtkWidget *gtkut_account_menu_new      (GList                  *ac_list,
-                                        GtkSignalFunc           callback,
+                                        GCallback               callback,
                                         gpointer                data);
 
 void gtkut_set_widget_bgcolor_rgb      (GtkWidget      *widget,
index 0dd1c4b..729184c 100644 (file)
@@ -133,22 +133,22 @@ static void gtk_vscrollbutton_init(GtkVScrollbutton *scrollbutton)
     gtk_widget_show(scrollbutton->downbutton);
     gtk_widget_show(scrollbutton->upbutton);
 
-    gtk_signal_connect(GTK_OBJECT(scrollbutton->upbutton),
+    g_signal_connect(G_OBJECT(scrollbutton->upbutton),
                       "button_press_event",
-                      GTK_SIGNAL_FUNC(gtk_vscrollbutton_button_press),
+                      G_CALLBACK(gtk_vscrollbutton_button_press),
                       scrollbutton);
-    gtk_signal_connect(GTK_OBJECT(scrollbutton->downbutton),
+    g_signal_connect(G_OBJECT(scrollbutton->downbutton),
                       "button_press_event",
-                      GTK_SIGNAL_FUNC(gtk_vscrollbutton_button_press),
+                      G_CALLBACK(gtk_vscrollbutton_button_press),
                       scrollbutton);
-    gtk_signal_connect(GTK_OBJECT(scrollbutton->upbutton),
-                      "button_release_event",
-                      GTK_SIGNAL_FUNC
-                      (gtk_vscrollbutton_button_release), scrollbutton);
-    gtk_signal_connect(GTK_OBJECT(scrollbutton->downbutton),
-                      "button_release_event",
-                      GTK_SIGNAL_FUNC
-                      (gtk_vscrollbutton_button_release), scrollbutton);
+    g_signal_connect(G_OBJECT(scrollbutton->upbutton),
+                    "button_release_event",
+                    G_CALLBACK
+                    (gtk_vscrollbutton_button_release), scrollbutton);
+    g_signal_connect(G_OBJECT(scrollbutton->downbutton),
+                    "button_release_event",
+                    G_CALLBACK
+                    (gtk_vscrollbutton_button_release), scrollbutton);
     gtk_box_pack_start(GTK_BOX(&scrollbutton->vbox),
                       scrollbutton->upbutton, TRUE, TRUE, 0);
     gtk_box_pack_end(GTK_BOX(&scrollbutton->vbox),
@@ -162,13 +162,13 @@ GtkWidget *gtk_vscrollbutton_new(GtkAdjustment *adjustment)
     vscrollbutton = GTK_WIDGET(gtk_type_new(gtk_vscrollbutton_get_type()));
     gtk_vscrollbutton_set_adjustment(GTK_VSCROLLBUTTON(vscrollbutton),
                                     adjustment);
-    gtk_signal_connect(GTK_OBJECT(GTK_VSCROLLBUTTON(vscrollbutton)->adjustment),
+    g_signal_connect(G_OBJECT(GTK_VSCROLLBUTTON(vscrollbutton)->adjustment),
                       "value_changed",
-                      GTK_SIGNAL_FUNC
+                      G_CALLBACK
                       (gtk_vscrollbutton_set_sensitivity), vscrollbutton);
-    gtk_signal_connect(GTK_OBJECT(GTK_VSCROLLBUTTON(vscrollbutton)->adjustment),
+    g_signal_connect(G_OBJECT(GTK_VSCROLLBUTTON(vscrollbutton)->adjustment),
                       "changed",
-                      GTK_SIGNAL_FUNC
+                      G_CALLBACK
                       (gtk_vscrollbutton_set_sensitivity), vscrollbutton);
     return vscrollbutton;
 }
@@ -188,15 +188,15 @@ void gtk_vscrollbutton_set_adjustment(GtkVScrollbutton *scrollbutton,
 
     if (scrollbutton->adjustment != adjustment) {
        if (scrollbutton->adjustment) {
-           gtk_signal_disconnect_by_data(GTK_OBJECT
-                                         (scrollbutton->
-                                          adjustment), (gpointer)
-                                         scrollbutton);
-           gtk_object_unref(GTK_OBJECT(scrollbutton->adjustment));
+           g_signal_handlers_disconnect_matched(scrollbutton->adjustment,
+                                                G_SIGNAL_MATCH_DATA,
+                                                0, 0, NULL, NULL, 
+                                                (gpointer) scrollbutton);
+           g_object_unref(G_OBJECT(scrollbutton->adjustment));
        }
 
        scrollbutton->adjustment = adjustment;
-       gtk_object_ref(GTK_OBJECT(adjustment));
+       g_object_ref(G_OBJECT(adjustment));
        gtk_object_sink(GTK_OBJECT(adjustment));
     }
 }
@@ -282,7 +282,7 @@ static gint gtk_vscrollbutton_scroll(GtkVScrollbutton *scrollbutton)
 
     if (new_value != scrollbutton->adjustment->value) {
        scrollbutton->adjustment->value = new_value;
-       gtk_signal_emit_by_name(GTK_OBJECT
+       g_signal_emit_by_name(G_OBJECT
                                (scrollbutton->adjustment),
                                "value_changed");
        gtk_widget_queue_resize(GTK_WIDGET(scrollbutton)); /* ensure resize */
@@ -298,7 +298,7 @@ gtk_vscrollbutton_timer_1st_time(GtkVScrollbutton *scrollbutton)
      * If the real timeout function succeeds and the timeout is still set,
      * replace it with a quicker one so successive scrolling goes faster.
      */
-    gtk_object_ref(GTK_OBJECT(scrollbutton));
+    g_object_ref(G_OBJECT(scrollbutton));
     if (scrollbutton->timer) {
        /* We explicitely remove ourselves here in the paranoia
         * that due to things happening above in the callback
@@ -310,7 +310,7 @@ gtk_vscrollbutton_timer_1st_time(GtkVScrollbutton *scrollbutton)
                                              gtk_real_vscrollbutton_timer,
                                              scrollbutton);
     }
-    gtk_object_unref(GTK_OBJECT(scrollbutton));
+    g_object_unref(G_OBJECT(scrollbutton));
     return FALSE;              /* don't keep calling this function */
 }
 
index 5c19dd7..03856a7 100644 (file)
@@ -280,7 +280,7 @@ static void menu_item_add_accel( GtkWidget *widget, guint accel_signal_id, GtkAc
 #warning FIXME_GTK2
 #if 0
        GtkWidget *connected = GTK_WIDGET(user_data);   
-       if (gtk_signal_n_emissions_by_name(GTK_OBJECT(widget),"add_accelerator") > 1 ) return;
+       if (gtk_signal_n_emissions_by_name(G_OBJECT(widget),"add_accelerator") > 1 ) return;
        gtk_widget_remove_accelerators(connected,"activate",FALSE);
        /* lock _this_ widget */
        gtk_accel_group_lock_entry(accel_group,accel_key,accel_mods);
@@ -301,7 +301,7 @@ static void menu_item_remove_accel(GtkWidget *widget, GtkAccelGroup *accel_group
 #if 0
        GtkWidget *wid = GTK_WIDGET(user_data);
 
-       if (gtk_signal_n_emissions_by_name(GTK_OBJECT(widget),
+       if (gtk_signal_n_emissions_by_name(G_OBJECT(widget),
            "remove_accelerator") > 2 )
                return;
        gtk_widget_remove_accelerators(wid,"activate",FALSE);
@@ -310,10 +310,10 @@ static void menu_item_remove_accel(GtkWidget *widget, GtkAccelGroup *accel_group
 
 static void connect_accel_change_signals(GtkWidget* widget, GtkWidget *wid2) 
 {
-       gtk_signal_connect_after(GTK_OBJECT(widget), "add_accelerator", 
-                                G_CALLBACK(menu_item_add_accel), wid2);
-       gtk_signal_connect_after(GTK_OBJECT(widget), "remove_accelerator", 
-                                G_CALLBACK(menu_item_remove_accel), wid2);
+       g_signal_connect_after(G_OBJECT(widget), "add_accelerator", 
+                              G_CALLBACK(menu_item_add_accel), wid2);
+       g_signal_connect_after(G_OBJECT(widget), "remove_accelerator", 
+                              G_CALLBACK(menu_item_remove_accel), wid2);
 }
 
 void menu_connect_identical_items(void)
@@ -383,7 +383,7 @@ void menu_select_by_data(GtkMenu *menu, gpointer data)
        children = gtk_container_children(GTK_CONTAINER(menu));
 
        for (cur = children; cur != NULL; cur = g_list_next(cur)) {
-               GtkObject *child = GTK_OBJECT(cur->data);
+               GtkObject *child = G_OBJECT(cur->data);
 
                if (gtk_object_get_user_data(child) == data) {
                        select_item = GTK_WIDGET(child);
index 99a2ec9..f3ffb1a 100644 (file)
@@ -239,16 +239,16 @@ void pluginwindow_create()
 
        pluginwindow = g_new0(PluginWindow, 1);
 
-       gtk_signal_connect(GTK_OBJECT(load_btn), "released",
-                          GTK_SIGNAL_FUNC(load_cb), pluginwindow);
-       gtk_signal_connect(GTK_OBJECT(unload_btn), "released",
-                          GTK_SIGNAL_FUNC(unload_cb), pluginwindow);
-       gtk_signal_connect(GTK_OBJECT(close_btn), "released",
-                          GTK_SIGNAL_FUNC(close_cb), pluginwindow);
-       gtk_signal_connect(GTK_OBJECT(plugin_list), "select-row",
-                          GTK_SIGNAL_FUNC(select_row_cb), pluginwindow);
-       gtk_signal_connect(GTK_OBJECT(plugin_list), "unselect-row",
-                          GTK_SIGNAL_FUNC(unselect_row_cb), pluginwindow);
+       g_signal_connect(G_OBJECT(load_btn), "released",
+                        G_CALLBACK(load_cb), pluginwindow);
+       g_signal_connect(G_OBJECT(unload_btn), "released",
+                        G_CALLBACK(unload_cb), pluginwindow);
+       g_signal_connect(G_OBJECT(close_btn), "released",
+                        G_CALLBACK(close_cb), pluginwindow);
+       g_signal_connect(G_OBJECT(plugin_list), "select-row",
+                        G_CALLBACK(select_row_cb), pluginwindow);
+       g_signal_connect(G_OBJECT(plugin_list), "unselect-row",
+                        G_CALLBACK(unselect_row_cb), pluginwindow);
 
        pluginwindow->window = window;
        pluginwindow->plugin_list = plugin_list;
index 7e930f9..210ee21 100644 (file)
@@ -301,7 +301,8 @@ void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data)
                                curnode->treeweight = page->weight;
                }
        }
-       gtk_signal_connect(GTK_OBJECT(prefswindow->ctree), "tree-select-row", GTK_SIGNAL_FUNC(ctree_select_row), prefswindow);
+       g_signal_connect(G_OBJECT(prefswindow->ctree), "tree-select-row", 
+                        G_CALLBACK(ctree_select_row), prefswindow);
 
        gtk_clist_set_selection_mode(GTK_CLIST(prefswindow->ctree), GTK_SELECTION_BROWSE);
        gtk_clist_column_titles_passive(GTK_CLIST(prefswindow->ctree));
@@ -321,10 +322,14 @@ void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data)
 
        gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->confirm_area, 0, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 2);
 
-       gtk_signal_connect(GTK_OBJECT(prefswindow->ok_btn), "released", GTK_SIGNAL_FUNC(ok_button_released), prefswindow);
-       gtk_signal_connect(GTK_OBJECT(prefswindow->cancel_btn), "released", GTK_SIGNAL_FUNC(cancel_button_released), prefswindow);
-       gtk_signal_connect(GTK_OBJECT(prefswindow->apply_btn), "released", GTK_SIGNAL_FUNC(apply_button_released), prefswindow);
-       gtk_signal_connect(GTK_OBJECT(prefswindow->window), "delete_event", GTK_SIGNAL_FUNC(window_closed), prefswindow);
+       g_signal_connect(G_OBJECT(prefswindow->ok_btn), "released", 
+                        G_CALLBACK(ok_button_released), prefswindow);
+       g_signal_connect(G_OBJECT(prefswindow->cancel_btn), "released", 
+                        G_CALLBACK(cancel_button_released), prefswindow);
+       g_signal_connect(G_OBJECT(prefswindow->apply_btn), "released", 
+                        G_CALLBACK(apply_button_released), prefswindow);
+       g_signal_connect(G_OBJECT(prefswindow->window), "delete_event", 
+                        G_CALLBACK(window_closed), prefswindow);
 
        gtk_widget_show_all(prefswindow->window);
 }
index ab444e7..6d7094b 100644 (file)
@@ -277,8 +277,8 @@ gboolean sslcertwindow_ask_new_cert(SSLCertificate *cert)
        button = gtk_toggle_button_new_with_label(_("View certificate"));
        gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
        cert_widget = cert_presenter(cert);
-       gtk_signal_connect(GTK_OBJECT(button), "toggled",
-                          GTK_SIGNAL_FUNC(toggle_cert_cb), cert_widget);
+       g_signal_connect(G_OBJECT(button), "toggled",
+                        G_CALLBACK(toggle_cert_cb), cert_widget);
 
        val = alertpanel_with_widget(_("Unknown SSL Certificate"), NULL, _("Accept and save"), _("Cancel connection"), NULL, vbox);
        
@@ -329,8 +329,8 @@ gboolean sslcertwindow_ask_changed_cert(SSLCertificate *old_cert, SSLCertificate
        
        button = gtk_toggle_button_new_with_label(_("View certificates"));
        gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
-       gtk_signal_connect(GTK_OBJECT(button), "toggled",
-                          GTK_SIGNAL_FUNC(toggle_cert_cb), vbox);
+       g_signal_connect(G_OBJECT(button), "toggled",
+                        G_CALLBACK(toggle_cert_cb), vbox);
 
        val = alertpanel_with_widget(_("Changed SSL Certificate"), NULL, _("Accept and save"), _("Cancel connection"), NULL, vbox2);
        
index 6d3d012..fd091ff 100644 (file)
@@ -184,10 +184,12 @@ static void imp_mutt_file_select_create( AddressFileSelection *afs ) {
 
        fileSelector = gtk_file_selection_new( _("Select MUTT File") );
        gtk_file_selection_hide_fileop_buttons( GTK_FILE_SELECTION(fileSelector) );
-       gtk_signal_connect( GTK_OBJECT (GTK_FILE_SELECTION(fileSelector)->ok_button),
-                             "clicked", GTK_SIGNAL_FUNC (imp_mutt_file_ok), ( gpointer ) afs );
-       gtk_signal_connect( GTK_OBJECT (GTK_FILE_SELECTION(fileSelector)->cancel_button),
-                             "clicked", GTK_SIGNAL_FUNC (imp_mutt_file_cancel), ( gpointer ) afs );
+       g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(fileSelector)->ok_button),
+                         "clicked", 
+                        G_CALLBACK(imp_mutt_file_ok), (gpointer)afs);
+       g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(fileSelector)->cancel_button),
+                         "clicked", 
+                        G_CALLBACK(imp_mutt_file_cancel), (gpointer)afs);
        afs->fileSelector = fileSelector;
        afs->cancelled = TRUE;
 }
@@ -240,12 +242,10 @@ static void imp_mutt_create( gboolean *cancelled ) {
        gtk_window_set_title( GTK_WINDOW(window), _("Import MUTT file into Address Book") );
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
        gtk_window_set_modal(GTK_WINDOW(window), TRUE); 
-       gtk_signal_connect(GTK_OBJECT(window), "delete_event",
-                          GTK_SIGNAL_FUNC(imp_mutt_delete_event),
-                          cancelled);
-       gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
-                          GTK_SIGNAL_FUNC(imp_mutt_key_pressed),
-                          cancelled);
+       g_signal_connect(G_OBJECT(window), "delete_event",
+                        G_CALLBACK(imp_mutt_delete_event), cancelled);
+       g_signal_connect(G_OBJECT(window), "key_press_event",
+                        G_CALLBACK(imp_mutt_key_pressed), cancelled);
 
        vbox = gtk_vbox_new(FALSE, 8);
        gtk_container_add(GTK_CONTAINER(window), vbox);
@@ -294,12 +294,12 @@ static void imp_mutt_create( gboolean *cancelled ) {
        hsep = gtk_hseparator_new();
        gtk_box_pack_end(GTK_BOX(vbox), hsep, FALSE, FALSE, 0);
 
-       gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
-                          GTK_SIGNAL_FUNC(imp_mutt_ok), cancelled);
-       gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
-                          GTK_SIGNAL_FUNC(imp_mutt_cancel), cancelled);
-       gtk_signal_connect(GTK_OBJECT(file_btn), "clicked",
-                          GTK_SIGNAL_FUNC(imp_mutt_file_select), NULL);
+       g_signal_connect(G_OBJECT(ok_btn), "clicked",
+                        G_CALLBACK(imp_mutt_ok), cancelled);
+       g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+                        G_CALLBACK(imp_mutt_cancel), cancelled);
+       g_signal_connect(G_OBJECT(file_btn), "clicked",
+                        G_CALLBACK(imp_mutt_file_select), NULL);
 
        gtk_widget_show_all(vbox);
 
index 57be895..f031be9 100644 (file)
@@ -184,10 +184,12 @@ static void imp_pine_file_select_create( AddressFileSelection *afs ) {
 
        fileSelector = gtk_file_selection_new( _("Select Pine File") );
        gtk_file_selection_hide_fileop_buttons( GTK_FILE_SELECTION(fileSelector) );
-       gtk_signal_connect( GTK_OBJECT (GTK_FILE_SELECTION(fileSelector)->ok_button),
-                             "clicked", GTK_SIGNAL_FUNC (imp_pine_file_ok), ( gpointer ) afs );
-       gtk_signal_connect( GTK_OBJECT (GTK_FILE_SELECTION(fileSelector)->cancel_button),
-                             "clicked", GTK_SIGNAL_FUNC (imp_pine_file_cancel), ( gpointer ) afs );
+       g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(fileSelector)->ok_button),
+                         "clicked", 
+                        G_CALLBACK(imp_pine_file_ok), (gpointer)afs);
+       g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(fileSelector)->cancel_button),
+                         "clicked", 
+                        G_CALLBACK(imp_pine_file_cancel), (gpointer)afs);
        afs->fileSelector = fileSelector;
        afs->cancelled = TRUE;
 }
@@ -240,12 +242,10 @@ static void imp_pine_create( gboolean *cancelled ) {
        gtk_window_set_title( GTK_WINDOW(window), _("Import Pine file into Address Book") );
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
        gtk_window_set_modal(GTK_WINDOW(window), TRUE); 
-       gtk_signal_connect(GTK_OBJECT(window), "delete_event",
-                          GTK_SIGNAL_FUNC(imp_pine_delete_event),
-                          cancelled);
-       gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
-                          GTK_SIGNAL_FUNC(imp_pine_key_pressed),
-                          cancelled);
+       g_signal_connect(G_OBJECT(window), "delete_event",
+                        G_CALLBACK(imp_pine_delete_event), cancelled);
+       g_signal_connect(G_OBJECT(window), "key_press_event",
+                        G_CALLBACK(imp_pine_key_pressed), cancelled);
 
        vbox = gtk_vbox_new(FALSE, 8);
        gtk_container_add(GTK_CONTAINER(window), vbox);
@@ -294,12 +294,12 @@ static void imp_pine_create( gboolean *cancelled ) {
        hsep = gtk_hseparator_new();
        gtk_box_pack_end(GTK_BOX(vbox), hsep, FALSE, FALSE, 0);
 
-       gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
-                          GTK_SIGNAL_FUNC(imp_pine_ok), cancelled);
-       gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
-                          GTK_SIGNAL_FUNC(imp_pine_cancel), cancelled);
-       gtk_signal_connect(GTK_OBJECT(file_btn), "clicked",
-                          GTK_SIGNAL_FUNC(imp_pine_file_select), NULL);
+       g_signal_connect(G_OBJECT(ok_btn), "clicked",
+                        G_CALLBACK(imp_pine_ok), cancelled);
+       g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+                        G_CALLBACK(imp_pine_cancel), cancelled);
+       g_signal_connect(G_OBJECT(file_btn), "clicked",
+                        G_CALLBACK(imp_pine_file_select), NULL);
 
        gtk_widget_show_all(vbox);
 
index e3a9a7a..d08aa0c 100644 (file)
@@ -835,10 +835,10 @@ MainWindow *main_window_create(SeparateType type)
        handlebox = gtk_handle_box_new();
        gtk_widget_show(handlebox);
        gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
-       gtk_signal_connect(GTK_OBJECT(handlebox), "child_attached",
-                          GTK_SIGNAL_FUNC(toolbar_child_attached), mainwin);
-       gtk_signal_connect(GTK_OBJECT(handlebox), "child_detached",
-                          GTK_SIGNAL_FUNC(toolbar_child_detached), mainwin);
+       g_signal_connect(G_OBJECT(handlebox), "child_attached",
+                        G_CALLBACK(toolbar_child_attached), mainwin);
+       g_signal_connect(G_OBJECT(handlebox), "child_detached",
+                        G_CALLBACK(toolbar_child_detached), mainwin);
 
        /* link window to mainwin->window to avoid gdk warnings */
        mainwin->window       = window;
@@ -1233,9 +1233,9 @@ static void main_window_set_account_selector_menu(MainWindow *mainwin,
                         ? ac_prefs->account_name : _("Untitled"));
                gtk_widget_show(menuitem);
                gtk_menu_append(GTK_MENU(mainwin->ac_menu), menuitem);
-               gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
-                                  GTK_SIGNAL_FUNC(account_selector_menu_cb),
-                                  ac_prefs);
+               g_signal_connect(G_OBJECT(menuitem), "activate",
+                                G_CALLBACK(account_selector_menu_cb),
+                                ac_prefs);
        }
 }
 
@@ -1274,9 +1274,9 @@ static void main_window_set_account_receive_menu(MainWindow *mainwin,
                         : _("Untitled"));
                gtk_widget_show(menuitem);
                gtk_menu_append(GTK_MENU(menu), menuitem);
-               gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
-                                  GTK_SIGNAL_FUNC(account_receive_menu_cb),
-                                  ac_prefs);
+               g_signal_connect(G_OBJECT(menuitem), "activate",
+                                G_CALLBACK(account_receive_menu_cb),
+                                ac_prefs);
        }
 }
 
index 6809bb6..01f4c7f 100644 (file)
@@ -823,8 +823,8 @@ static gboolean part_button_pressed(MimeView *mimeview, GdkEventButton *event,
                        menu_set_sensitive(mimeview->popupfactory,
                                           "/Open", TRUE);
 
-               gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
-                                   "pop_partinfo", partinfo);
+               g_object_set_data(G_OBJECT(mimeview->popupmenu),
+                                 "pop_partinfo", partinfo);
                                    
                gtk_menu_popup(GTK_MENU(mimeview->popupmenu),
                               NULL, NULL, NULL, NULL,
@@ -1103,11 +1103,11 @@ static void mimeview_save_as(MimeView *mimeview)
 
        partinfo = mimeview_get_selected_part(mimeview);
        if (!partinfo) { 
-               partinfo = (MimeInfo *) gtk_object_get_data
-                       (GTK_OBJECT(mimeview->popupmenu),
+               partinfo = (MimeInfo *) g_object_get_data
+                        (G_OBJECT(mimeview->popupmenu),
                         "pop_partinfo");
-               gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
-                                   "pop_partinfo", NULL);
+               g_object_set_data(G_OBJECT(mimeview->popupmenu),
+                                 "pop_partinfo", NULL);
        }                        
        g_return_if_fail(partinfo != NULL);
        
@@ -1149,11 +1149,11 @@ static void mimeview_display_as_text(MimeView *mimeview)
 
        partinfo = mimeview_get_selected_part(mimeview);
        if (!partinfo)  {
-               partinfo = (MimeInfo *) gtk_object_get_data
-                       (GTK_OBJECT(mimeview->popupmenu),
+               partinfo = (MimeInfo *) g_object_get_data
+                       (G_OBJECT(mimeview->popupmenu),
                         "pop_partinfo");
-               gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
-                                   "pop_partinfo", NULL);
+               g_object_set_data(G_OBJECT(mimeview->popupmenu),
+                                 "pop_partinfo", NULL);
        
        }                        
        g_return_if_fail(partinfo != NULL);
@@ -1170,11 +1170,11 @@ static void mimeview_launch(MimeView *mimeview)
 
        partinfo = mimeview_get_selected_part(mimeview);
        if (!partinfo) { 
-               partinfo = (MimeInfo *) gtk_object_get_data
-                       (GTK_OBJECT(mimeview->popupmenu),
+               partinfo = (MimeInfo *) g_object_get_data
+                       (G_OBJECT(mimeview->popupmenu),
                         "pop_partinfo");
-               gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
-                                   "pop_partinfo", NULL);
+               g_object_set_data(G_OBJECT(mimeview->popupmenu),
+                                 "pop_partinfo", NULL);
        }                        
        g_return_if_fail(partinfo != NULL);
 
@@ -1200,11 +1200,11 @@ static void mimeview_open_with(MimeView *mimeview)
 
        partinfo = mimeview_get_selected_part(mimeview);
        if (!partinfo) { 
-               partinfo = (MimeInfo *) gtk_object_get_data
-                       (GTK_OBJECT(mimeview->popupmenu),
+               partinfo = (MimeInfo *) g_object_get_data
+                       (G_OBJECT(mimeview->popupmenu),
                         "pop_partinfo");
-               gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
-                                   "pop_partinfo", NULL);
+               g_object_set_data(G_OBJECT(mimeview->popupmenu),
+                                 "pop_partinfo", NULL);
        }                        
        g_return_if_fail(partinfo != NULL);
 
@@ -1331,8 +1331,8 @@ static gboolean icon_clicked_cb (GtkWidget *button, GdkEventButton *event, MimeV
        gint      num;
        MimeInfo *partinfo;
 
-       num      = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(button), "icon_number"));
-       partinfo = gtk_object_get_data(GTK_OBJECT(button), "partinfo");
+       num      = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button), "icon_number"));
+       partinfo = g_object_get_data(G_OBJECT(button), "partinfo");
 
        icon_selected(mimeview, num, partinfo);
        gtk_widget_grab_focus(button);
@@ -1342,7 +1342,7 @@ static gboolean icon_clicked_cb (GtkWidget *button, GdkEventButton *event, MimeV
                        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),
                                                     TRUE);
        } else {
-               gtk_signal_emit_stop_by_name(GTK_OBJECT(button), "button_press_event");
+               g_signal_stop_emission_by_name(G_OBJECT(button), "button_press_event");
        }
 
        part_button_pressed(mimeview, event, partinfo);
@@ -1376,8 +1376,8 @@ static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
        SummaryView  *summaryview;
        TextView     *textview;
 
-       num      = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(button), "icon_number"));
-       partinfo = gtk_object_get_data(GTK_OBJECT(button), "partinfo");
+       num      = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button), "icon_number"));
+       partinfo = g_object_get_data(G_OBJECT(button), "partinfo");
        
        if (!event) return FALSE;
 
@@ -1492,10 +1492,10 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
        mimeview->icon_count++;
        button = gtk_toggle_button_new();
        gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-       gtk_object_set_data(GTK_OBJECT(button), "icon_number", 
-               GINT_TO_POINTER(mimeview->icon_count));
-       gtk_object_set_data(GTK_OBJECT(button), "partinfo", 
-               mimeinfo);
+       g_object_set_data(G_OBJECT(button), "icon_number", 
+                         GINT_TO_POINTER(mimeview->icon_count));
+       g_object_set_data(G_OBJECT(button), "partinfo", 
+                         mimeinfo);
        
        switch (mimeinfo->type) {
                
@@ -1570,7 +1570,7 @@ static void icon_list_clear (MimeView *mimeview)
        mimeview->icon_count = 0;
        adj  = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
        adj->value = adj->lower;
-       gtk_signal_emit_by_name(GTK_OBJECT (adj), "value_changed");
+       g_signal_stop_emission_by_name(G_OBJECT (adj), "value_changed");
 }
 
 static void icon_list_toggle_by_mime_info(MimeView     *mimeview,
@@ -1581,8 +1581,8 @@ static void icon_list_toggle_by_mime_info(MimeView        *mimeview,
        child = gtk_container_children(GTK_CONTAINER(mimeview->icon_vbox));
        for (; child != NULL; child = g_list_next(child)) {
                if (GTK_IS_TOGGLE_BUTTON(child->data) &&  
-                   gtk_object_get_data(GTK_OBJECT(child->data),
-                                       "partinfo") == (gpointer)mimeinfo) {
+                   g_object_get_data(G_OBJECT(child->data),
+                                     "partinfo") == (gpointer)mimeinfo) {
                        toggle_icon(GTK_TOGGLE_BUTTON(child->data), mimeview);
                        gtk_toggle_button_set_active
                                (GTK_TOGGLE_BUTTON(child->data), TRUE);
@@ -1604,11 +1604,11 @@ static gboolean icon_list_select_by_number(MimeView     *mimeview,
        child = gtk_container_children(GTK_CONTAINER(mimeview->icon_vbox));
        for (; child != NULL; child = g_list_next(child)) {
                if (GTK_IS_TOGGLE_BUTTON(child->data) &&  
-                   GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(child->data),
+                   GPOINTER_TO_INT(g_object_get_data(G_OBJECT(child->data),
                                        "icon_number")) == number) {
                        icon_selected(mimeview, number,
-                                     (MimeInfo*)gtk_object_get_data(GTK_OBJECT(child->data),
-                                                                    "partinfo"));
+                                     (MimeInfo*)g_object_get_data(G_OBJECT(child->data),
+                                                                  "partinfo"));
                        toggle_icon(GTK_TOGGLE_BUTTON(child->data), mimeview);
                        gtk_toggle_button_set_active
                                (GTK_TOGGLE_BUTTON(child->data), TRUE);
index 69cb87a..4fb4660 100644 (file)
@@ -85,9 +85,9 @@ NoticeView *noticeview_create(MainWindow *mainwin)
        gtk_box_pack_start(GTK_BOX(hbox), text, FALSE, FALSE, 0);
 
        widget = gtk_button_new_with_label("");
-       gtk_signal_connect(GTK_OBJECT(widget), "clicked", 
-                          GTK_SIGNAL_FUNC(noticeview_button_pressed),
-                          (gpointer) noticeview);
+       g_signal_connect(G_OBJECT(widget), "clicked", 
+                        G_CALLBACK(noticeview_button_pressed),
+                        (gpointer) noticeview);
        gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, FALSE, 4);
        
        noticeview->vbox   = vbox;
index 511a511..da41a8a 100644 (file)
@@ -180,7 +180,8 @@ static void clamav_create_widget_func(PrefsPage * _page, GtkWindow *window, gpoi
 
        config = clamav_get_config();
 
-       gtk_signal_connect(GTK_OBJECT(save_folder_select), "released", GTK_SIGNAL_FUNC(foldersel_cb), page);
+       g_signal_connect(G_OBJECT(save_folder_select), "released", 
+                        G_CALLBACK(foldersel_cb), page);
 
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(enable_clamav), config->clamav_enable);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(enable_arc), config->clamav_enable_arc);
index 22537d8..0ec1cf0 100644 (file)
@@ -91,10 +91,8 @@ static void dillo_show_mimepart(MimeViewer *_viewer,
                                  viewer->socket);
                gtk_widget_realize(viewer->socket);
                gtk_widget_show(viewer->socket);
-               gtk_signal_connect(GTK_OBJECT(viewer->socket), 
-                                  "destroy", 
-                                  GTK_SIGNAL_FUNC(socket_destroy_cb),
-                                  viewer);
+               g_signal_connect(G_OBJECT(viewer->socket), "destroy", 
+                                G_CALLBACK(socket_destroy_cb), viewer);
 
                cmd = g_strdup_printf("dillo %s%s-x %d \"%s\"",
                                      (dillo_prefs.local ? "-l " : ""),
index 73ef601..b6f5cda 100644 (file)
@@ -420,12 +420,12 @@ MimeViewer *image_viewer_create(void)
 
        gtk_widget_ref(notebook);
 
-       gtk_signal_connect(GTK_OBJECT(load_button), "released",
-                          GTK_SIGNAL_FUNC(load_cb), imageviewer);
-       gtk_signal_connect(GTK_OBJECT(scrolledwin), "button-press-event",
-                          GTK_SIGNAL_FUNC(scrolledwin_button_cb), imageviewer);
-       gtk_signal_connect(GTK_OBJECT(scrolledwin), "size-allocate",
-                          GTK_SIGNAL_FUNC(scrolledwin_resize_cb), imageviewer);
+       g_signal_connect(G_OBJECT(load_button), "released",
+                        G_CALLBACK(load_cb), imageviewer);
+       g_signal_connect(G_OBJECT(scrolledwin), "button-press-event",
+                        G_CALLBACK(scrolledwin_button_cb), imageviewer);
+       g_signal_connect(G_OBJECT(scrolledwin), "size-allocate",
+                        G_CALLBACK(scrolledwin_resize_cb), imageviewer);
 
        image_viewer_set_notebook_page((MimeViewer *)imageviewer);
 
index e104c94..c563fa1 100644 (file)
@@ -348,7 +348,8 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
 
        config = spamassassin_get_config();
 
-       gtk_signal_connect(GTK_OBJECT(button4), "released", GTK_SIGNAL_FUNC(foldersel_cb), page);
+       g_signal_connect(G_OBJECT(button4), "released", 
+                        G_CALLBACK(foldersel_cb), page);
 
        if (config->hostname != NULL)
                gtk_entry_set_text(GTK_ENTRY(hostname), config->hostname);
index 7160142..fae0c2b 100644 (file)
@@ -153,12 +153,12 @@ gtk_plug_xembed_class_init (GtkPlugXEmbedClass *class)
 #endif
 
   plug_signals[EMBEDDED] =
-         gtk_signal_new ("embedded",
-                         GTK_RUN_LAST,
-                         GTK_OBJECT_CLASS (class)->type,
-                         GTK_STRUCT_OFFSET (GtkPlugXEmbedClass, embedded),
-                         gtk_marshal_NONE__NONE,
-                         GTK_TYPE_NONE, 0);
+         g_signal_new ("embedded",
+                       GTK_RUN_LAST,
+                       GTK_OBJECT_CLASS (class)->type,
+                       GTK_STRUCT_OFFSET (GtkPlugXEmbedClass, embedded),
+                       gtk_marshal_NONE__NONE,
+                       GTK_TYPE_NONE, 0);
 }
 
 static void
@@ -187,7 +187,7 @@ gtk_plug_xembed_set_is_child (GtkPlugXEmbed  *plug,
       if (plug->modality_group)
        {
          gtk_window_group_remove_window (plug->modality_group, GTK_WINDOW (plug));
-         gtk_object_unref (plug->modality_group);
+         g_object_unref (plug->modality_group);
          plug->modality_group = NULL;
        }
 #endif
@@ -292,8 +292,8 @@ _gtk_plug_xembed_remove_from_socket (GtkPlugXEmbed   *plug,
 
   widget = GTK_WIDGET (plug);
 
-  gtk_object_ref (plug);
-  gtk_object_ref (socket);
+  g_object_ref (plug);
+  g_object_ref (socket);
 
   widget_was_visible = GTK_WIDGET_VISIBLE (plug);
   
@@ -327,12 +327,12 @@ _gtk_plug_xembed_remove_from_socket (GtkPlugXEmbed   *plug,
     gtk_widget_destroy (widget);
   
   gdk_window_unref (event.any.window);
-  gtk_object_unref (plug);
+  g_object_unref (plug);
 
   if (widget_was_visible && GTK_WIDGET_VISIBLE (socket))
     gtk_widget_queue_resize (GTK_WIDGET (socket));
 
-  gtk_object_unref (socket);
+  g_object_unref (socket);
 #endif
 }
 
@@ -440,7 +440,7 @@ gtk_plug_xembed_unrealize (GtkWidget *widget)
        handle_modality_off (plug);
 
       gtk_window_group_remove_window (plug->modality_group, GTK_WINDOW (plug));
-      gtk_object_unref (plug->modality_group);
+      g_object_unref (plug->modality_group);
     }
 #endif
   
@@ -1088,7 +1088,7 @@ gtk_plug_xembed_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer da
 
        return_val = GDK_FILTER_REMOVE;
        
-       gtk_object_ref (GTK_OBJECT(plug));
+       g_object_ref (G_OBJECT(plug));
        
        if (was_embedded)
          {
@@ -1166,11 +1166,11 @@ gtk_plug_xembed_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer da
 #endif
 
            if (!was_embedded)
-             gtk_signal_emit (GTK_OBJECT (plug), plug_signals[EMBEDDED], 0);
+             g_signal_emit (G_OBJECT (plug), plug_signals[EMBEDDED], 0);
          }
 
       done:
-       gtk_object_unref (GTK_OBJECT(plug));
+       g_object_unref (G_OBJECT(plug));
        
        break;
       }
index af09fe3..a078709 100644 (file)
@@ -170,12 +170,12 @@ static void create_trayicon()
 #endif
 
        destroy_signal_id =
-       gtk_signal_connect(GTK_OBJECT(trayicon), "destroy",
-                     GTK_SIGNAL_FUNC(destroy_cb), NULL);
-       gtk_signal_connect(GTK_OBJECT(trayicon), "size_allocate",
-                   GTK_SIGNAL_FUNC(resize_cb), NULL);
-       gtk_signal_connect(GTK_OBJECT(eventbox), "button-press-event",
-                   GTK_SIGNAL_FUNC(click_cb), NULL);
+       g_signal_connect(G_OBJECT(trayicon), "destroy",
+                        G_CALLBACK(destroy_cb), NULL);
+       g_signal_connect(G_OBJECT(trayicon), "size_allocate",
+                        G_CALLBACK(resize_cb), NULL);
+       g_signal_connect(G_OBJECT(eventbox), "button-press-event",
+                        G_CALLBACK(click_cb), NULL);
 
         tooltips = gtk_tooltips_new();
         gtk_tooltips_set_delay(tooltips, 1000);
@@ -211,7 +211,7 @@ int plugin_init(gchar **error)
 
 void plugin_done(void)
 {
-       gtk_signal_disconnect(GTK_OBJECT(trayicon), destroy_signal_id);
+       g_signal_handler_disconnect(G_OBJECT(trayicon), destroy_signal_id);
 
        gtk_widget_destroy(GTK_WIDGET(trayicon));
        hooks_unregister_hook(FOLDER_ITEM_UPDATE_HOOKLIST, hook_id);
index 2e40678..7706ce4 100644 (file)
@@ -1986,7 +1986,7 @@ static void prefs_account_crosspost_set_data_from_colormenu(PrefParam *pparam)
        menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(advanced.crosspost_colormenu));
        menuitem = gtk_menu_get_active(GTK_MENU(menu));
        *((gint *)pparam->data) = GPOINTER_TO_INT
-               (gtk_object_get_data(GTK_OBJECT(menuitem), "color"));
+               (g_object_get_data(G_OBJECT(menuitem), "color"));
 }
 
 static void prefs_account_crosspost_set_colormenu(PrefParam *pparam)
index 8bca068..ac3e3a6 100644 (file)
@@ -987,9 +987,9 @@ static void prefs_common_create(void)
                          G_CALLBACK(prefs_common_ok), NULL);
        g_signal_connect (G_OBJECT(dialog.apply_btn), "clicked",
                          G_CALLBACK(prefs_common_apply), NULL);
-       gtk_signal_connect_object (GTK_OBJECT(dialog.cancel_btn), "clicked",
-                                  GTK_SIGNAL_FUNC(prefs_common_cancel),
-                                  GTK_OBJECT(dialog.window));
+       g_signal_connect_swapped(G_OBJECT(dialog.cancel_btn), "clicked",
+                                G_CALLBACK(prefs_common_cancel),
+                                G_OBJECT(dialog.window));
 
        /* create all widgets on notebook */
        prefs_receive_create();
@@ -2512,8 +2512,8 @@ static void date_format_select_row(GtkWidget *date_format_list, gint row,
        if (!event || event->type != GDK_2BUTTON_PRESS) return;
 
 
-       datefmt_sample = GTK_WIDGET(gtk_object_get_data
-                                   (GTK_OBJECT(date_format), "datefmt_sample"));
+       datefmt_sample = GTK_WIDGET(g_object_get_data(G_OBJECT(date_format), 
+                                                     "datefmt_sample"));
 
        g_return_if_fail(date_format_list != NULL);
        g_return_if_fail(date_format != NULL);
index 74cff99..391f65e 100644 (file)
@@ -205,15 +205,15 @@ static void prefs_filtering_create(void)
        gtk_window_set_title (GTK_WINDOW(window),
                                    _("Filtering/Processing configuration"));
 
-       gtk_signal_connect (GTK_OBJECT(window), "delete_event",
-                           GTK_SIGNAL_FUNC(prefs_filtering_deleted), NULL);
-       gtk_signal_connect (GTK_OBJECT(window), "key_press_event",
-                           GTK_SIGNAL_FUNC(prefs_filtering_key_pressed), NULL);
+       g_signal_connect(G_OBJECT(window), "delete_event",
+                        G_CALLBACK(prefs_filtering_deleted), NULL);
+       g_signal_connect(G_OBJECT(window), "key_press_event",
+                        G_CALLBACK(prefs_filtering_key_pressed), NULL);
        MANAGE_WINDOW_SIGNALS_CONNECT (window);
-       gtk_signal_connect (GTK_OBJECT(ok_btn), "clicked",
-                           GTK_SIGNAL_FUNC(prefs_filtering_ok), NULL);
-       gtk_signal_connect (GTK_OBJECT(cancel_btn), "clicked",
-                           GTK_SIGNAL_FUNC(prefs_filtering_cancel), NULL);
+       g_signal_connect(G_OBJECT(ok_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_ok), NULL);
+       g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_cancel), NULL);
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -237,9 +237,9 @@ static void prefs_filtering_create(void)
        cond_btn = gtk_button_new_with_label (_("Define ..."));
        gtk_widget_show (cond_btn);
        gtk_box_pack_start (GTK_BOX (hbox1), cond_btn, FALSE, FALSE, 0);
-       gtk_signal_connect (GTK_OBJECT (cond_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_filtering_condition_define),
-                           NULL);
+       g_signal_connect(G_OBJECT (cond_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_condition_define),
+                        NULL);
 
        action_label = gtk_label_new (_("Action"));
        gtk_widget_show (action_label);
@@ -258,9 +258,9 @@ static void prefs_filtering_create(void)
        action_btn = gtk_button_new_with_label (_("Define ..."));
        gtk_widget_show (action_btn);
        gtk_box_pack_start (GTK_BOX (hbox1), action_btn, FALSE, FALSE, 0);
-       gtk_signal_connect (GTK_OBJECT (action_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_filtering_action_define),
-                           NULL);
+       g_signal_connect(G_OBJECT (action_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_action_define),
+                        NULL);
 
        /* register / substitute / delete */
 
@@ -280,21 +280,21 @@ static void prefs_filtering_create(void)
        reg_btn = gtk_button_new_with_label (_("Add"));
        gtk_widget_show (reg_btn);
        gtk_box_pack_start (GTK_BOX (btn_hbox), reg_btn, FALSE, TRUE, 0);
-       gtk_signal_connect (GTK_OBJECT (reg_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_filtering_register_cb), NULL);
+       g_signal_connect(G_OBJECT (reg_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_register_cb), NULL);
 
        subst_btn = gtk_button_new_with_label (_("  Replace  "));
        gtk_widget_show (subst_btn);
        gtk_box_pack_start (GTK_BOX (btn_hbox), subst_btn, FALSE, TRUE, 0);
-       gtk_signal_connect (GTK_OBJECT (subst_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_filtering_substitute_cb),
-                           NULL);
+       g_signal_connect(G_OBJECT (subst_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_substitute_cb),
+                        NULL);
 
        del_btn = gtk_button_new_with_label (_("Delete"));
        gtk_widget_show (del_btn);
        gtk_box_pack_start (GTK_BOX (btn_hbox), del_btn, FALSE, TRUE, 0);
-       gtk_signal_connect (GTK_OBJECT (del_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_filtering_delete_cb), NULL);
+       g_signal_connect(G_OBJECT (del_btn), "clicked",
+                       G_CALLBACK(prefs_filtering_delete_cb), NULL);
 
        cond_hbox = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (cond_hbox);
@@ -318,8 +318,8 @@ static void prefs_filtering_create(void)
                                      GTK_SELECTION_BROWSE);
        GTK_WIDGET_UNSET_FLAGS (GTK_CLIST (cond_clist)->column[0].button,
                                GTK_CAN_FOCUS);
-       gtk_signal_connect (GTK_OBJECT (cond_clist), "select_row",
-                           GTK_SIGNAL_FUNC (prefs_filtering_select), NULL);
+       g_signal_connect(G_OBJECT (cond_clist), "select_row",
+                        G_CALLBACK(prefs_filtering_select), NULL);
 
        btn_vbox = gtk_vbox_new (FALSE, 8);
        gtk_widget_show (btn_vbox);
@@ -328,30 +328,30 @@ static void prefs_filtering_create(void)
        top_btn = gtk_button_new_with_label (_("Top"));
        gtk_widget_show (top_btn);
        gtk_box_pack_start (GTK_BOX (btn_vbox), top_btn, FALSE, FALSE, 0);
-       gtk_signal_connect (GTK_OBJECT (top_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_filtering_top), NULL);
+       g_signal_connect(G_OBJECT (top_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_top), NULL);
 
        PACK_VSPACER (btn_vbox, spc_vbox, VSPACING_NARROW_2);
 
        up_btn = gtk_button_new_with_label (_("Up"));
        gtk_widget_show (up_btn);
        gtk_box_pack_start (GTK_BOX (btn_vbox), up_btn, FALSE, FALSE, 0);
-       gtk_signal_connect (GTK_OBJECT (up_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_filtering_up), NULL);
+       g_signal_connect(G_OBJECT (up_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_up), NULL);
 
        down_btn = gtk_button_new_with_label (_("Down"));
        gtk_widget_show (down_btn);
        gtk_box_pack_start (GTK_BOX (btn_vbox), down_btn, FALSE, FALSE, 0);
-       gtk_signal_connect (GTK_OBJECT (down_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_filtering_down), NULL);
+       g_signal_connect(G_OBJECT (down_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_down), NULL);
 
        PACK_VSPACER (btn_vbox, spc_vbox, VSPACING_NARROW_2);
 
        bottom_btn = gtk_button_new_with_label (_("Bottom"));
        gtk_widget_show (bottom_btn);
        gtk_box_pack_start (GTK_BOX (btn_vbox), bottom_btn, FALSE, FALSE, 0);
-       gtk_signal_connect (GTK_OBJECT (bottom_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_filtering_bottom), NULL);
+       g_signal_connect(G_OBJECT (bottom_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_bottom), NULL);
 
        gtk_widget_set_usize(window, 500, -1);
 
index 95daf64..df84717 100644 (file)
@@ -283,15 +283,15 @@ static void prefs_filtering_action_create(void)
 
        gtk_window_set_title(GTK_WINDOW(window),
                             _("Filtering action configuration"));
-       gtk_signal_connect(GTK_OBJECT(window), "delete_event",
-                          GTK_SIGNAL_FUNC(prefs_filtering_action_deleted), NULL);
-       gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
-                          GTK_SIGNAL_FUNC(prefs_filtering_action_key_pressed), NULL);
+       g_signal_connect(G_OBJECT(window), "delete_event",
+                        G_CALLBACK(prefs_filtering_action_deleted), NULL);
+       g_signal_connect(G_OBJECT(window), "key_press_event",
+                        G_CALLBACK(prefs_filtering_action_key_pressed), NULL);
        MANAGE_WINDOW_SIGNALS_CONNECT(window);
-       gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_filtering_action_ok), NULL);
-       gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_filtering_action_cancel), NULL);
+       g_signal_connect(G_OBJECT(ok_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_action_ok), NULL);
+       g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_action_cancel), NULL);
 
        vbox1 = gtk_vbox_new(FALSE, VSPACING);
        gtk_widget_show(vbox1);
@@ -326,13 +326,13 @@ static void prefs_filtering_action_create(void)
        gtk_box_pack_start (GTK_BOX (hbox1), action_combo,
                            TRUE, TRUE, 0);
        action_type_list = GTK_COMBO(action_combo)->list;
-       gtk_signal_connect (GTK_OBJECT (action_type_list), "select-child",
-                           GTK_SIGNAL_FUNC (prefs_filtering_action_type_select),
-                           NULL);
+       g_signal_connect (G_OBJECT(action_type_list), "select-child",
+                         G_CALLBACK(prefs_filtering_action_type_select),
+                         NULL);
 
-       gtk_signal_connect(GTK_OBJECT(action_type_list), "selection-changed",
-                          GTK_SIGNAL_FUNC(prefs_filtering_action_type_selection_changed),
-                          NULL);
+       g_signal_connect(G_OBJECT(action_type_list), "selection-changed",
+                        G_CALLBACK(prefs_filtering_action_type_selection_changed),
+                        NULL);
 
        /* accounts */
 
@@ -420,16 +420,16 @@ static void prefs_filtering_action_create(void)
        dest_btn = gtk_button_new_with_label (_("Select ..."));
        gtk_widget_show (dest_btn);
        gtk_box_pack_start (GTK_BOX (hbox1), dest_btn, FALSE, FALSE, 0);
-       gtk_signal_connect (GTK_OBJECT (dest_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_filtering_action_select_dest),
-                           NULL);
+       g_signal_connect (G_OBJECT (dest_btn), "clicked",
+                         G_CALLBACK(prefs_filtering_action_select_dest),
+                         NULL);
 
        exec_btn = gtk_button_new_with_label (_("Info ..."));
        gtk_widget_show (exec_btn);
        gtk_box_pack_start (GTK_BOX (hbox1), exec_btn, FALSE, FALSE, 0);
-       gtk_signal_connect (GTK_OBJECT (exec_btn), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_filtering_action_exec_info),
-                           NULL);
+       g_signal_connect (G_OBJECT (exec_btn), "clicked",
+                         G_CALLBACK(prefs_filtering_action_exec_info),
+                         NULL);
 
        /* register / substitute / delete */
 
@@ -449,21 +449,21 @@ static void prefs_filtering_action_create(void)
        reg_btn = gtk_button_new_with_label(_("Add"));
        gtk_widget_show(reg_btn);
        gtk_box_pack_start(GTK_BOX(btn_hbox), reg_btn, FALSE, TRUE, 0);
-       gtk_signal_connect(GTK_OBJECT(reg_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_filtering_action_register_cb), NULL);
+       g_signal_connect(G_OBJECT(reg_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_action_register_cb), NULL);
 
        subst_btn = gtk_button_new_with_label(_("  Replace  "));
        gtk_widget_show(subst_btn);
        gtk_box_pack_start(GTK_BOX(btn_hbox), subst_btn, FALSE, TRUE, 0);
-       gtk_signal_connect(GTK_OBJECT(subst_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_filtering_action_substitute_cb),
-                          NULL);
+       g_signal_connect(G_OBJECT(subst_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_action_substitute_cb),
+                        NULL);
 
        del_btn = gtk_button_new_with_label(_("Delete"));
        gtk_widget_show(del_btn);
        gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
-       gtk_signal_connect(GTK_OBJECT(del_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_filtering_action_delete_cb), NULL);
+       g_signal_connect(G_OBJECT(del_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_action_delete_cb), NULL);
 
        action_hbox = gtk_hbox_new(FALSE, 8);
        gtk_widget_show(action_hbox);
@@ -487,8 +487,8 @@ static void prefs_filtering_action_create(void)
                                     GTK_SELECTION_BROWSE);
        GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(action_clist)->column[0].button,
                               GTK_CAN_FOCUS);
-       gtk_signal_connect(GTK_OBJECT(action_clist), "select_row",
-                          GTK_SIGNAL_FUNC(prefs_filtering_action_select), NULL);
+       g_signal_connect(G_OBJECT(action_clist), "select_row",
+                        G_CALLBACK(prefs_filtering_action_select), NULL);
 
        btn_vbox = gtk_vbox_new(FALSE, 8);
        gtk_widget_show(btn_vbox);
@@ -497,14 +497,14 @@ static void prefs_filtering_action_create(void)
        up_btn = gtk_button_new_with_label(_("Up"));
        gtk_widget_show(up_btn);
        gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, FALSE, 0);
-       gtk_signal_connect(GTK_OBJECT(up_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_filtering_action_up), NULL);
+       g_signal_connect(G_OBJECT(up_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_action_up), NULL);
 
        down_btn = gtk_button_new_with_label(_("Down"));
        gtk_widget_show(down_btn);
        gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, FALSE, 0);
-       gtk_signal_connect(GTK_OBJECT(down_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_filtering_action_down), NULL);
+       g_signal_connect(G_OBJECT(down_btn), "clicked",
+                        G_CALLBACK(prefs_filtering_action_down), NULL);
 
        gtk_widget_show_all(window);
 
index b9cd6f9..7947f2a 100644 (file)
@@ -73,28 +73,27 @@ static void prefs_font_select(GtkButton *button, GtkEntry *entry)
                        (_("Font selection"));
                gtk_window_position(GTK_WINDOW(font_sel_win),
                                    GTK_WIN_POS_CENTER);
-               gtk_signal_connect(GTK_OBJECT(font_sel_win), "delete_event",
-                                  GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete),
-                                  NULL);
-               gtk_signal_connect
-                       (GTK_OBJECT(font_sel_win), "key_press_event",
-                        GTK_SIGNAL_FUNC(prefs_font_selection_key_pressed),
-                        NULL);
-               gtk_signal_connect_object
-                       (GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->cancel_button),
+               g_signal_connect(G_OBJECT(font_sel_win), "delete_event",
+                                G_CALLBACK(gtk_widget_hide_on_delete),
+                                NULL);
+               g_signal_connect(G_OBJECT(font_sel_win), "key_press_event",
+                                G_CALLBACK(prefs_font_selection_key_pressed),
+                                NULL);
+               g_signal_connect_swapped
+                       (G_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->cancel_button),
                         "clicked",
-                        GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete),
-                        GTK_OBJECT(font_sel_win));
+                        G_CALLBACK(gtk_widget_hide_on_delete),
+                        G_OBJECT(font_sel_win));
        }
 
        if(font_sel_conn_id) {
-               gtk_signal_disconnect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->ok_button), font_sel_conn_id);
+               g_signal_handler_disconnect
+                       (G_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->ok_button), 
+                        font_sel_conn_id);
        }
-       font_sel_conn_id = gtk_signal_connect
-               (GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->ok_button),
-                "clicked",
-                GTK_SIGNAL_FUNC(prefs_font_selection_ok),
-                entry);
+       font_sel_conn_id = g_signal_connect
+               (G_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->ok_button),
+                "clicked", G_CALLBACK(prefs_font_selection_ok), entry);
 
        font_name = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
        gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(font_sel_win), font_name);
@@ -169,8 +168,8 @@ void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (tmpbutton);
        gtk_table_attach (GTK_TABLE (table), tmpbutton, 2, 3, 0, 1,
                          0, 0, 0, 0);
-       gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",
-                               GTK_SIGNAL_FUNC(prefs_font_select), entry_folderviewfont);
+       g_signal_connect(G_OBJECT(tmpbutton), "clicked",
+                        G_CALLBACK(prefs_font_select), entry_folderviewfont);
 
        tmplabel = gtk_label_new (_("Message List"));
        gtk_widget_show (tmplabel);
@@ -191,8 +190,8 @@ void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (tmpbutton);
        gtk_table_attach (GTK_TABLE (table), tmpbutton, 2, 3, 1, 2,
                          0, 0, 0, 0);
-       gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",
-                           GTK_SIGNAL_FUNC(prefs_font_select), entry_summaryviewfont);
+       g_signal_connect(G_OBJECT(tmpbutton), "clicked",
+                        G_CALLBACK(prefs_font_select), entry_summaryviewfont);
 
        tmplabel = gtk_label_new (_("Message"));
        gtk_widget_show (tmplabel);
@@ -213,8 +212,8 @@ void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (tmpbutton);
        gtk_table_attach (GTK_TABLE (table), tmpbutton, 2, 3, 2, 3,
                          0, 0, 0, 0);
-       gtk_signal_connect (GTK_OBJECT (tmpbutton), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_font_select), entry_messageviewfont);
+       g_signal_connect(G_OBJECT(tmpbutton), "clicked",
+                        G_CALLBACK(prefs_font_select), entry_messageviewfont);
 
        tmplabel = gtk_label_new (_("Bold"));
        gtk_widget_show (tmplabel);
@@ -235,8 +234,8 @@ void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (tmpbutton);
        gtk_table_attach (GTK_TABLE (table), tmpbutton, 2, 3, 3, 4,
                          0, 0, 0, 0);
-       gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",
-                               GTK_SIGNAL_FUNC(prefs_font_select), entry_boldfont);
+       g_signal_connect(G_OBJECT(tmpbutton), "clicked",
+                        G_CALLBACK(prefs_font_select), entry_boldfont);
 
        vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
        gtk_widget_show(vbox);
index ca0f0f5..675c693 100644 (file)
@@ -129,8 +129,8 @@ struct _PrefsDialog
 #define SET_TOGGLE_SENSITIVITY(togglewid, targetwid) \
 { \
        gtk_widget_set_sensitive(targetwid, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(togglewid))); \
-       gtk_signal_connect(GTK_OBJECT(togglewid), "toggled", \
-                          GTK_SIGNAL_FUNC(prefs_button_toggled), targetwid); \
+       g_signal_connect(G_OBJECT(togglewid), "toggled", \
+                        G_CALLBACK(prefs_button_toggled), targetwid); \
 }
 
 void prefs_read_config         (PrefParam      *param,
index e67b7ee..cb61b9e 100644 (file)
@@ -375,15 +375,15 @@ static void prefs_matcher_create(void)
 
        gtk_window_set_title(GTK_WINDOW(window),
                             _("Condition configuration"));
-       gtk_signal_connect(GTK_OBJECT(window), "delete_event",
-                          GTK_SIGNAL_FUNC(prefs_matcher_deleted), NULL);
-       gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
-                          GTK_SIGNAL_FUNC(prefs_matcher_key_pressed), NULL);
+       g_signal_connect(G_OBJECT(window), "delete_event",
+                        G_CALLBACK(prefs_matcher_deleted), NULL);
+       g_signal_connect(G_OBJECT(window), "key_press_event",
+                        G_CALLBACK(prefs_matcher_key_pressed), NULL);
        MANAGE_WINDOW_SIGNALS_CONNECT(window);
-       gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_matcher_ok), NULL);
-       gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_matcher_cancel), NULL);
+       g_signal_connect(G_OBJECT(ok_btn), "clicked",
+                        G_CALLBACK(prefs_matcher_ok), NULL);
+       g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+                        G_CALLBACK(prefs_matcher_cancel), NULL);
 
        vbox1 = gtk_vbox_new(FALSE, VSPACING);
        gtk_widget_show(vbox1);
@@ -422,9 +422,9 @@ static void prefs_matcher_create(void)
        gtk_table_attach(GTK_TABLE(criteria_table), criteria_combo, 0, 1, 1, 2,
                          0, 0, 0, 0);
        criteria_list = GTK_COMBO(criteria_combo)->list;
-       gtk_signal_connect(GTK_OBJECT(criteria_list), "select-child",
-                          GTK_SIGNAL_FUNC(prefs_matcher_criteria_select),
-                          NULL);
+       g_signal_connect(G_OBJECT(criteria_list), "select-child",
+                        G_CALLBACK(prefs_matcher_criteria_select),
+                        NULL);
 
        gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(criteria_combo)->entry),
                               FALSE);
@@ -468,9 +468,9 @@ static void prefs_matcher_create(void)
        gtk_widget_show(test_btn);
        gtk_table_attach(GTK_TABLE (criteria_table), test_btn, 3, 4, 1, 2,
                         GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0, 0);
-       gtk_signal_connect(GTK_OBJECT (test_btn), "clicked",
-                          GTK_SIGNAL_FUNC (prefs_matcher_test_info),
-                          NULL);
+       g_signal_connect(G_OBJECT (test_btn), "clicked",
+                        G_CALLBACK(prefs_matcher_test_info),
+                        NULL);
 
        color_optmenu = gtk_option_menu_new();
        gtk_option_menu_set_menu(GTK_OPTION_MENU(color_optmenu),
@@ -557,21 +557,21 @@ static void prefs_matcher_create(void)
        reg_btn = gtk_button_new_with_label(_("Add"));
        gtk_widget_show(reg_btn);
        gtk_box_pack_start(GTK_BOX(btn_hbox), reg_btn, FALSE, TRUE, 0);
-       gtk_signal_connect(GTK_OBJECT(reg_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_matcher_register_cb), NULL);
+       g_signal_connect(G_OBJECT(reg_btn), "clicked",
+                        G_CALLBACK(prefs_matcher_register_cb), NULL);
 
        subst_btn = gtk_button_new_with_label(_("  Replace  "));
        gtk_widget_show(subst_btn);
        gtk_box_pack_start(GTK_BOX(btn_hbox), subst_btn, FALSE, TRUE, 0);
-       gtk_signal_connect(GTK_OBJECT(subst_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_matcher_substitute_cb),
-                          NULL);
+       g_signal_connect(G_OBJECT(subst_btn), "clicked",
+                        G_CALLBACK(prefs_matcher_substitute_cb),
+                        NULL);
 
        del_btn = gtk_button_new_with_label(_("Delete"));
        gtk_widget_show(del_btn);
        gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
-       gtk_signal_connect(GTK_OBJECT(del_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_matcher_delete_cb), NULL);
+       g_signal_connect(G_OBJECT(del_btn), "clicked",
+                        G_CALLBACK(prefs_matcher_delete_cb), NULL);
 
        /* boolean operation */
 
@@ -623,8 +623,8 @@ static void prefs_matcher_create(void)
                                     GTK_SELECTION_BROWSE);
        GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(cond_clist)->column[0].button,
                               GTK_CAN_FOCUS);
-       gtk_signal_connect(GTK_OBJECT(cond_clist), "select_row",
-                          GTK_SIGNAL_FUNC(prefs_matcher_select), NULL);
+       g_signal_connect(G_OBJECT(cond_clist), "select_row",
+                        G_CALLBACK(prefs_matcher_select), NULL);
 
        btn_vbox = gtk_vbox_new(FALSE, 8);
        gtk_widget_show(btn_vbox);
@@ -633,14 +633,14 @@ static void prefs_matcher_create(void)
        up_btn = gtk_button_new_with_label(_("Up"));
        gtk_widget_show(up_btn);
        gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, FALSE, 0);
-       gtk_signal_connect(GTK_OBJECT(up_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_matcher_up), NULL);
+       g_signal_connect(G_OBJECT(up_btn), "clicked",
+                        G_CALLBACK(prefs_matcher_up), NULL);
 
        down_btn = gtk_button_new_with_label(_("Down"));
        gtk_widget_show(down_btn);
        gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, FALSE, 0);
-       gtk_signal_connect(GTK_OBJECT(down_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_matcher_down), NULL);
+       g_signal_connect(G_OBJECT(down_btn), "clicked",
+                        G_CALLBACK(prefs_matcher_down), NULL);
 
        gtk_widget_show_all(window);
 
index 6198e14..0e3607a 100644 (file)
@@ -269,14 +269,14 @@ void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gpointer
        gtk_entry_set_text(GTK_ENTRY(entry_aspell_path), 
                           SAFE_STRING(prefs_common.aspell_path));
 
-       gtk_signal_connect(GTK_OBJECT(checkbtn_enable_aspell), "toggled",
-                          GTK_SIGNAL_FUNC(prefs_spelling_checkbtn_enable_aspell_toggle_cb),
-                          prefs_spelling);
-       gtk_signal_connect(GTK_OBJECT(btn_aspell_path), "clicked", 
-                          GTK_SIGNAL_FUNC(prefs_spelling_btn_aspell_path_clicked_cb),
-                          prefs_spelling);
-       gtk_signal_connect(GTK_OBJECT(misspelled_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_spelling_colorsel), prefs_spelling);
+       g_signal_connect(G_OBJECT(checkbtn_enable_aspell), "toggled",
+                        G_CALLBACK(prefs_spelling_checkbtn_enable_aspell_toggle_cb),
+                        prefs_spelling);
+       g_signal_connect(G_OBJECT(btn_aspell_path), "clicked", 
+                        G_CALLBACK(prefs_spelling_btn_aspell_path_clicked_cb),
+                        prefs_spelling);
+       g_signal_connect(G_OBJECT(misspelled_btn), "clicked",
+                        G_CALLBACK(prefs_spelling_colorsel), prefs_spelling);
 
        gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu_dictionary),
                                 gtkaspell_dictionary_option_menu_new(prefs_common.aspell_path));
index 0350ac4..d2a7e1b 100644 (file)
@@ -275,9 +275,9 @@ static void prefs_themes_set_themes_menu(GtkOptionMenu *opmenu, const ThemesData
                
                item = gtk_menu_item_new_with_label(tname->name);
                gtk_widget_show(item);
-               gtk_signal_connect(GTK_OBJECT(item), "activate",
-                                  GTK_SIGNAL_FUNC(prefs_themes_menu_item_activated_cb),
-                                  tname->item->data);
+               g_signal_connect(G_OBJECT(item), "activate",
+                                G_CALLBACK(prefs_themes_menu_item_activated_cb),
+                                tname->item->data);
                gtk_menu_append(GTK_MENU(menu), item);
 
                if (tdata->displayed != NULL && tdata->displayed == tpath)
@@ -991,18 +991,18 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
        gtk_container_add (GTK_CONTAINER (hbuttonbox1), btn_remove);
        GTK_WIDGET_SET_FLAGS (btn_remove, GTK_CAN_DEFAULT);
 
-       gtk_signal_connect(GTK_OBJECT (btn_use), "clicked",
-                       GTK_SIGNAL_FUNC (prefs_themes_btn_use_clicked_cb),
-                       NULL);
-       gtk_signal_connect(GTK_OBJECT(btn_remove), "clicked",
-                       GTK_SIGNAL_FUNC(prefs_themes_btn_remove_clicked_cb),
-                       NULL);
-       gtk_signal_connect(GTK_OBJECT(btn_install), "clicked",
-                       GTK_SIGNAL_FUNC(prefs_themes_btn_install_clicked_cb),
-                       NULL);
-       gtk_signal_connect(GTK_OBJECT(btn_more), "clicked",
-                       GTK_SIGNAL_FUNC(prefs_themes_btn_more_clicked_cb),
-                       NULL);
+       g_signal_connect(G_OBJECT(btn_use), "clicked",
+                        G_CALLBACK(prefs_themes_btn_use_clicked_cb),
+                        NULL);
+       g_signal_connect(G_OBJECT(btn_remove), "clicked",
+                        G_CALLBACK(prefs_themes_btn_remove_clicked_cb),
+                        NULL);
+       g_signal_connect(G_OBJECT(btn_install), "clicked",
+                        G_CALLBACK(prefs_themes_btn_install_clicked_cb),
+                        NULL);
+       g_signal_connect(G_OBJECT(btn_more), "clicked",
+                        G_CALLBACK(prefs_themes_btn_more_clicked_cb),
+                        NULL);
 
        gtk_widget_grab_default (btn_use);
        /* END GLADE EDITED CODE */
index f0601de..b89824e 100644 (file)
@@ -768,27 +768,27 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
 
        reg_btn = gtk_button_new_with_label(_("Add"));
        gtk_box_pack_start(GTK_BOX(btn_hbox), reg_btn, FALSE, TRUE, 0);
-       gtk_signal_connect(GTK_OBJECT(reg_btn), "clicked",
-                           GTK_SIGNAL_FUNC(prefs_toolbar_register), 
-                           prefs_toolbar);
+       g_signal_connect(G_OBJECT(reg_btn), "clicked",
+                        G_CALLBACK(prefs_toolbar_register), 
+                        prefs_toolbar);
 
        subst_btn = gtk_button_new_with_label(_("  Replace  "));
        gtk_box_pack_start(GTK_BOX(btn_hbox), subst_btn, FALSE, TRUE, 0);
-       gtk_signal_connect(GTK_OBJECT(subst_btn), "clicked",
-                           GTK_SIGNAL_FUNC(prefs_toolbar_substitute),
-                           prefs_toolbar);
+       g_signal_connect(G_OBJECT(subst_btn), "clicked",
+                        G_CALLBACK(prefs_toolbar_substitute),
+                        prefs_toolbar);
 
        del_btn = gtk_button_new_with_label(_("Delete"));
        gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
-       gtk_signal_connect(GTK_OBJECT(del_btn), "clicked",
-                           GTK_SIGNAL_FUNC(prefs_toolbar_delete), 
-                           prefs_toolbar);
+       g_signal_connect(G_OBJECT(del_btn), "clicked",
+                        G_CALLBACK(prefs_toolbar_delete), 
+                         prefs_toolbar);
 
        default_btn = gtk_button_new_with_label(_(" Default "));
        gtk_box_pack_end(GTK_BOX(reg_hbox), default_btn, FALSE, TRUE, 0);
-       gtk_signal_connect(GTK_OBJECT(default_btn), "clicked",
-                           GTK_SIGNAL_FUNC(prefs_toolbar_default), 
-                           prefs_toolbar);
+       g_signal_connect(G_OBJECT(default_btn), "clicked",
+                        G_CALLBACK(prefs_toolbar_default), 
+                        prefs_toolbar);
 
        /* currently active toolbar items */
        frame_toolbar_items = gtk_frame_new(_("Displayed toolbar items"));
@@ -831,19 +831,19 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
        gtk_widget_show(down_btn);
        gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, FALSE, 0);
 
-       gtk_signal_connect(GTK_OBJECT(clist_set), "select_row",
-                          GTK_SIGNAL_FUNC(prefs_toolbar_select_row_set),
-                          prefs_toolbar);
-       gtk_signal_connect(GTK_OBJECT(clist_icons), "select_row",
-                          GTK_SIGNAL_FUNC(prefs_toolbar_select_row_icons),
-                          prefs_toolbar);
-       gtk_signal_connect(GTK_OBJECT(combo_list), "selection-changed",
-                          GTK_SIGNAL_FUNC(prefs_toolbar_selection_changed),
-                          prefs_toolbar);
-       gtk_signal_connect(GTK_OBJECT(up_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_toolbar_up), prefs_toolbar);
-       gtk_signal_connect(GTK_OBJECT(down_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_toolbar_down), prefs_toolbar);
+       g_signal_connect(G_OBJECT(clist_set), "select_row",
+                        G_CALLBACK(prefs_toolbar_select_row_set),
+                        prefs_toolbar);
+       g_signal_connect(G_OBJECT(clist_icons), "select_row",
+                        G_CALLBACK(prefs_toolbar_select_row_icons),
+                        prefs_toolbar);
+       g_signal_connect(G_OBJECT(combo_list), "selection-changed",
+                        G_CALLBACK(prefs_toolbar_selection_changed),
+                        prefs_toolbar);
+       g_signal_connect(G_OBJECT(up_btn), "clicked",
+                        G_CALLBACK(prefs_toolbar_up), prefs_toolbar);
+       g_signal_connect(G_OBJECT(down_btn), "clicked",
+                        G_CALLBACK(prefs_toolbar_down), prefs_toolbar);
        
        gtk_widget_show_all(main_vbox);
 
index ee8f2c9..0d09c84 100644 (file)
@@ -324,8 +324,8 @@ create_dialog (struct select_keys_s *sk)
     gtk_widget_show (showall_btn);
     gtk_box_pack_start (GTK_BOX (hbox), showall_btn, FALSE, FALSE, 0);
 
-    gtk_signal_connect (GTK_OBJECT (showall_btn), "clicked",
-                        GTK_SIGNAL_FUNC (showall_btn_cb), sk);
+    g_signal_connect(G_OBJECT (showall_btn), "clicked",
+                     G_CALLBACK(showall_btn_cb), sk);
 
     gtkut_button_set_create (&bbox, 
                              &select_btn, _("Select"),
index 0327d37..8b67811 100644 (file)
@@ -532,10 +532,10 @@ static SendProgressDialog *send_progress_dialog_create(void)
        progress = progress_dialog_create();
        gtk_window_set_title(GTK_WINDOW(progress->window),
                             _("Sending message"));
-       gtk_signal_connect(GTK_OBJECT(progress->cancel_btn), "clicked",
-                          GTK_SIGNAL_FUNC(send_cancel_button_cb), dialog);
-       gtk_signal_connect(GTK_OBJECT(progress->window), "delete_event",
-                          GTK_SIGNAL_FUNC(gtk_true), NULL);
+       g_signal_connect(G_OBJECT(progress->cancel_btn), "clicked",
+                        G_CALLBACK(send_cancel_button_cb), dialog);
+       g_signal_connect(G_OBJECT(progress->window), "delete_event",
+                        G_CALLBACK(gtk_true), NULL);
        gtk_window_set_modal(GTK_WINDOW(progress->window), TRUE);
        manage_window_set_transient(GTK_WINDOW(progress->window));
 
index 09d6942..3c506ab 100644 (file)
@@ -83,21 +83,21 @@ void ssl_manager_create(void)
        gtk_container_set_border_width (GTK_CONTAINER (window), 8);
        gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
        gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, FALSE);
-       gtk_signal_connect (GTK_OBJECT(window), "delete_event",
-                           GTK_SIGNAL_FUNC(ssl_manager_ok_cb), NULL);
+       g_signal_connect(G_OBJECT(window), "delete_event",
+                        G_CALLBACK(ssl_manager_ok_cb), NULL);
        MANAGE_WINDOW_SIGNALS_CONNECT (window);
        
        hbox1 = gtk_hbox_new(FALSE,2);
        vbox1 = gtk_vbox_new(FALSE,0);
        delete_btn = gtk_button_new_with_label(_("Delete"));
-       gtk_signal_connect (GTK_OBJECT(delete_btn), "clicked",
-                           GTK_SIGNAL_FUNC(ssl_manager_delete_cb), NULL);
+       g_signal_connect(G_OBJECT(delete_btn), "clicked",
+                        G_CALLBACK(ssl_manager_delete_cb), NULL);
        view_btn = gtk_button_new_with_label(_("View"));
-       gtk_signal_connect (GTK_OBJECT(view_btn), "clicked",
-                           GTK_SIGNAL_FUNC(ssl_manager_view_cb), NULL);
+       g_signal_connect(G_OBJECT(view_btn), "clicked",
+                        G_CALLBACK(ssl_manager_view_cb), NULL);
        ok_btn = gtk_button_new_with_label(_("OK"));
-       gtk_signal_connect (GTK_OBJECT(ok_btn), "clicked",
-                           GTK_SIGNAL_FUNC(ssl_manager_ok_cb), NULL);
+       g_signal_connect(G_OBJECT(ok_btn), "clicked",
+                        G_CALLBACK(ssl_manager_ok_cb), NULL);
        gtk_widget_set_usize(ok_btn, 80, -1);
        gtk_widget_set_usize(delete_btn, 80, -1);
        gtk_widget_set_usize(view_btn, 80, -1);
@@ -109,8 +109,8 @@ void ssl_manager_create(void)
        gtk_clist_set_column_width(GTK_CLIST(certlist), 0, 220);
        gtk_clist_set_selection_mode(GTK_CLIST(certlist), GTK_SELECTION_SINGLE);
        gtk_widget_set_usize(certlist, 300, 200);
-       gtk_signal_connect (GTK_OBJECT(certlist), "open_row",
-                           GTK_SIGNAL_FUNC(ssl_manager_view_cb), NULL);
+       g_signal_connect(G_OBJECT(certlist), "open_row",
+                        G_CALLBACK(ssl_manager_view_cb), NULL);
        gtk_box_pack_start(GTK_BOX(hbox1), certlist, TRUE, TRUE, 0);
        gtk_box_pack_start(GTK_BOX(hbox1), vbox1, TRUE, TRUE, 0);
        gtk_box_pack_start(GTK_BOX(vbox1), view_btn, FALSE, FALSE, 0);
index fead6aa..abbc1f0 100644 (file)
@@ -196,8 +196,8 @@ static void summary_search_create(SummaryView *summaryview)
        gtk_widget_show (all_checkbtn);
        gtk_box_pack_start (GTK_BOX (checkbtn_hbox), all_checkbtn,
                            FALSE, FALSE, 0);
-       gtk_signal_connect(GTK_OBJECT(all_checkbtn), "clicked",
-                          GTK_SIGNAL_FUNC(all_clicked), summaryview);
+       g_signal_connect(G_OBJECT(all_checkbtn), "clicked",
+                        G_CALLBACK(all_clicked), summaryview);
 
        and_checkbtn =
                gtk_check_button_new_with_label (_("AND search"));
index fbe6ab7..c7b64bd 100644 (file)
@@ -718,7 +718,7 @@ SummaryView *summary_create(void)
 
        /* CLAWS: need this to get the SummaryView * from
         * the CList */
-       gtk_object_set_data(GTK_OBJECT(ctree), "summaryview", (gpointer)summaryview); 
+       g_object_set_data(G_OBJECT(ctree), "summaryview", (gpointer)summaryview); 
 
        gtk_widget_show_all(vbox);
 
@@ -981,7 +981,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        summaryview->folder_item = item;
        item->opened = TRUE;
 
-       gtk_signal_handler_block_by_data(GTK_OBJECT(ctree), summaryview);
+       g_signal_handlers_unblock_matched(G_OBJECT(ctree), G_SIGNAL_MATCH_DATA,
+                                         0, 0, NULL, NULL, summaryview);
 
        buf = g_strdup_printf(_("Scanning folder (%s)..."), item->path);
        debug_print("%s\n", buf);
@@ -1025,7 +1026,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        if (strlen(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(summaryview->search_string)->entry))) > 0) {
                GSList *not_killed;
                gint search_type = GPOINTER_TO_INT(g_object_get_data(
-                                  GTK_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
+                                  G_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
                                   GTK_MENU(summaryview->search_type)))), MENU_VAL_ID));
                const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(summaryview->search_string)->entry));
                gchar *searched_header = NULL;
@@ -1128,7 +1129,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        if (summaryview->sort_key != SORT_BY_NONE)
                summary_sort(summaryview, summaryview->sort_key, summaryview->sort_type);
 
-       gtk_signal_handler_unblock_by_data(GTK_OBJECT(ctree), summaryview);
+       g_signal_handlers_unblock_matched(G_OBJECT(ctree), G_SIGNAL_MATCH_DATA,
+                                         0, 0, NULL, NULL, summaryview);
 
        gtk_clist_thaw(GTK_CLIST(ctree));
 
@@ -1482,7 +1484,7 @@ void summary_select_next_unread(SummaryView *summaryview)
                        }
 
                        if (val == G_ALERTDEFAULT) {
-                               gtk_signal_emit_stop_by_name(GTK_OBJECT(ctree),
+                               g_signal_stop_emission_by_name(G_OBJECT(ctree),
                                                         "key_press_event");
                                folderview_select_next_unread(summaryview->folderview);
                                return;
@@ -1534,15 +1536,8 @@ void summary_select_next_new(SummaryView *summaryview)
                                   "Go to next folder?"),
                                 _("Yes"), _("Search again"), _("No"));
                if (val == G_ALERTDEFAULT) {
-#warning FIXME_GTK2
-#if 0
-                       if (gtk_signal_n_emissions_by_name
-                               (GTK_OBJECT(ctree), "key_press_event") > 0)
-                                       gtk_signal_emit_stop_by_name
-                                               (GTK_OBJECT(ctree),
-                                                "key_press_event");
+                       g_signal_stop_emission_by_name(G_OBJECT(ctree),"key_press_event");
                        folderview_select_next_unread(summaryview->folderview);
-#endif
                        return;
                } else if (val == G_ALERTALTERNATE)
                        node = NULL;
@@ -4583,7 +4578,7 @@ static gboolean summary_searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
                                prefs_common.summary_quicksearch_history);                      
                }
                summary_show(summaryview, summaryview->folder_item);
-               gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "key_press_event");
+               g_signal_stop_emission_by_name(G_OBJECT(widget), "key_press_event");
                return TRUE;            
        }
        return FALSE;
@@ -4608,7 +4603,7 @@ static void summary_searchtype_changed(GtkMenuItem *widget, gpointer data)
 {
        SummaryView *sw = (SummaryView *)data;
        prefs_common.summary_quicksearch_type = GPOINTER_TO_INT(g_object_get_data(
-                                  GTK_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
+                                  G_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
                                   GTK_MENU(sw->search_type)))), MENU_VAL_ID));
 
        /* Show extended search description button, only when Extended is selected */
@@ -5008,7 +5003,7 @@ static gint summary_cmp_by_from(GtkCList *clist, gconstpointer ptr1,
        const gchar *str1, *str2;
        const GtkCListRow *r1 = (const GtkCListRow *) ptr1;
        const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
-       const SummaryView *sv = gtk_object_get_data(GTK_OBJECT(clist), "summaryview");
+       const SummaryView *sv = g_object_get_data(G_OBJECT(clist), "summaryview");
        
        g_return_val_if_fail(sv, -1);
        
@@ -5033,7 +5028,7 @@ static gint summary_cmp_by_simplified_subject
        const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
        const MsgInfo *msginfo1 = r1->data;
        const MsgInfo *msginfo2 = r2->data;
-       const SummaryView *sv = gtk_object_get_data(GTK_OBJECT(clist), "summaryview");
+       const SummaryView *sv = g_object_get_data(G_OBJECT(clist), "summaryview");
        
        g_return_val_if_fail(sv, -1);
        g_return_val_if_fail(msginfo1 != NULL && msginfo2 != NULL, -1);
@@ -5282,11 +5277,11 @@ static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
  
        widget = gtk_item_factory_get_item(gtk_item_factory_from_widget(summaryview->mainwin->menubar),
                                           "/View/Hide read messages");
-       gtk_object_set_data(GTK_OBJECT(widget), "dont_toggle",
-                           GINT_TO_POINTER(1));
+       g_object_set_data(G_OBJECT(widget), "dont_toggle",
+                         GINT_TO_POINTER(1));
        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widget), action);
-       gtk_object_set_data(GTK_OBJECT(widget), "dont_toggle",
-                           GINT_TO_POINTER(0));
+       g_object_set_data(G_OBJECT(widget), "dont_toggle",
+                         GINT_TO_POINTER(0));
 }
 
 void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
index d782354..3837c79 100644 (file)
@@ -1831,7 +1831,7 @@ static gboolean textview_smooth_scroll_page(TextView *textview, gboolean up)
 #if 0
 #define KEY_PRESS_EVENT_STOP() \
        if (gtk_signal_n_emissions_by_name \
-               (GTK_OBJECT(widget), "key_press_event") > 0) { \
+               (G_OBJECT(widget), "key_press_event") > 0) { \
                g_signal_stop_emission_by_name(G_OBJECT(widget), \
                                               "key_press_event"); \
        }