[Gnucash-changes] r12071 - gnucash/trunk - Syntactic sugar
converting from gtk_signal_xxx
David Hampton
hampton at cvs.gnucash.org
Tue Nov 29 23:05:54 EST 2005
Author: hampton
Date: 2005-11-29 23:05:31 -0500 (Tue, 29 Nov 2005)
New Revision: 12071
Trac: http://svn.gnucash.org/trac/changeset/12071
Modified:
gnucash/trunk/ChangeLog
gnucash/trunk/src/business/business-gnome/dialog-order.c
gnucash/trunk/src/gnome-search/dialog-search.c
gnucash/trunk/src/gnome-search/dialog-search.h
gnucash/trunk/src/gnome-search/gnc-general-search.c
gnucash/trunk/src/gnome-utils/dialog-transfer.c
gnucash/trunk/src/gnome-utils/dialog-transfer.h
gnucash/trunk/src/gnome-utils/dialog-utils.c
gnucash/trunk/src/gnome-utils/gnc-account-sel.c
gnucash/trunk/src/gnome-utils/gnc-amount-edit.c
gnucash/trunk/src/gnome-utils/gnc-date-delta.c
gnucash/trunk/src/gnome-utils/gnc-date-edit.c
gnucash/trunk/src/gnome-utils/gnc-date-format.c
gnucash/trunk/src/gnome-utils/gnc-dense-cal.c
gnucash/trunk/src/gnome-utils/gnc-frequency.c
gnucash/trunk/src/gnome-utils/gnc-general-select.c
gnucash/trunk/src/gnome-utils/gnc-gui-query.c
gnucash/trunk/src/gnome-utils/gnc-html.c
gnucash/trunk/src/gnome-utils/gnc-query-list.c
gnucash/trunk/src/gnome-utils/gnc-splash.c
gnucash/trunk/src/gnome/dialog-chart-export.c
gnucash/trunk/src/gnome/dialog-progress.c
gnucash/trunk/src/gnome/dialog-scheduledxaction.c
gnucash/trunk/src/gnome/dialog-sx-from-trans.c
gnucash/trunk/src/gnome/dialog-sxsincelast.c
gnucash/trunk/src/gnome/druid-acct-period.c
gnucash/trunk/src/gnome/druid-loan.c
gnucash/trunk/src/gnome/druid-merge.c
gnucash/trunk/src/gnome/druid-stock-split.c
gnucash/trunk/src/gnome/gnc-split-reg.c
gnucash/trunk/src/gnome/lot-viewer.c
gnucash/trunk/src/gnome/window-reconcile.c
gnucash/trunk/src/import-export/binary-import/druid-commodity.c
gnucash/trunk/src/import-export/hbci/dialog-daterange.c
gnucash/trunk/src/import-export/hbci/dialog-hbcitrans.c
gnucash/trunk/src/import-export/hbci/druid-hbci-initial.c
gnucash/trunk/src/import-export/hbci/hbci-interaction.c
gnucash/trunk/src/import-export/import-main-matcher.c
gnucash/trunk/src/import-export/import-match-picker.c
gnucash/trunk/src/import-export/qif-import/dialog-account-picker.c
gnucash/trunk/src/import-export/qif-import/druid-qif-import.c
gnucash/trunk/src/register/ledger-core/dialog-dup-trans.c
gnucash/trunk/src/register/register-gnome/datecell-gnome.c
gnucash/trunk/src/register/register-gnome/gnucash-date-picker.c
gnucash/trunk/src/register/register-gnome/gnucash-item-edit.c
gnucash/trunk/src/register/register-gnome/gnucash-sheet.c
gnucash/trunk/src/report/report-gnome/dialog-column-view.c
gnucash/trunk/src/report/report-gnome/dialog-style-sheet.c
gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c
Log:
Syntactic sugar converting from gtk_signal_xxx
functions to g_signal_yyy functions.
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/ChangeLog 2005-11-30 04:05:31 UTC (rev 12071)
@@ -1,5 +1,8 @@
2005-11-29 David Hampton <hampton at employees.org>
+ * various: Syntactic sugar converting from gtk_signal_xxx
+ functions to g_signal_yyy functions.
+
* src/gnome-utils/gnc-gnome-utils.c:
* src/gnome-utils/gnc-html-guppi.[ch]:
* src/gnome-utils/Makefile.am:
Modified: gnucash/trunk/src/business/business-gnome/dialog-order.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-order.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/business/business-gnome/dialog-order.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -432,9 +432,9 @@
break;
}
- gtk_signal_connect (GTK_OBJECT (ow->owner_choice), "changed",
- GTK_SIGNAL_FUNC (gnc_order_owner_changed_cb),
- ow);
+ g_signal_connect (ow->owner_choice, "changed",
+ G_CALLBACK (gnc_order_owner_changed_cb),
+ ow);
gtk_widget_show_all (ow->dialog);
Modified: gnucash/trunk/src/gnome/dialog-chart-export.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-chart-export.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome/dialog-chart-export.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -185,7 +185,7 @@
xml = gnc_glade_xml_new ("chart-export.glade", "chart-export");
data = g_new0(chart_data, 1);
glade_xml_signal_connect_data(xml, "on_dateok_clicked",
- GTK_SIGNAL_FUNC (on_dateok_clicked), data);
+ G_CALLBACK (on_dateok_clicked), data);
dialog = glade_xml_get_widget (xml, "chart-export");
return dialog;
}
Modified: gnucash/trunk/src/gnome/dialog-progress.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-progress.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome/dialog-progress.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -171,10 +171,10 @@
if (parent != NULL)
gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(parent));
- gtk_signal_connect (tdo, "delete_event",
- GTK_SIGNAL_FUNC (delete_cb), progress);
+ g_signal_connect (tdo, "delete_event",
+ G_CALLBACK (delete_cb), progress);
- gtk_signal_connect (tdo, "destroy", GTK_SIGNAL_FUNC (destroy_cb), progress);
+ g_signal_connect (tdo, "destroy", G_CALLBACK (destroy_cb), progress);
progress->heading_label = glade_xml_get_widget (xml, "heading_label");
gtk_widget_hide(progress->heading_label);
@@ -183,16 +183,16 @@
progress->ok_button = glade_xml_get_widget (xml, "ok_button");
- gtk_signal_connect(GTK_OBJECT(progress->ok_button), "clicked",
- GTK_SIGNAL_FUNC(ok_cb), progress);
+ g_signal_connect(progress->ok_button, "clicked",
+ G_CALLBACK(ok_cb), progress);
if (!progress->use_ok_button)
gtk_widget_hide (progress->ok_button);
progress->cancel_button = glade_xml_get_widget (xml, "cancel_button");
- gtk_signal_connect(GTK_OBJECT(progress->cancel_button), "clicked",
- GTK_SIGNAL_FUNC(cancel_cb), progress);
+ g_signal_connect(progress->cancel_button, "clicked",
+ G_CALLBACK(cancel_cb), progress);
progress->cancel_func = NULL;
progress->user_data = NULL;
Modified: gnucash/trunk/src/gnome/dialog-scheduledxaction.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-scheduledxaction.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome/dialog-scheduledxaction.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -1228,28 +1228,28 @@
gnc_dense_cal_set_num_months( sxd->gdcal, 12 );
gtk_container_add( GTK_CONTAINER(w), GTK_WIDGET(sxd->gdcal) );
- gtk_signal_connect( sxdo, "destroy",
- GTK_SIGNAL_FUNC(scheduledxaction_dialog_destroy),
- sxd );
+ g_signal_connect( sxdo, "destroy",
+ G_CALLBACK(scheduledxaction_dialog_destroy),
+ sxd );
button = glade_xml_get_widget( sxd->gxml, "new_button" );
- gtk_signal_connect( GTK_OBJECT(button), "clicked",
- GTK_SIGNAL_FUNC(new_button_clicked), sxd );
+ g_signal_connect( button, "clicked",
+ G_CALLBACK(new_button_clicked), sxd );
button = glade_xml_get_widget( sxd->gxml, "edit_button" );
- gtk_signal_connect( GTK_OBJECT(button), "clicked",
- GTK_SIGNAL_FUNC(edit_button_clicked), sxd );
+ g_signal_connect( button, "clicked",
+ G_CALLBACK(edit_button_clicked), sxd );
button = glade_xml_get_widget( sxd->gxml, "delete_button" );
- gtk_signal_connect( GTK_OBJECT(button), "clicked",
- GTK_SIGNAL_FUNC(delete_button_clicked), sxd );
+ g_signal_connect( button, "clicked",
+ G_CALLBACK(delete_button_clicked), sxd );
button = glade_xml_get_widget( sxd->gxml, "close_button" );
- gtk_signal_connect( GTK_OBJECT(button), "clicked",
- GTK_SIGNAL_FUNC(close_button_clicked), sxd );
+ g_signal_connect( button, "clicked",
+ G_CALLBACK(close_button_clicked), sxd );
w = glade_xml_get_widget( sxd->gxml, SX_LIST );
- gtk_signal_connect(GTK_OBJECT(w), "select-row",
- GTK_SIGNAL_FUNC(row_select_handler), sxd );
- gtk_signal_connect( GTK_OBJECT(w), "click-column",
- GTK_SIGNAL_FUNC(gnc_sxd_row_click_handler), sxd );
+ g_signal_connect( w, "select-row",
+ G_CALLBACK(row_select_handler), sxd );
+ g_signal_connect( w, "click-column",
+ G_CALLBACK(gnc_sxd_row_click_handler), sxd );
// gtk_clist_column_titles_active( GTK_CLIST( w ) );
@@ -1452,10 +1452,10 @@
sxed->endDateEntry =
GNC_DATE_EDIT(gnc_date_edit_new( time(NULL),
FALSE, FALSE ));
- gtk_signal_connect( GTK_OBJECT(sxed->endDateEntry),
- "date-changed",
- GTK_SIGNAL_FUNC( sxed_excal_update_adapt ),
- sxed );
+ g_signal_connect( sxed->endDateEntry,
+ "date-changed",
+ G_CALLBACK( sxed_excal_update_adapt ),
+ sxed );
gtk_box_pack_start( GTK_BOX(endDateBox),
GTK_WIDGET(sxed->endDateEntry),
TRUE, TRUE, 0 );
@@ -1472,11 +1472,11 @@
close handler */
sxed );
- gtk_signal_connect( GTK_OBJECT(sxed->dialog), "close",
- GTK_SIGNAL_FUNC(sxed_close_event), sxed );
- gtk_signal_connect( GTK_OBJECT(sxed->dialog), "destroy",
- GTK_SIGNAL_FUNC(scheduledxaction_editor_dialog_destroy),
- sxed );
+ g_signal_connect( sxed->dialog, "close",
+ G_CALLBACK(sxed_close_event), sxed );
+ g_signal_connect( sxed->dialog, "destroy",
+ G_CALLBACK(scheduledxaction_editor_dialog_destroy),
+ sxed );
for ( i=0; widgets[i].name != NULL; i++ ) {
button = glade_xml_get_widget( sxed->gxml, widgets[i].name );
@@ -1485,9 +1485,8 @@
"whichOneAmI",
widgets[i].objectData );
}
- gtk_signal_connect( GTK_OBJECT(button),
- widgets[i].signal,
- GTK_SIGNAL_FUNC( widgets[i].fn ), sxed );
+ g_signal_connect( button, widgets[i].signal,
+ G_CALLBACK( widgets[i].fn ), sxed );
}
/* For some reason the Glade-specified sensitivity settings are not
@@ -1545,9 +1544,9 @@
GNC_FREQUENCY( gnc_frequency_new( xaccSchedXactionGetFreqSpec(sxed->sx),
xaccSchedXactionGetStartDate(sxed->sx) ) );
g_assert( sxed->gncfreq );
- gtk_signal_connect( GTK_OBJECT(sxed->gncfreq), "changed",
- GTK_SIGNAL_FUNC(gnc_sxed_freq_changed),
- sxed );
+ g_signal_connect( sxed->gncfreq, "changed",
+ G_CALLBACK(gnc_sxed_freq_changed),
+ sxed );
gtk_container_add( GTK_CONTAINER(f), GTK_WIDGET(sxed->gncfreq) );
f = GTK_FRAME(glade_xml_get_widget( sxed->gxml, "example_cal_frame" ));
Modified: gnucash/trunk/src/gnome/dialog-sx-from-trans.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-sx-from-trans.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome/dialog-sx-from-trans.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -396,9 +396,9 @@
(GTK_EXPAND | GTK_FILL),
GTK_FILL,
0, 0 );
- gtk_signal_connect( GTK_OBJECT( sxfti->startDateGDE ), "date-changed",
- GTK_SIGNAL_FUNC( sxftd_update_excal_adapt ),
- sxfti );
+ g_signal_connect( sxfti->startDateGDE, "date-changed",
+ G_CALLBACK( sxftd_update_excal_adapt ),
+ sxfti );
}
{
GtkWidget *endDateBox = glade_xml_get_widget( sxfti->gxml,
@@ -409,9 +409,9 @@
gtk_box_pack_start( GTK_BOX( endDateBox ),
GTK_WIDGET( sxfti->endDateGDE ),
FALSE, TRUE, 0 );
- gtk_signal_connect( GTK_OBJECT( sxfti->endDateGDE ), "date-changed",
- GTK_SIGNAL_FUNC( sxftd_update_excal_adapt ),
- sxfti );
+ g_signal_connect( sxfti->endDateGDE, "date-changed",
+ G_CALLBACK( sxftd_update_excal_adapt ),
+ sxfti );
}
/* Get the name from the transaction, try that as the initial SX name. */
Modified: gnucash/trunk/src/gnome/dialog-sxsincelast.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-sxsincelast.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome/dialog-sxsincelast.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -2962,15 +2962,15 @@
}
/* fixme::2002.02.10 jsled testing */
- gtk_signal_connect( GTK_OBJECT(entry), "key-press-event",
- GTK_SIGNAL_FUNC( tct_table_entry_key_handle ),
- NULL );
- gtk_signal_connect( GTK_OBJECT(entry), "changed",
- GTK_SIGNAL_FUNC( sxsincelast_entry_changed ),
- sxsld );
- gtk_signal_connect( GTK_OBJECT(entry), "destroy",
- GTK_SIGNAL_FUNC(gnc_sxsld_free_entry_numeric),
- sxsld );
+ g_signal_connect( entry, "key-press-event",
+ G_CALLBACK( tct_table_entry_key_handle ),
+ NULL );
+ g_signal_connect( entry, "changed",
+ G_CALLBACK( sxsincelast_entry_changed ),
+ sxsld );
+ g_signal_connect( entry, "destroy",
+ G_CALLBACK(gnc_sxsld_free_entry_numeric),
+ sxsld );
gtk_table_attach( varTable, label,
0, 1, tableIdx, tableIdx + 1,
@@ -3706,7 +3706,7 @@
gnc_split_reg_jump_to_split(gsr, split);
}
- gtk_signal_emit_stop_by_name( GTK_OBJECT(gsr), "jump" );
+ g_signal_stop_emission_by_name(gsr, "jump");
}
static void
Modified: gnucash/trunk/src/gnome/druid-acct-period.c
===================================================================
--- gnucash/trunk/src/gnome/druid-acct-period.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome/druid-acct-period.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -570,33 +570,33 @@
GTK_TEXT_VIEW (glade_xml_get_widget (xml, "book notes text"));
/* generic finished/close/abort signals */
- gtk_signal_connect (GTK_OBJECT (info->window), "destroy",
- GTK_SIGNAL_FUNC (ap_window_destroy_cb), info);
+ g_signal_connect (info->window, "destroy",
+ G_CALLBACK (ap_window_destroy_cb), info);
- gtk_signal_connect (GTK_OBJECT (info->druid), "cancel",
- GTK_SIGNAL_FUNC (ap_druid_cancel), info);
+ g_signal_connect (info->druid, "cancel",
+ G_CALLBACK (ap_druid_cancel), info);
- gtk_signal_connect (GTK_OBJECT (info->menu_page), "prepare",
- GTK_SIGNAL_FUNC (ap_show_menu), info);
+ g_signal_connect (info->menu_page, "prepare",
+ G_CALLBACK (ap_show_menu), info);
- gtk_signal_connect (GTK_OBJECT (info->menu_page), "next",
- GTK_SIGNAL_FUNC (ap_validate_menu), info);
+ g_signal_connect (info->menu_page, "next",
+ G_CALLBACK (ap_validate_menu), info);
- gtk_signal_connect (GTK_OBJECT (info->book_page), "prepare",
- GTK_SIGNAL_FUNC (ap_show_book), info);
+ g_signal_connect (info->book_page, "prepare",
+ G_CALLBACK (ap_show_book), info);
- gtk_signal_connect (GTK_OBJECT (info->book_page), "next",
- GTK_SIGNAL_FUNC (ap_close_period), info);
+ g_signal_connect (info->book_page, "next",
+ G_CALLBACK (ap_close_period), info);
- gtk_signal_connect (GTK_OBJECT (info->finish_page), "prepare",
- GTK_SIGNAL_FUNC (ap_show_done), info);
+ g_signal_connect (info->finish_page, "prepare",
+ G_CALLBACK (ap_show_done), info);
- gtk_signal_connect (GTK_OBJECT (info->finish_page), "finish",
- GTK_SIGNAL_FUNC (ap_finish), info);
+ g_signal_connect (info->finish_page, "finish",
+ G_CALLBACK (ap_finish), info);
/* User changes the accouting period or date signals */
- gtk_signal_connect (GTK_OBJECT (info->period_menu), "changed",
- GTK_SIGNAL_FUNC (ap_changed), info);
+ g_signal_connect (info->period_menu, "changed",
+ G_CALLBACK (ap_changed), info);
}
Modified: gnucash/trunk/src/gnome/druid-loan.c
===================================================================
--- gnucash/trunk/src/gnome/druid-loan.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome/druid-loan.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -580,21 +580,19 @@
9999, 1,
12, 12 ));
gtk_spin_button_set_adjustment( ldd->prmLengthSpin, a );
- gtk_signal_connect( GTK_OBJECT(ldd->prmLengthSpin), "changed",
- GTK_SIGNAL_FUNC( ld_calc_upd_rem_payments ),
- ldd );
- gtk_signal_connect( GTK_OBJECT(ldd->prmStartDateGDE),
- "date-changed",
- GTK_SIGNAL_FUNC( ld_calc_upd_rem_payments ),
- ldd );
- gtk_signal_connect( GTK_OBJECT(ldd->prmLengthSpin), "changed",
- GTK_SIGNAL_FUNC( ld_calc_upd_rem_payments ),
- ldd );
- gtk_signal_connect( GTK_OBJECT(gtk_option_menu_get_menu(
- ldd->prmLengthType)),
- "selection-done",
- GTK_SIGNAL_FUNC( ld_calc_upd_rem_payments ),
- ldd );
+ g_signal_connect( ldd->prmLengthSpin, "changed",
+ G_CALLBACK( ld_calc_upd_rem_payments ),
+ ldd );
+ g_signal_connect( ldd->prmStartDateGDE, "date-changed",
+ G_CALLBACK( ld_calc_upd_rem_payments ),
+ ldd );
+ g_signal_connect( ldd->prmLengthSpin, "changed",
+ G_CALLBACK( ld_calc_upd_rem_payments ),
+ ldd );
+ g_signal_connect( gtk_option_menu_get_menu(ldd->prmLengthType),
+ "selection-done",
+ G_CALLBACK( ld_calc_upd_rem_payments ),
+ ldd );
a = GTK_ADJUSTMENT(gtk_adjustment_new( 360, 1,
9999, 1,
@@ -606,8 +604,8 @@
gnc_option_menu_init( GTK_WIDGET(ldd->prmLengthType) );
gnc_option_menu_init( GTK_WIDGET(ldd->revRangeOpt) );
- gtk_signal_connect( GTK_OBJECT(ldd->optEscrowCb), "toggled",
- GTK_SIGNAL_FUNC(ld_escrow_toggle), ldd );
+ g_signal_connect( ldd->optEscrowCb, "toggled",
+ G_CALLBACK(ld_escrow_toggle), ldd );
gtk_widget_set_sensitive( GTK_WIDGET(ldd->optEscrowHBox), FALSE );
ldd->optEscrowGAS = GNC_ACCOUNT_SEL(gnc_account_sel_new());
gnc_account_sel_set_new_account_ability( ldd->optEscrowGAS, TRUE );
@@ -663,15 +661,15 @@
gtk_box_pack_start( GTK_BOX(vb), GTK_WIDGET(subOptAlign),
FALSE, FALSE, 2 );
- gtk_signal_connect( GTK_OBJECT( rouid->optCb ), "toggled",
- GTK_SIGNAL_FUNC(ld_opt_toggled),
- (gpointer)rouid );
- gtk_signal_connect( GTK_OBJECT( rouid->optCb ), "toggled",
- GTK_SIGNAL_FUNC(ld_opt_consistency),
- (gpointer)rouid );
- gtk_signal_connect( GTK_OBJECT( rouid->escrowCb ), "toggled",
- GTK_SIGNAL_FUNC(ld_escrow_toggled),
- (gpointer)rouid );
+ g_signal_connect( rouid->optCb, "toggled",
+ G_CALLBACK(ld_opt_toggled),
+ rouid );
+ g_signal_connect( rouid->optCb, "toggled",
+ G_CALLBACK(ld_opt_consistency),
+ rouid );
+ g_signal_connect( rouid->escrowCb, "toggled",
+ G_CALLBACK(ld_escrow_toggled),
+ rouid );
optAlign = GTK_ALIGNMENT(gtk_alignment_new( 0.5, 0.5, 0.75, 1.0 ));
gtk_container_add( GTK_CONTAINER(optAlign),
@@ -683,16 +681,14 @@
g_string_free( str, TRUE );
}
- gtk_signal_connect( GTK_OBJECT(ldd->payUseEscrow), "toggled",
- GTK_SIGNAL_FUNC(ld_pay_use_esc_toggle),
- (gpointer)ldd );
- gtk_signal_connect( GTK_OBJECT(ldd->paySpecSrcAcct), "toggled",
- GTK_SIGNAL_FUNC(ld_pay_spec_src_toggle),
- (gpointer)ldd );
- gtk_signal_connect( GTK_OBJECT(ldd->payTxnFreqPartRb), "toggled",
- GTK_SIGNAL_FUNC(ld_pay_freq_toggle), (gpointer)ldd );
- gtk_signal_connect( GTK_OBJECT(ldd->payTxnFreqUniqRb), "toggled",
- GTK_SIGNAL_FUNC(ld_pay_freq_toggle), (gpointer)ldd );
+ g_signal_connect( ldd->payUseEscrow, "toggled",
+ G_CALLBACK(ld_pay_use_esc_toggle), ldd );
+ g_signal_connect( ldd->paySpecSrcAcct, "toggled",
+ G_CALLBACK(ld_pay_spec_src_toggle), ldd );
+ g_signal_connect( ldd->payTxnFreqPartRb, "toggled",
+ G_CALLBACK(ld_pay_freq_toggle), ldd );
+ g_signal_connect( ldd->payTxnFreqUniqRb, "toggled",
+ G_CALLBACK(ld_pay_freq_toggle), ldd );
ldd->prmVarGncFreq =
GNC_FREQUENCY(gnc_frequency_new( NULL, NULL ));
@@ -712,20 +708,16 @@
/* Review page widget setup. */
{
- gtk_signal_connect( GTK_OBJECT(gtk_option_menu_get_menu(
- ldd->revRangeOpt)),
- "selection-done",
- GTK_SIGNAL_FUNC( ld_rev_range_opt_changed ),
- ldd );
- gtk_signal_connect( GTK_OBJECT(ldd->revStartDate),
- "date-changed",
- GTK_SIGNAL_FUNC( ld_rev_range_changed ),
- ldd );
- gtk_signal_connect( GTK_OBJECT(ldd->revEndDate),
- "date-changed",
- GTK_SIGNAL_FUNC( ld_rev_range_changed ),
- ldd );
-
+ g_signal_connect( gtk_option_menu_get_menu(ldd->revRangeOpt),
+ "selection-done",
+ G_CALLBACK( ld_rev_range_opt_changed ),
+ ldd );
+ g_signal_connect( ldd->revStartDate, "date-changed",
+ G_CALLBACK( ld_rev_range_changed ),
+ ldd );
+ g_signal_connect( ldd->revEndDate, "date-changed",
+ G_CALLBACK( ld_rev_range_changed ),
+ ldd );
}
{
@@ -748,9 +740,8 @@
/* setup page-transition handlers */
/* setup druid-global handler for cancel */
- gtk_signal_connect( GTK_OBJECT(ldd->druid), "cancel",
- GTK_SIGNAL_FUNC(ld_cancel_check),
- (gpointer)ldd );
+ g_signal_connect( ldd->druid, "cancel",
+ G_CALLBACK(ld_cancel_check), ldd );
/* FIXME: this is substantially similar to the code in
* dialog-sxsincelast.c ... it should probably be factored out
* somewhere. */
@@ -760,28 +751,28 @@
pg = glade_xml_get_widget( ldd->gxml,
DRUID_HANDLERS[i].pageName );
if ( DRUID_HANDLERS[i].prepFn ) {
- gtk_signal_connect( GTK_OBJECT(pg), "prepare",
- GTK_SIGNAL_FUNC(DRUID_HANDLERS[i].
- prepFn),
- ldd);
+ g_signal_connect( pg, "prepare",
+ G_CALLBACK(DRUID_HANDLERS[i].
+ prepFn),
+ ldd);
}
if ( DRUID_HANDLERS[i].backFn ) {
- gtk_signal_connect( GTK_OBJECT(pg), "back",
- GTK_SIGNAL_FUNC(DRUID_HANDLERS[i].
- backFn),
- ldd);
+ g_signal_connect( pg, "back",
+ G_CALLBACK(DRUID_HANDLERS[i].
+ backFn),
+ ldd);
}
if ( DRUID_HANDLERS[i].nextFn ) {
- gtk_signal_connect( GTK_OBJECT(pg), "next",
- GTK_SIGNAL_FUNC(DRUID_HANDLERS[i].
- nextFn),
- ldd);
+ g_signal_connect( pg, "next",
+ G_CALLBACK(DRUID_HANDLERS[i].
+ nextFn),
+ ldd);
}
if ( DRUID_HANDLERS[i].finishFn ) {
- gtk_signal_connect( GTK_OBJECT(pg), "finish",
- GTK_SIGNAL_FUNC(DRUID_HANDLERS[i].
- finishFn),
- ldd);
+ g_signal_connect( pg, "finish",
+ G_CALLBACK(DRUID_HANDLERS[i].
+ finishFn),
+ ldd);
}
}
}
@@ -791,9 +782,9 @@
(GNCComponentCloseHandler)ld_close_handler,
ldd );
- gtk_signal_connect( GTK_OBJECT(ldd->dialog), "destroy",
- GTK_SIGNAL_FUNC(ld_destroy),
- ldd );
+ g_signal_connect( ldd->dialog, "destroy",
+ G_CALLBACK(ld_destroy),
+ ldd );
gtk_widget_show_all( ldd->dialog );
return ldd;
@@ -1088,9 +1079,9 @@
/* prevent the toggle handler from running and "trashing" the
* state of the throughEscrowP selection */
- gtk_signal_handler_block_by_func( GTK_OBJECT(rouid->escrowCb),
- GTK_SIGNAL_FUNC(ld_escrow_toggled),
- rouid );
+ g_signal_handlers_block_by_func( rouid->escrowCb,
+ ld_escrow_toggled,
+ rouid );
gtk_toggle_button_set_active(
GTK_TOGGLE_BUTTON(rouid->escrowCb),
( newState
@@ -1100,9 +1091,9 @@
GTK_WIDGET(rouid->escrowCb),
newState
&& gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(rouid->optCb) ) );
- gtk_signal_handler_unblock_by_func( GTK_OBJECT(rouid->escrowCb),
- GTK_SIGNAL_FUNC(ld_escrow_toggled),
- rouid );
+ g_signal_handlers_unblock_by_func( rouid->escrowCb,
+ ld_escrow_toggled,
+ rouid );
if ( newState ) {
rouid->optData->from = ldd->ld.escrowAcct;
} else {
@@ -1458,9 +1449,9 @@
(ldd->ld.escrowAcct != NULL) );
{
- gtk_signal_handler_block_by_func( GTK_OBJECT(ldd->payUseEscrow),
- GTK_SIGNAL_FUNC(ld_pay_use_esc_toggle),
- ldd );
+ g_signal_handlers_block_by_func( ldd->payUseEscrow,
+ ld_pay_use_esc_toggle,
+ ldd );
ld_pay_use_esc_setup( ldd,
(ldd->ld.escrowAcct != NULL)
@@ -1469,23 +1460,23 @@
(rod->throughEscrowP
&& ldd->ld.escrowAcct != NULL) );
- gtk_signal_handler_unblock_by_func( GTK_OBJECT(ldd->payUseEscrow),
- GTK_SIGNAL_FUNC(ld_pay_use_esc_toggle),
- ldd );
+ g_signal_handlers_unblock_by_func( ldd->payUseEscrow,
+ ld_pay_use_esc_toggle,
+ ldd );
}
{
- gtk_signal_handler_block_by_func( GTK_OBJECT(ldd->paySpecSrcAcct),
- GTK_SIGNAL_FUNC(ld_pay_spec_src_toggle),
- ldd );
+ g_signal_handlers_block_by_func( ldd->paySpecSrcAcct,
+ ld_pay_spec_src_toggle,
+ ldd );
ld_pay_spec_src_setup( ldd, rod->specSrcAcctP );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(ldd->paySpecSrcAcct),
rod->specSrcAcctP );
- gtk_signal_handler_unblock_by_func( GTK_OBJECT(ldd->paySpecSrcAcct),
- GTK_SIGNAL_FUNC(ld_pay_spec_src_toggle),
- ldd );
+ g_signal_handlers_unblock_by_func( ldd->paySpecSrcAcct,
+ ld_pay_spec_src_toggle,
+ ldd );
}
gnc_account_sel_set_account( ldd->payAcctToGAS, rod->to );
@@ -1807,9 +1798,9 @@
}
- gtk_signal_connect( GTK_OBJECT(ldd->revCL), "size-allocate",
- GTK_SIGNAL_FUNC(ld_rev_clist_allocate_col_widths),
- (gpointer)ldd );
+ g_signal_connect( ldd->revCL, "size-allocate",
+ G_CALLBACK(ld_rev_clist_allocate_col_widths),
+ ldd );
gtk_container_add( GTK_CONTAINER(ldd->revScrollWin),
GTK_WIDGET(ldd->revCL) );
Modified: gnucash/trunk/src/gnome/druid-merge.c
===================================================================
--- gnucash/trunk/src/gnome/druid-merge.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome/druid-merge.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -260,35 +260,35 @@
xml = gnc_glade_xml_new ("merge.glade", "Merge Druid");
glade_xml_signal_connect(xml, "on_start_page_next",
- GTK_SIGNAL_FUNC (on_import_start_page_next));
+ G_CALLBACK (on_import_start_page_next));
glade_xml_signal_connect(xml, "on_qof_book_merge_prepare",
- GTK_SIGNAL_FUNC (on_merge_prepare));
+ G_CALLBACK (on_merge_prepare));
glade_xml_signal_connect(xml, "on_qof_book_merge_next",
- GTK_SIGNAL_FUNC (on_import_next));
+ G_CALLBACK (on_import_next));
glade_xml_signal_connect (xml, "on_finish",
- GTK_SIGNAL_FUNC (on_merge_finish));
+ G_CALLBACK (on_merge_finish));
glade_xml_signal_connect (xml, "on_cancel",
- GTK_SIGNAL_FUNC (on_merge_cancel));
+ G_CALLBACK (on_merge_cancel));
glade_xml_signal_connect (xml, "on_MergeUpdate_clicked",
- GTK_SIGNAL_FUNC (on_MergeUpdate_clicked));
+ G_CALLBACK (on_MergeUpdate_clicked));
glade_xml_signal_connect (xml, "on_MergeDuplicate_clicked",
- GTK_SIGNAL_FUNC (on_MergeDuplicate_clicked));
+ G_CALLBACK (on_MergeDuplicate_clicked));
glade_xml_signal_connect (xml, "on_MergeNew_clicked",
- GTK_SIGNAL_FUNC (on_MergeNew_clicked));
+ G_CALLBACK (on_MergeNew_clicked));
dialog = glade_xml_get_widget (xml, "Merge Druid");
druid = glade_xml_get_widget (xml, "merge_druid");
gnc_druid_set_colors (GNOME_DRUID (druid));
- gtk_signal_connect (GTK_OBJECT(dialog), "destroy",
- GTK_SIGNAL_FUNC(qof_book_merge_destroy_cb), NULL);
+ g_signal_connect (dialog, "destroy",
+ G_CALLBACK(qof_book_merge_destroy_cb), NULL);
return dialog;
}
@@ -302,35 +302,35 @@
xml = gnc_glade_xml_new ("merge.glade", "Merge Druid");
glade_xml_signal_connect(xml, "on_start_page_next",
- GTK_SIGNAL_FUNC (on_qof_start_page_next));
+ G_CALLBACK (on_qof_start_page_next));
glade_xml_signal_connect(xml, "on_qof_book_merge_prepare",
- GTK_SIGNAL_FUNC (on_merge_prepare));
+ G_CALLBACK (on_merge_prepare));
glade_xml_signal_connect(xml, "on_qof_book_merge_next",
- GTK_SIGNAL_FUNC (on_qof_book_merge_next));
+ G_CALLBACK (on_qof_book_merge_next));
glade_xml_signal_connect (xml, "on_finish",
- GTK_SIGNAL_FUNC (on_merge_finish));
+ G_CALLBACK (on_merge_finish));
glade_xml_signal_connect (xml, "on_cancel",
- GTK_SIGNAL_FUNC (on_merge_cancel));
+ G_CALLBACK (on_merge_cancel));
glade_xml_signal_connect (xml, "on_MergeUpdate_clicked",
- GTK_SIGNAL_FUNC (on_MergeUpdate_clicked));
+ G_CALLBACK (on_MergeUpdate_clicked));
glade_xml_signal_connect (xml, "on_MergeDuplicate_clicked",
- GTK_SIGNAL_FUNC (on_MergeDuplicate_clicked));
+ G_CALLBACK (on_MergeDuplicate_clicked));
glade_xml_signal_connect (xml, "on_MergeNew_clicked",
- GTK_SIGNAL_FUNC (on_MergeNew_clicked));
+ G_CALLBACK (on_MergeNew_clicked));
dialog = glade_xml_get_widget (xml, "Merge Druid");
druid = glade_xml_get_widget (xml, "merge_druid");
gnc_druid_set_colors (GNOME_DRUID (druid));
gtk_signal_connect (GTK_OBJECT(dialog), "destroy",
- GTK_SIGNAL_FUNC(qof_book_merge_destroy_cb), NULL);
+ G_CALLBACK(qof_book_merge_destroy_cb), NULL);
return dialog;
}
Modified: gnucash/trunk/src/gnome/druid-stock-split.c
===================================================================
--- gnucash/trunk/src/gnome/druid-stock-split.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome/druid-stock-split.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -575,8 +575,8 @@
gtk_clist_set_selection_mode (clist, GTK_SELECTION_BROWSE);
- gtk_signal_connect (GTK_OBJECT (clist), "select_row",
- GTK_SIGNAL_FUNC (clist_select_row), info);
+ g_signal_connect (clist, "select_row",
+ G_CALLBACK (clist_select_row), info);
}
/* info widgets */
Modified: gnucash/trunk/src/gnome/gnc-split-reg.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-split-reg.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome/gnc-split-reg.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -261,26 +261,26 @@
const char *signal_name;
guint defaultOffset;
} signals[] = {
- { ENTER_ENT_SIGNAL, "enter_ent", GTK_SIGNAL_OFFSET( GNCSplitRegClass, enter_ent_cb ) },
- { CANCEL_ENT_SIGNAL, "cancel_ent", GTK_SIGNAL_OFFSET( GNCSplitRegClass, cancel_ent_cb ) },
- { DELETE_ENT_SIGNAL, "delete_ent", GTK_SIGNAL_OFFSET( GNCSplitRegClass, delete_ent_cb ) },
- { REINIT_ENT_SIGNAL, "reinit_ent", GTK_SIGNAL_OFFSET( GNCSplitRegClass, reinit_ent_cb ) },
- { DUP_ENT_SIGNAL, "dup_ent", GTK_SIGNAL_OFFSET( GNCSplitRegClass, dup_ent_cb ) },
- { SCHEDULE_ENT_SIGNAL, "schedule_ent", GTK_SIGNAL_OFFSET( GNCSplitRegClass, schedule_ent_cb ) },
- { EXPAND_ENT_SIGNAL, "expand_ent", GTK_SIGNAL_OFFSET( GNCSplitRegClass, expand_ent_cb ) },
- { BLANK_SIGNAL, "blank", GTK_SIGNAL_OFFSET( GNCSplitRegClass, blank_cb ) },
- { JUMP_SIGNAL, "jump", GTK_SIGNAL_OFFSET( GNCSplitRegClass, jump_cb ) },
- { CUT_SIGNAL, "cut", GTK_SIGNAL_OFFSET( GNCSplitRegClass, cut_cb ) },
- { CUT_TXN_SIGNAL, "cut_txn", GTK_SIGNAL_OFFSET( GNCSplitRegClass, cut_txn_cb ) },
- { COPY_SIGNAL, "copy", GTK_SIGNAL_OFFSET( GNCSplitRegClass, copy_cb ) },
- { COPY_TXN_SIGNAL, "copy_txn", GTK_SIGNAL_OFFSET( GNCSplitRegClass, copy_txn_cb ) },
- { PASTE_SIGNAL, "paste", GTK_SIGNAL_OFFSET( GNCSplitRegClass, paste_cb ) },
- { PASTE_TXN_SIGNAL, "paste_txn", GTK_SIGNAL_OFFSET( GNCSplitRegClass, paste_txn_cb ) },
- { VOID_TXN_SIGNAL, "void_txn", GTK_SIGNAL_OFFSET( GNCSplitRegClass, void_txn_cb ) },
- { UNVOID_TXN_SIGNAL, "unvoid_txn", GTK_SIGNAL_OFFSET( GNCSplitRegClass, unvoid_txn_cb ) },
- { REVERSE_TXN_SIGNAL, "reverse_txn", GTK_SIGNAL_OFFSET( GNCSplitRegClass, reverse_txn_cb ) },
- { HELP_CHANGED_SIGNAL, "help-changed", GTK_SIGNAL_OFFSET( GNCSplitRegClass, help_changed_cb ) },
- { INCLUDE_DATE_SIGNAL, "include-date", GTK_SIGNAL_OFFSET( GNCSplitRegClass, include_date_cb ) },
+ { ENTER_ENT_SIGNAL, "enter_ent", G_STRUCT_OFFSET( GNCSplitRegClass, enter_ent_cb ) },
+ { CANCEL_ENT_SIGNAL, "cancel_ent", G_STRUCT_OFFSET( GNCSplitRegClass, cancel_ent_cb ) },
+ { DELETE_ENT_SIGNAL, "delete_ent", G_STRUCT_OFFSET( GNCSplitRegClass, delete_ent_cb ) },
+ { REINIT_ENT_SIGNAL, "reinit_ent", G_STRUCT_OFFSET( GNCSplitRegClass, reinit_ent_cb ) },
+ { DUP_ENT_SIGNAL, "dup_ent", G_STRUCT_OFFSET( GNCSplitRegClass, dup_ent_cb ) },
+ { SCHEDULE_ENT_SIGNAL, "schedule_ent", G_STRUCT_OFFSET( GNCSplitRegClass, schedule_ent_cb ) },
+ { EXPAND_ENT_SIGNAL, "expand_ent", G_STRUCT_OFFSET( GNCSplitRegClass, expand_ent_cb ) },
+ { BLANK_SIGNAL, "blank", G_STRUCT_OFFSET( GNCSplitRegClass, blank_cb ) },
+ { JUMP_SIGNAL, "jump", G_STRUCT_OFFSET( GNCSplitRegClass, jump_cb ) },
+ { CUT_SIGNAL, "cut", G_STRUCT_OFFSET( GNCSplitRegClass, cut_cb ) },
+ { CUT_TXN_SIGNAL, "cut_txn", G_STRUCT_OFFSET( GNCSplitRegClass, cut_txn_cb ) },
+ { COPY_SIGNAL, "copy", G_STRUCT_OFFSET( GNCSplitRegClass, copy_cb ) },
+ { COPY_TXN_SIGNAL, "copy_txn", G_STRUCT_OFFSET( GNCSplitRegClass, copy_txn_cb ) },
+ { PASTE_SIGNAL, "paste", G_STRUCT_OFFSET( GNCSplitRegClass, paste_cb ) },
+ { PASTE_TXN_SIGNAL, "paste_txn", G_STRUCT_OFFSET( GNCSplitRegClass, paste_txn_cb ) },
+ { VOID_TXN_SIGNAL, "void_txn", G_STRUCT_OFFSET( GNCSplitRegClass, void_txn_cb ) },
+ { UNVOID_TXN_SIGNAL, "unvoid_txn", G_STRUCT_OFFSET( GNCSplitRegClass, unvoid_txn_cb ) },
+ { REVERSE_TXN_SIGNAL, "reverse_txn", G_STRUCT_OFFSET( GNCSplitRegClass, reverse_txn_cb ) },
+ { HELP_CHANGED_SIGNAL, "help-changed", G_STRUCT_OFFSET( GNCSplitRegClass, help_changed_cb ) },
+ { INCLUDE_DATE_SIGNAL, "include-date", G_STRUCT_OFFSET( GNCSplitRegClass, include_date_cb ) },
{ LAST_SIGNAL, NULL, 0 }
};
@@ -288,20 +288,24 @@
for ( i=0; signals[i].s != INCLUDE_DATE_SIGNAL; i++ ) {
gnc_split_reg_signals[ signals[i].s ] =
- gtk_signal_new( signals[i].signal_name,
- GTK_RUN_LAST,
- GTK_CLASS_TYPE(object_class), signals[i].defaultOffset,
- gtk_signal_default_marshaller, GTK_TYPE_NONE, 0 );
+ g_signal_new( signals[i].signal_name,
+ G_TYPE_FROM_CLASS(object_class),
+ G_SIGNAL_RUN_LAST,
+ signals[i].defaultOffset,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0 );
}
/* Setup the non-default-marshalled signals; 'i' is still valid, here. */
/* "include-date" */
gnc_split_reg_signals[ INCLUDE_DATE_SIGNAL ] =
- gtk_signal_new( "include-date",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE(object_class),
- signals[i++].defaultOffset,
- gtk_marshal_NONE__INT, /* time_t == int */
- GTK_TYPE_NONE, 1, GTK_TYPE_INT );
+ g_signal_new( "include-date",
+ G_TYPE_FROM_CLASS(object_class),
+ G_SIGNAL_RUN_LAST,
+ signals[i++].defaultOffset,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__INT, /* time_t == int */
+ G_TYPE_NONE, 1, G_TYPE_INT );
g_assert( i == LAST_SIGNAL );
@@ -376,8 +380,8 @@
*/
//gtk_container_set_resize_mode( GTK_CONTAINER(gsr), GTK_RESIZE_QUEUE );
- gtk_signal_connect( GTK_OBJECT(gsr), "destroy",
- GTK_SIGNAL_FUNC (gnc_split_reg_destroy_cb), gsr );
+ g_signal_connect( gsr, "destroy",
+ G_CALLBACK (gnc_split_reg_destroy_cb), gsr );
}
static void
@@ -533,12 +537,12 @@
gtk_box_pack_start (GTK_BOX (gsr), GTK_WIDGET(gsr->reg), TRUE, TRUE, 0);
GNUCASH_SHEET(gsr->reg->sheet)->window = gsr->window;
gtk_widget_show ( GTK_WIDGET(gsr->reg) );
- gtk_signal_connect (GTK_OBJECT(gsr->reg), "activate_cursor",
- GTK_SIGNAL_FUNC(gnc_split_reg_record_cb), gsr);
- gtk_signal_connect (GTK_OBJECT(gsr->reg), "redraw_all",
- GTK_SIGNAL_FUNC(gsr_redraw_all_cb), gsr);
- gtk_signal_connect (GTK_OBJECT(gsr->reg), "redraw_help",
- GTK_SIGNAL_FUNC(gsr_emit_help_changed), gsr);
+ g_signal_connect (gsr->reg, "activate_cursor",
+ G_CALLBACK(gnc_split_reg_record_cb), gsr);
+ g_signal_connect (gsr->reg, "redraw_all",
+ G_CALLBACK(gsr_redraw_all_cb), gsr);
+ g_signal_connect (gsr->reg, "redraw_help",
+ G_CALLBACK(gsr_emit_help_changed), gsr);
}
static
@@ -561,15 +565,13 @@
check = GTK_CHECK_MENU_ITEM( gsr->double_line_check );
- gtk_signal_handler_block_by_func
- ( GTK_OBJECT(check),
- GTK_SIGNAL_FUNC(gnc_split_reg_double_line_cb), gsr );
+ g_signal_handlers_block_by_func( check,
+ gnc_split_reg_double_line_cb, gsr );
gtk_check_menu_item_set_active(check, use_double_line);
- gtk_signal_handler_unblock_by_func
- ( GTK_OBJECT(check),
- GTK_SIGNAL_FUNC(gnc_split_reg_double_line_cb), gsr );
+ g_signal_handlers_unblock_by_func( check,
+ gnc_split_reg_double_line_cb, gsr );
}
void
@@ -2063,9 +2065,11 @@
}
widget = glade_xml_get_widget(xml, widget_name);
- gtk_signal_handler_block_by_data(GTK_OBJECT(widget), gsr);
+ g_signal_handlers_block_matched(widget, G_SIGNAL_MATCH_DATA,
+ 0, 0, NULL, NULL, gsr);
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), TRUE);
- gtk_signal_handler_unblock_by_data(GTK_OBJECT(widget), gsr);
+ g_signal_handlers_unblock_matched(widget, G_SIGNAL_MATCH_DATA,
+ 0, 0, NULL, NULL, gsr);
}
static
@@ -2277,14 +2281,14 @@
void
gsr_emit_include_date_signal( GNCSplitReg *gsr, time_t date )
{
- gtk_signal_emit_by_name( GTK_OBJECT(gsr), "include-date", date, NULL );
+ g_signal_emit_by_name( gsr, "include-date", date, NULL );
}
static
void
gsr_emit_simple_signal( GNCSplitReg *gsr, const char *sigName )
{
- gtk_signal_emit_by_name( GTK_OBJECT(gsr), sigName, NULL );
+ g_signal_emit_by_name( gsr, sigName, NULL );
}
GnucashRegister*
Modified: gnucash/trunk/src/gnome/lot-viewer.c
===================================================================
--- gnucash/trunk/src/gnome/lot-viewer.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome/lot-viewer.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -619,11 +619,11 @@
gnc_glade_autoconnect_full_func,
lv);
- gtk_signal_connect (GTK_OBJECT (lv->lot_clist), "select_row",
- GTK_SIGNAL_FUNC (lv_select_row_cb), lv);
+ g_signal_connect (lv->lot_clist, "select_row",
+ G_CALLBACK (lv_select_row_cb), lv);
- gtk_signal_connect (GTK_OBJECT (lv->lot_clist), "unselect_row",
- GTK_SIGNAL_FUNC (lv_unselect_row_cb), lv);
+ g_signal_connect (lv->lot_clist, "unselect_row",
+ G_CALLBACK (lv_unselect_row_cb), lv);
gnc_restore_window_size(GCONF_SECTION, GTK_WINDOW(lv->window));
}
Modified: gnucash/trunk/src/gnome/window-reconcile.c
===================================================================
--- gnucash/trunk/src/gnome/window-reconcile.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome/window-reconcile.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -479,7 +479,7 @@
( account_type_has_auto_interest_payment( data->account_type ) ?
_("No Auto Interest Payments for this Account")
: _("No Auto Interest Charges for this Account") ),
- GTK_SIGNAL_FUNC(gnc_recn_interest_xfer_no_auto_clicked_cb),
+ G_CALLBACK(gnc_recn_interest_xfer_no_auto_clicked_cb),
(gpointer) data );
/* no currency frame */
@@ -867,7 +867,7 @@
return FALSE;
}
- gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), "key_press_event");
+ g_signal_stop_emission_by_name (widget, "key_press_event");
this_list = widget;
@@ -931,18 +931,18 @@
list = gnc_reconcile_list_new(account, type);
*list_save = list;
- gtk_signal_connect(GTK_OBJECT(list), "toggle_reconciled",
- GTK_SIGNAL_FUNC(gnc_reconcile_window_list_cb),
- recnData);
- gtk_signal_connect(GTK_OBJECT(list), "double_click_split",
- GTK_SIGNAL_FUNC(gnc_reconcile_window_double_click_cb),
- recnData);
- gtk_signal_connect(GTK_OBJECT(list), "focus_in_event",
- GTK_SIGNAL_FUNC(gnc_reconcile_window_focus_cb),
- recnData);
- gtk_signal_connect(GTK_OBJECT(list), "key_press_event",
- GTK_SIGNAL_FUNC(gnc_reconcile_key_press_cb),
- recnData);
+ g_signal_connect(list, "toggle_reconciled",
+ G_CALLBACK(gnc_reconcile_window_list_cb),
+ recnData);
+ g_signal_connect(list, "double_click_split",
+ G_CALLBACK(gnc_reconcile_window_double_click_cb),
+ recnData);
+ g_signal_connect(list, "focus_in_event",
+ G_CALLBACK(gnc_reconcile_window_focus_cb),
+ recnData);
+ g_signal_connect(list, "key_press_event",
+ G_CALLBACK(gnc_reconcile_key_press_cb),
+ recnData);
scrollWin = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (scrollWin),
@@ -1699,8 +1699,8 @@
statusbar = gnc_recn_create_status_bar(recnData);
gtk_box_pack_start(GTK_BOX(vbox), statusbar, FALSE, FALSE, 0);
- gtk_signal_connect (GTK_OBJECT (recnData->window), "destroy",
- GTK_SIGNAL_FUNC(recn_destroy_cb), recnData);
+ g_signal_connect (recnData->window, "destroy",
+ G_CALLBACK(recn_destroy_cb), recnData);
/* The menu bar */
{
Modified: gnucash/trunk/src/gnome-search/dialog-search.c
===================================================================
--- gnucash/trunk/src/gnome-search/dialog-search.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome-search/dialog-search.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -842,25 +842,25 @@
/* Connect XML signals */
glade_xml_signal_connect_data (xml, "gnc_ui_search_type_cb",
- GTK_SIGNAL_FUNC (search_type_cb), sw);
+ G_CALLBACK (search_type_cb), sw);
glade_xml_signal_connect_data (xml, "gnc_ui_search_active_cb",
- GTK_SIGNAL_FUNC (search_active_only_cb), sw);
+ G_CALLBACK (search_active_only_cb), sw);
glade_xml_signal_connect_data (xml, "gnc_ui_search_new_cb",
- GTK_SIGNAL_FUNC (search_new_item_cb), sw);
+ G_CALLBACK (search_new_item_cb), sw);
glade_xml_signal_connect_data (xml, "gnc_ui_search_find_cb",
- GTK_SIGNAL_FUNC (search_find_cb), sw);
+ G_CALLBACK (search_find_cb), sw);
glade_xml_signal_connect_data (xml, "gnc_ui_search_cancel_cb",
- GTK_SIGNAL_FUNC (search_cancel_cb), sw);
+ G_CALLBACK (search_cancel_cb), sw);
glade_xml_signal_connect_data (xml, "gnc_ui_search_close_cb",
- GTK_SIGNAL_FUNC (search_cancel_cb), sw);
+ G_CALLBACK (search_cancel_cb), sw);
glade_xml_signal_connect_data (xml, "gnc_ui_search_help_cb",
- GTK_SIGNAL_FUNC (search_help_cb), sw);
+ G_CALLBACK (search_help_cb), sw);
/* Register ourselves */
sw->component_id = gnc_register_gui_component (DIALOG_SEARCH_CM_CLASS,
@@ -963,7 +963,8 @@
g_return_if_fail (sw);
g_return_if_fail (user_data);
- gtk_signal_disconnect_by_data (GTK_OBJECT (sw->dialog), user_data);
+ g_signal_handlers_disconnect_matched (sw->dialog, G_SIGNAL_MATCH_DATA,
+ 0, 0, NULL, NULL, user_data);
}
/* Clear all callbacks with this Search Window */
Modified: gnucash/trunk/src/gnome-search/dialog-search.h
===================================================================
--- gnucash/trunk/src/gnome-search/dialog-search.h 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome-search/dialog-search.h 2005-11-30 04:05:31 UTC (rev 12071)
@@ -98,7 +98,7 @@
/* Register an on-close signal with the Search Dialog */
guint gnc_search_dialog_connect_on_close (GNCSearchWindow *sw,
- GtkSignalFunc func,
+ GCallback func,
gpointer user_data);
/* Un-register the signal handlers with the Search Dialog */
Modified: gnucash/trunk/src/gnome-search/gnc-general-search.c
===================================================================
--- gnucash/trunk/src/gnome-search/gnc-general-search.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome-search/gnc-general-search.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -116,13 +116,13 @@
parent_class = gtk_type_class (gtk_hbox_get_type ());
general_search_signals[SELECTION_CHANGED] =
- gtk_signal_new("changed",
- GTK_RUN_FIRST,
- GTK_CLASS_TYPE(object_class),
- GTK_SIGNAL_OFFSET(GNCGeneralSearchClass,
- changed),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ g_signal_new("changed",
+ G_TYPE_FROM_CLASS(object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET(GNCGeneralSearchClass, changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
object_class->destroy = gnc_general_search_destroy;
@@ -245,7 +245,7 @@
priv->sw = sw;
/* Catch when the search dialog closes */
- gnc_search_dialog_connect_on_close (sw, GTK_SIGNAL_FUNC (on_close_cb),
+ gnc_search_dialog_connect_on_close (sw, G_CALLBACK (on_close_cb),
gsl);
/* Catch the selection */
@@ -327,8 +327,8 @@
if (selection != gsl->selected_item) {
gsl->selected_item = selection;
reset_selection_text (gsl);
- gtk_signal_emit(GTK_OBJECT(gsl),
- general_search_signals[SELECTION_CHANGED]);
+ g_signal_emit(gsl,
+ general_search_signals[SELECTION_CHANGED], 0);
}
gnc_gui_component_clear_watches (priv->component_id);
Modified: gnucash/trunk/src/gnome-utils/dialog-transfer.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-transfer.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome-utils/dialog-transfer.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -1962,7 +1962,7 @@
/* Add a button with a user-specified label and "clicked" callback */
void gnc_xfer_dialog_add_user_specified_button( XferDialog *xferData,
const gchar *label,
- GtkSignalFunc callback,
+ GCallback callback,
gpointer user_data )
{
if( xferData && label && callback )
Modified: gnucash/trunk/src/gnome-utils/dialog-transfer.h
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-transfer.h 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome-utils/dialog-transfer.h 2005-11-30 04:05:31 UTC (rev 12071)
@@ -57,7 +57,7 @@
*/
void gnc_xfer_dialog_add_user_specified_button( XferDialog *xferData,
const gchar *label,
- GtkSignalFunc callback,
+ GCallback callback,
gpointer user_data );
void gnc_xfer_dialog_toggle_currency_table ( XferDialog *xferData,
Modified: gnucash/trunk/src/gnome-utils/dialog-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -122,17 +122,17 @@
omenu);
if (option_info[i].callback != NULL)
- gtk_signal_connect(GTK_OBJECT(menu_item), "activate",
- GTK_SIGNAL_FUNC(gnc_option_menu_cb),
- option_info[i].user_data);
+ g_signal_connect(menu_item, "activate",
+ G_CALLBACK(gnc_option_menu_cb),
+ option_info[i].user_data);
gtk_menu_append(GTK_MENU(menu), menu_item);
}
gtk_option_menu_set_menu(GTK_OPTION_MENU(omenu), menu);
- gtk_signal_connect (GTK_OBJECT (omenu), "destroy",
- GTK_SIGNAL_FUNC (option_menu_destroy_cb), tooltips);
+ g_signal_connect (omenu, "destroy",
+ G_CALLBACK (option_menu_destroy_cb), tooltips);
return omenu;
}
@@ -778,12 +778,12 @@
gtk_object_set_data (object, "gnc-check-info", check_info);
- gtk_signal_connect (object, "realize",
- GTK_SIGNAL_FUNC (check_realize), check_info);
- gtk_signal_connect (object, "unrealize",
- GTK_SIGNAL_FUNC (check_unrealize), check_info);
- gtk_signal_connect (object, "destroy",
- GTK_SIGNAL_FUNC (check_destroy), check_info);
+ g_signal_connect (object, "realize",
+ G_CALLBACK (check_realize), check_info);
+ g_signal_connect (object, "unrealize",
+ G_CALLBACK (check_unrealize), check_info);
+ g_signal_connect (object, "destroy",
+ G_CALLBACK (check_destroy), check_info);
if (GTK_WIDGET_REALIZED (GTK_WIDGET (list)))
check_realize (GTK_WIDGET (list), check_info);
@@ -934,7 +934,7 @@
gpointer user_data)
{
GCallback func;
- GtkSignalFunc *p_func = &func;
+ GCallback *p_func = &func;
if (allsymbols == NULL) {
/* get a handle on the main executable -- use this to find symbols */
Modified: gnucash/trunk/src/gnome-utils/gnc-account-sel.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-account-sel.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome-utils/gnc-account-sel.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -148,9 +148,9 @@
gtk_editable_set_editable( GTK_EDITABLE(gas->combo->entry), FALSE );
#if 0 /* completion not implemented. */
- gtk_signal_connect( GTK_OBJECT(gas->combo->entry), "changed",
- GTK_SIGNAL_FUNC( gnc_account_sel_changed ),
- gas );
+ g_signal_connect( gas->combo->entry, "changed",
+ G_CALLBACK( gnc_account_sel_changed ),
+ gas );
#endif /* 0 -- completion not implemented. */
/* Get the accounts, place into combo list */
@@ -290,9 +290,9 @@
g_completion_complete( gas->completion, s, &prefix );
if ( prefix && (strlen(prefix) > 0) ) {
printf( "changed into \"%s\"; longest completion: \"%s\"\n", s, prefix );
- gtk_signal_handler_block_by_func( GTK_OBJECT(gas->combo->entry),
- GTK_SIGNAL_FUNC(gnc_account_sel_changed),
- ud );
+ g_signal_handlers_block_by_func( gas->combo->entry,
+ gnc_account_sel_changed,
+ ud );
gtk_entry_set_text( GTK_ENTRY(gas->combo->entry), prefix );
gtk_editable_select_region( GTK_EDITABLE(gas->combo->entry),
strlen(s), -1 );
@@ -308,16 +308,16 @@
k.string = "";
printf( "foo [%d : \"%s\"]\n", k.length, k.string );
//gtk_widget_event( GTK_WIDGET(gas->combo->entry), &e );
- gtk_signal_emit_by_name( GTK_OBJECT(gas->combo->entry),
- "key-press-event",
- gas->combo->entry, &k, NULL, &ret );
+ g_signal_emit_by_name( gas->combo->entry,
+ "key-press-event",
+ gas->combo->entry, &k, NULL, &ret );
printf( "bar\n" );
}
gtk_editable_set_position( GTK_EDITABLE(gas->combo->entry),
strlen(s) );
- gtk_signal_handler_unblock_by_func( GTK_OBJECT(gas->combo->entry),
- GTK_SIGNAL_FUNC(gnc_account_sel_changed),
- ud );
+ g_signal_handlers_unblock_by_func( gas->combo->entry,
+ gnc_account_sel_changed,
+ ud );
g_free( prefix );
}
g_free( s );
@@ -480,10 +480,10 @@
/* create the button. */
gas->newAccountButton = gtk_button_new_with_label( _("New...") );
- gtk_signal_connect( GTK_OBJECT(gas->newAccountButton),
- "clicked",
- GTK_SIGNAL_FUNC( gas_new_account_click ),
- gas );
+ g_signal_connect( gas->newAccountButton,
+ "clicked",
+ G_CALLBACK( gas_new_account_click ),
+ gas );
gtk_box_pack_start( GTK_BOX(gas), gas->newAccountButton,
TRUE, FALSE, 2 );
}
Modified: gnucash/trunk/src/gnome-utils/gnc-amount-edit.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-amount-edit.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome-utils/gnc-amount-edit.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -232,7 +232,7 @@
gnc_amount_edit_set_amount (gae, gnc_numeric_zero ());
if (!gnc_numeric_equal (gnc_numeric_zero (), old_amount))
- gtk_signal_emit (GTK_OBJECT (gae), amount_edit_signals [AMOUNT_CHANGED]);
+ g_signal_emit (gae, amount_edit_signals [AMOUNT_CHANGED], 0);
return TRUE;
}
@@ -251,7 +251,7 @@
gnc_amount_edit_set_amount (gae, amount);
if (!gnc_numeric_equal (amount, old_amount))
- gtk_signal_emit (GTK_OBJECT (gae), amount_edit_signals [AMOUNT_CHANGED]);
+ g_signal_emit (gae, amount_edit_signals [AMOUNT_CHANGED], 0);
return TRUE;
}
Modified: gnucash/trunk/src/gnome-utils/gnc-date-delta.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-date-delta.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome-utils/gnc-date-delta.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -188,8 +188,8 @@
{
GNCDateDelta *gdd = GNC_DATE_DELTA(data);
- gtk_signal_emit(GTK_OBJECT (gdd), date_delta_signals [VALUE_CHANGED]);
- gtk_signal_emit(GTK_OBJECT (gdd), date_delta_signals [DELTA_CHANGED]);
+ g_signal_emit(gdd, date_delta_signals [VALUE_CHANGED], 0);
+ g_signal_emit(gdd, date_delta_signals [DELTA_CHANGED], 0);
}
static void
@@ -231,8 +231,8 @@
gtk_menu_append (GTK_MENU (menu), item);
gtk_widget_show(item);
- gtk_signal_connect (GTK_OBJECT (item), "activate",
- GTK_SIGNAL_FUNC (set_units), GINT_TO_POINTER(i));
+ g_signal_connect (item, "activate",
+ G_CALLBACK (set_units), GINT_TO_POINTER(i));
}
gtk_option_menu_set_menu (GTK_OPTION_MENU (gdd->units_menu), menu);
@@ -249,8 +249,8 @@
gdd->polarity = polarity;
- gtk_signal_emit (GTK_OBJECT (gdd), date_delta_signals [POLARITY_CHANGED]);
- gtk_signal_emit (GTK_OBJECT (gdd), date_delta_signals [DELTA_CHANGED]);
+ g_signal_emit (gdd, date_delta_signals [POLARITY_CHANGED], 0);
+ g_signal_emit (gdd, date_delta_signals [DELTA_CHANGED], 0);
}
static void
@@ -275,8 +275,8 @@
gtk_menu_append (GTK_MENU (menu), item);
gtk_widget_show(item);
- gtk_signal_connect (GTK_OBJECT (item), "activate",
- GTK_SIGNAL_FUNC (set_polarity), GINT_TO_POINTER(i));
+ g_signal_connect (item, "activate",
+ G_CALLBACK (set_polarity), GINT_TO_POINTER(i));
}
gtk_option_menu_set_menu (GTK_OPTION_MENU (gdd->polarity_menu), menu);
@@ -293,8 +293,8 @@
gtk_box_pack_start(GTK_BOX(gdd), gdd->value_spin, FALSE, FALSE, 0);
gtk_widget_show(gdd->value_spin);
- gtk_signal_connect(GTK_OBJECT(gdd->value_spin), "changed",
- GTK_SIGNAL_FUNC(value_changed), gdd);
+ g_signal_connect(gdd->value_spin, "changed",
+ G_CALLBACK(value_changed), gdd);
gdd->units_menu = gtk_option_menu_new();
fill_units_menu(gdd);
Modified: gnucash/trunk/src/gnome-utils/gnc-date-edit.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-date-edit.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome-utils/gnc-date-edit.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -590,7 +590,7 @@
if (!date_accel_key_press(widget, event, data))
return FALSE;
- gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), "key_press_event");
+ g_signal_stop_emission_by_name (widget, "key_press_event");
return TRUE;
}
@@ -607,8 +607,8 @@
1900 + tm.tm_year);
gtk_calendar_select_day (GTK_CALENDAR (gde->calendar), tm.tm_mday);
- gtk_signal_emit (GTK_OBJECT (gde), date_edit_signals [DATE_CHANGED]);
- gtk_signal_emit (GTK_OBJECT (gde), date_edit_signals [TIME_CHANGED]);
+ g_signal_emit (gde, date_edit_signals [DATE_CHANGED], 0);
+ g_signal_emit (gde, date_edit_signals [TIME_CHANGED], 0);
return FALSE;
}
@@ -675,15 +675,15 @@
gtk_widget_set_events (GTK_WIDGET(gde->cal_popup),
gtk_widget_get_events (GTK_WIDGET(gde->cal_popup)) |
GDK_KEY_PRESS_MASK);
- g_signal_connect (G_OBJECT (gde->cal_popup), "delete_event",
- (GtkSignalFunc) delete_popup,
- gde);
- g_signal_connect (G_OBJECT (gde->cal_popup), "key_press_event",
- (GtkSignalFunc) key_press_popup,
- gde);
- g_signal_connect (G_OBJECT (gde->cal_popup), "button_press_event",
- (GtkSignalFunc) button_press_popup,
- gde);
+ g_signal_connect (gde->cal_popup, "delete_event",
+ G_CALLBACK(delete_popup),
+ gde);
+ g_signal_connect (gde->cal_popup, "key_press_event",
+ G_CALLBACK(key_press_popup),
+ gde);
+ g_signal_connect (gde->cal_popup, "button_press_event",
+ G_CALLBACK(button_press_popup),
+ gde);
gtk_window_set_resizable (GTK_WINDOW (gde->cal_popup), FALSE);
frame = gtk_frame_new (NULL);
Modified: gnucash/trunk/src/gnome-utils/gnc-date-format.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-date-format.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome-utils/gnc-date-format.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -501,9 +501,11 @@
* without having to read the strftime man page. Prevent recursive
* signals.
*/
- gtk_signal_handler_block_by_data(GTK_OBJECT(priv->custom_entry), gdf);
+ g_signal_handlers_block_matched(priv->custom_entry, G_SIGNAL_MATCH_DATA,
+ 0, 0, NULL, NULL, gdf);
gtk_entry_set_text(GTK_ENTRY(priv->custom_entry), format);
- gtk_signal_handler_unblock_by_data(GTK_OBJECT(priv->custom_entry), gdf);
+ g_signal_handlers_unblock_matched(priv->custom_entry, G_SIGNAL_MATCH_DATA,
+ 0, 0, NULL, NULL, gdf);
/* Visual feedback on what the date will look like. */
secs_now = time(NULL);
Modified: gnucash/trunk/src/gnome-utils/gnc-dense-cal.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-dense-cal.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome-utils/gnc-dense-cal.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -687,7 +687,7 @@
createNew:
dcal->numMarks = num_weeks(dcal) * 7;
dcal->marks = g_new0( GList*, dcal->numMarks );
- gtk_signal_emit_by_name( GTK_OBJECT(dcal), MARKS_LOST_SIGNAL_NAME, NULL );
+ g_signal_emit_by_name( dcal, MARKS_LOST_SIGNAL_NAME, NULL );
}
static void
Modified: gnucash/trunk/src/gnome-utils/gnc-frequency.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-frequency.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome-utils/gnc-frequency.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -214,8 +214,8 @@
/* FIXME: having the user-data be a struct of a
* calendar name and the GNCFrequency would allow a
* single callback fn */
- gtk_signal_connect( GTK_OBJECT(o), "selection-done",
- GTK_SIGNAL_FUNC(optionMenus[i].fn), gf );
+ g_signal_connect( o, "selection-done",
+ G_CALLBACK(optionMenus[i].fn), gf );
}
}
@@ -227,23 +227,23 @@
o = glade_xml_get_widget( gf->gxml,
spinVals[i].name );
adj = gtk_spin_button_get_adjustment( GTK_SPIN_BUTTON(o) );
- gtk_signal_connect( GTK_OBJECT(adj), "value_changed",
- GTK_SIGNAL_FUNC(spinVals[i].fn), gf );
+ g_signal_connect( adj, "value_changed",
+ G_CALLBACK(spinVals[i].fn), gf );
}
}
/* initialize the weekly::day-of-week checkbox-selection hooks */
for ( i=0; i<7; i++ ) {
o = glade_xml_get_widget( gf->gxml, CHECKBOX_NAMES[i] );
- gtk_signal_connect( GTK_OBJECT(o), "clicked",
- GTK_SIGNAL_FUNC(weekly_days_changed), gf );
+ g_signal_connect( o, "clicked",
+ G_CALLBACK(weekly_days_changed), gf );
}
gtk_widget_show_all( GTK_WIDGET(&gf->widget) );
/* respond to start date changes */
- gtk_signal_connect( GTK_OBJECT(gf->startDate), "date_changed",
- GTK_SIGNAL_FUNC(start_date_changed), gf );
+ g_signal_connect( gf->startDate, "date_changed",
+ G_CALLBACK(start_date_changed), gf );
}
@@ -259,7 +259,7 @@
gnc_date_edit_set_time( gf->startDate, *secs);
if (NULL == fs)
{
- gtk_signal_emit_by_name( GTK_OBJECT(gf), "changed", NULL );
+ g_signal_emit_by_name( gf, "changed", NULL );
}
}
@@ -554,7 +554,7 @@
break;
}
- gtk_signal_emit_by_name( GTK_OBJECT(gf), "changed", NULL );
+ g_signal_emit_by_name( gf, "changed", NULL );
}
static void
@@ -831,7 +831,7 @@
static void
spin_changed_helper( GtkAdjustment *adj, gpointer d )
{
- gtk_signal_emit_by_name( GTK_OBJECT(GNC_FREQUENCY(d)), "changed", NULL );
+ g_signal_emit_by_name( GNC_FREQUENCY(d), "changed", NULL );
}
static void
@@ -840,7 +840,7 @@
GNCFrequency *gf;
gf = GNC_FREQUENCY(d);
- gtk_signal_emit_by_name( GTK_OBJECT(gf), "changed", NULL );
+ g_signal_emit_by_name( gf, "changed", NULL );
}
static void
@@ -869,7 +869,7 @@
tmptt = mktime( tmptm );
gnc_date_edit_set_time( gf->startDate, tmptt );
- gtk_signal_emit_by_name( GTK_OBJECT(d), "changed", NULL );
+ g_signal_emit_by_name( d, "changed", NULL );
}
static void
@@ -902,7 +902,7 @@
tmptt = mktime( tmptm );
gnc_date_edit_set_time( gf->startDate, tmptt );
- gtk_signal_emit_by_name( GTK_OBJECT(gf), "changed", NULL );
+ g_signal_emit_by_name( gf, "changed", NULL );
}
static void
@@ -957,7 +957,7 @@
tmpTT = mktime( tmpTm );
gnc_date_edit_set_time( gf->startDate, tmpTT );
- gtk_signal_emit_by_name( GTK_OBJECT(gf), "changed", NULL );
+ g_signal_emit_by_name( gf, "changed", NULL );
}
static void
@@ -990,7 +990,7 @@
tmptt = mktime( tmptm );
gnc_date_edit_set_time( gf->startDate, tmptt );
- gtk_signal_emit_by_name( GTK_OBJECT(gf), "changed", NULL );
+ g_signal_emit_by_name( gf, "changed", NULL );
}
static inline guint32 min( guint32 a, guint32 b )
@@ -1076,7 +1076,7 @@
/* nuttin can be done, for whatever reason. */
break;
}
- gtk_signal_emit_by_name( GTK_OBJECT(gf), "changed", NULL );
+ g_signal_emit_by_name( gf, "changed", NULL );
}
static void
@@ -1177,7 +1177,7 @@
PERR( "unknown uift value %d\n", uift );
break;
}
- gtk_signal_emit_by_name( GTK_OBJECT(gf), "changed", NULL );
+ g_signal_emit_by_name( gf, "changed", NULL );
}
/* ================================================================= */
Modified: gnucash/trunk/src/gnome-utils/gnc-general-select.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-general-select.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome-utils/gnc-general-select.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -296,8 +296,7 @@
gtk_entry_set_text(GTK_ENTRY(gsl->entry), text);
- gtk_signal_emit(GTK_OBJECT(gsl),
- general_select_signals[SELECTION_CHANGED]);
+ g_signal_emit(gsl, general_select_signals[SELECTION_CHANGED], 0);
}
/**
Modified: gnucash/trunk/src/gnome-utils/gnc-gui-query.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-gui-query.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome-utils/gnc-gui-query.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -517,9 +517,9 @@
gtk_widget_show(radio_button);
gtk_box_pack_start(GTK_BOX(vbox), radio_button, FALSE, FALSE, 0);
gtk_object_set_user_data(GTK_OBJECT(radio_button), GINT_TO_POINTER(i));
- gtk_signal_connect(GTK_OBJECT(radio_button), "clicked",
- GTK_SIGNAL_FUNC(gnc_choose_radio_button_cb),
- &radio_result);
+ g_signal_connect(radio_button, "clicked",
+ G_CALLBACK(gnc_choose_radio_button_cb),
+ &radio_result);
}
dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW(parent),
Modified: gnucash/trunk/src/gnome-utils/gnc-html.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-html.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome-utils/gnc-html.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -1149,32 +1149,33 @@
gtk_object_sink (GTK_OBJECT (retval->container));
/* signals */
- gtk_signal_connect(GTK_OBJECT(retval->html), "url_requested",
- GTK_SIGNAL_FUNC(gnc_html_url_requested_cb),
- (gpointer)retval);
+ g_signal_connect(retval->html, "url_requested",
+ G_CALLBACK(gnc_html_url_requested_cb),
+ retval);
- gtk_signal_connect(GTK_OBJECT(retval->html), "on_url",
- GTK_SIGNAL_FUNC(gnc_html_on_url_cb),
- (gpointer)retval);
+ g_signal_connect(retval->html, "on_url",
+ G_CALLBACK(gnc_html_on_url_cb),
+ retval);
- gtk_signal_connect(GTK_OBJECT(retval->html), "set_base",
- GTK_SIGNAL_FUNC(gnc_html_set_base_cb),
- (gpointer)retval);
+ g_signal_connect(retval->html, "set_base",
+ G_CALLBACK(gnc_html_set_base_cb),
+ retval);
- gtk_signal_connect(GTK_OBJECT(retval->html), "link_clicked",
- GTK_SIGNAL_FUNC(gnc_html_link_clicked_cb),
- (gpointer)retval);
+ g_signal_connect(retval->html, "link_clicked",
+ G_CALLBACK(gnc_html_link_clicked_cb),
+ retval);
- gtk_signal_connect (GTK_OBJECT (retval->html), "object_requested",
- GTK_SIGNAL_FUNC (gnc_html_object_requested_cb),
- (gpointer)retval);
+ g_signal_connect (retval->html, "object_requested",
+ G_CALLBACK (gnc_html_object_requested_cb),
+ retval);
- gtk_signal_connect (GTK_OBJECT (retval->html), "button_press_event",
- GTK_SIGNAL_FUNC (gnc_html_button_press_cb),
- (gpointer)retval);
+ g_signal_connect (retval->html, "button_press_event",
+ G_CALLBACK (gnc_html_button_press_cb),
+ retval);
- gtk_signal_connect (GTK_OBJECT(retval->html), "submit",
- GTK_SIGNAL_FUNC(gnc_html_submit_cb), (gpointer)retval);
+ g_signal_connect (retval->html, "submit",
+ G_CALLBACK(gnc_html_submit_cb),
+ retval);
gtk_html_load_empty(GTK_HTML(retval->html));
Modified: gnucash/trunk/src/gnome-utils/gnc-query-list.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-query-list.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome-utils/gnc-query-list.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -293,12 +293,12 @@
gtk_clist_set_column_resizeable (clist, i, FALSE);
}
- gtk_signal_connect (GTK_OBJECT (clist), "click_column",
- GTK_SIGNAL_FUNC(gnc_query_list_click_column_cb),
- NULL);
- gtk_signal_connect (GTK_OBJECT (clist), "size_allocate",
- GTK_SIGNAL_FUNC(gnc_query_list_size_allocate_cb),
- NULL);
+ g_signal_connect (clist, "click_column",
+ G_CALLBACK(gnc_query_list_click_column_cb),
+ NULL);
+ g_signal_connect (clist, "size_allocate",
+ G_CALLBACK(gnc_query_list_size_allocate_cb),
+ NULL);
style = gtk_widget_get_style (GTK_WIDGET(list));
@@ -388,7 +388,7 @@
entry = gtk_clist_get_row_data (GTK_CLIST(list), row);
list->current_entry = entry;
- gtk_signal_emit (GTK_OBJECT (list), query_list_signals[LINE_TOGGLED], entry);
+ g_signal_emit (list, query_list_signals[LINE_TOGGLED], 0, entry);
update_booleans (list, row);
}
@@ -416,8 +416,7 @@
entry = gtk_clist_get_row_data (clist, row);
- gtk_signal_emit(GTK_OBJECT(list),
- query_list_signals[DOUBLE_CLICK_ENTRY], entry);
+ g_signal_emit(list, query_list_signals[DOUBLE_CLICK_ENTRY], 0, entry);
}
}
@@ -446,8 +445,7 @@
entry = gtk_clist_get_row_data (clist, row);
- gtk_signal_emit (GTK_OBJECT(list),
- query_list_signals[DOUBLE_CLICK_ENTRY], entry);
+ g_signal_emit (list, query_list_signals[DOUBLE_CLICK_ENTRY], 0, entry);
}
}
Modified: gnucash/trunk/src/gnome-utils/gnc-splash.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-splash.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/gnome-utils/gnc-splash.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -56,8 +56,8 @@
gtk_window_set_type_hint (GTK_WINDOW (splash), GDK_WINDOW_TYPE_HINT_SPLASHSCREEN);
gtk_window_set_skip_taskbar_hint (GTK_WINDOW (splash), TRUE);
- gtk_signal_connect (GTK_OBJECT (splash), "destroy",
- GTK_SIGNAL_FUNC (splash_destroy_cb), NULL);
+ g_signal_connect (splash, "destroy",
+ G_CALLBACK (splash_destroy_cb), NULL);
gtk_window_set_title (GTK_WINDOW (splash), "GnuCash");
gtk_window_set_position (GTK_WINDOW (splash), GTK_WIN_POS_CENTER);
Modified: gnucash/trunk/src/import-export/binary-import/druid-commodity.c
===================================================================
--- gnucash/trunk/src/import-export/binary-import/druid-commodity.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/import-export/binary-import/druid-commodity.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -144,8 +144,8 @@
d->window = glade_xml_get_widget (xml, "New Commodity Format Druid");
dobj = GTK_OBJECT(d->window);
- gtk_signal_connect (dobj, "delete_event",
- GTK_SIGNAL_FUNC (window_delete_cb), d);
+ g_signal_connect (dobj, "delete_event",
+ G_CALLBACK (window_delete_cb), d);
d->druid = glade_xml_get_widget (xml, "commodity_druid");
d->intro_page = glade_xml_get_widget (xml, "start_page");
@@ -156,11 +156,11 @@
glade_xml_signal_connect_data
(xml, "gnc_ui_commodity_druid_cancel_cb",
- GTK_SIGNAL_FUNC (gnc_ui_commodity_druid_cancel_cb), d);
+ G_CALLBACK (gnc_ui_commodity_druid_cancel_cb), d);
glade_xml_signal_connect_data
(xml, "gnc_ui_commodity_druid_finish_cb",
- GTK_SIGNAL_FUNC (gnc_ui_commodity_druid_finish_cb), d);
+ G_CALLBACK (gnc_ui_commodity_druid_finish_cb), d);
d->new_map = g_hash_table_new(g_str_hash, g_str_equal);
d->old_map = g_hash_table_new(g_str_hash, g_str_equal);
@@ -196,13 +196,13 @@
new_page = make_commodity_druid_page(found);
/* set up next/back signal handlers */
- gtk_signal_connect(GTK_OBJECT (new_page->page), "next",
- GTK_SIGNAL_FUNC(gnc_ui_commodity_druid_comm_check_cb),
- d);
+ g_signal_connect(new_page->page, "next",
+ G_CALLBACK(gnc_ui_commodity_druid_comm_check_cb),
+ d);
- gtk_signal_connect(GTK_OBJECT(new_page->page), "cancel",
- GTK_SIGNAL_FUNC(gnc_ui_commodity_druid_cancel_cb),
- d);
+ g_signal_connect(new_page->page, "cancel",
+ G_CALLBACK(gnc_ui_commodity_druid_cancel_cb),
+ d);
d->pages = g_list_append(d->pages, new_page);
Modified: gnucash/trunk/src/import-export/hbci/dialog-daterange.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/dialog-daterange.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/import-export/hbci/dialog-daterange.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -90,10 +90,10 @@
gtk_widget_set_sensitive (info.from_dateedit, FALSE);
gtk_widget_set_sensitive (info.to_dateedit, FALSE);
- gtk_signal_connect (GTK_OBJECT (info.enter_from_button), "toggled",
- GTK_SIGNAL_FUNC (on_button_toggled), &info);
- gtk_signal_connect (GTK_OBJECT (info.enter_to_button), "toggled",
- GTK_SIGNAL_FUNC (on_button_toggled), &info);
+ g_signal_connect (info.enter_from_button, "toggled",
+ G_CALLBACK (on_button_toggled), &info);
+ g_signal_connect (info.enter_to_button, "toggled",
+ G_CALLBACK (on_button_toggled), &info);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), 1);
Modified: gnucash/trunk/src/import-export/hbci/dialog-hbcitrans.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/dialog-hbcitrans.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/import-export/hbci/dialog-hbcitrans.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -403,36 +403,36 @@
/* Connect signals */
/* gnc_option_menu_init_w_signal (td->template_option,
- GTK_SIGNAL_FUNC(template_selection_cb),
+ G_CALLBACK(template_selection_cb),
td); */
/* FIXME: commented out until the GTK_TREE_VIEW is implemented! */
/*
- gtk_signal_connect (GTK_OBJECT (td->template_gtktreeview), "select_child",
- GTK_SIGNAL_FUNC (on_template_list_select_child),
+ g_signal_connect (td->template_gtktreeview, "select_child",
+ G_CALLBACK (on_template_list_select_child),
td);
- gtk_signal_connect(GTK_OBJECT (add_templ_button), "clicked",
- GTK_SIGNAL_FUNC(add_template_cb), td);
+ g_signal_connect (add_templ_button, "clicked",
+ G_CALLBACK(add_template_cb), td);
- gtk_signal_connect (GTK_OBJECT (moveup_templ_button), "clicked",
- GTK_SIGNAL_FUNC (moveup_template_cb),
+ g_signal_connect (moveup_templ_button, "clicked",
+ G_CALLBACK (moveup_template_cb),
td);
- gtk_signal_connect (GTK_OBJECT (movedown_templ_button), "clicked",
- GTK_SIGNAL_FUNC (movedown_template_cb),
+ g_signal_connect (movedown_templ_button, "clicked",
+ G_CALLBACK (movedown_template_cb),
td);
- gtk_signal_connect (GTK_OBJECT (sort_templ_button), "clicked",
- GTK_SIGNAL_FUNC (sort_template_cb),
+ g_signal_connect (sort_templ_button, "clicked",
+ G_CALLBACK (sort_template_cb),
td);
- gtk_signal_connect (GTK_OBJECT (del_templ_button), "clicked",
- GTK_SIGNAL_FUNC (del_template_cb),
+ g_signal_connect (del_templ_button, "clicked",
+ G_CALLBACK (del_template_cb),
td);
*/
- gtk_signal_connect(GTK_OBJECT (td->recp_bankcode_entry), "changed",
- GTK_SIGNAL_FUNC(blz_changed_cb), td);
+ g_signal_connect (td->recp_bankcode_entry, "changed",
+ G_CALLBACK(blz_changed_cb), td);
/* Default button */
gtk_dialog_set_default_response (GTK_DIALOG (td->dialog), GTK_RESPONSE_OK);
Modified: gnucash/trunk/src/import-export/hbci/druid-hbci-initial.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/druid-hbci-initial.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/import-export/hbci/druid-hbci-initial.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -645,9 +645,9 @@
gnc_druid_set_colors (GNOME_DRUID (info->druid));
glade_xml_signal_connect_data (xml, "on_finish",
- GTK_SIGNAL_FUNC (on_finish), info);
+ G_CALLBACK (on_finish), info);
glade_xml_signal_connect_data (xml, "on_cancel",
- GTK_SIGNAL_FUNC (on_cancel), info);
+ G_CALLBACK (on_cancel), info);
info->api = gnc_AB_BANKING_new_currentbook(info->window, &(info->interactor));
g_assert(info->api);
@@ -656,36 +656,33 @@
/* Page with config file entry widget */
page = glade_xml_get_widget(xml, "configfile_page");
info->filepage = page;
- gtk_signal_connect (GTK_OBJECT (page), "prepare",
- GTK_SIGNAL_FUNC (on_aqbutton_prepare), info);
- gtk_signal_connect (GTK_OBJECT
- (glade_xml_get_widget (xml, "aqhbci_button")),
- "clicked",
- GTK_SIGNAL_FUNC (on_aqhbci_button), info);
+ g_signal_connect (page, "prepare",
+ G_CALLBACK (on_aqbutton_prepare), info);
+ g_signal_connect (glade_xml_get_widget (xml, "aqhbci_button"),
+ "clicked",
+ G_CALLBACK (on_aqhbci_button), info);
}
{
page = glade_xml_get_widget(xml, "account_match_page");
info->accountpage = page;
info->accountlist = glade_xml_get_widget(xml, "account_page_list");
- gtk_signal_connect (GTK_OBJECT (info->accountlist), "select_row",
- GTK_SIGNAL_FUNC (on_accountlist_select_row), info);
- gtk_signal_connect (GTK_OBJECT
- (glade_xml_get_widget (xml, "aqhbci_again_button")),
- "clicked",
- GTK_SIGNAL_FUNC (on_aqhbci_button), info);
- gtk_signal_connect (GTK_OBJECT
- (glade_xml_get_widget (xml, "updatelist_button")),
- "clicked",
- GTK_SIGNAL_FUNC (on_button_clicked), info);
- gtk_signal_connect (GTK_OBJECT (page), "prepare",
- GTK_SIGNAL_FUNC (on_accountlist_prepare), info);
- gtk_signal_connect (GTK_OBJECT (page), "back",
- GTK_SIGNAL_FUNC (on_accountlist_back), info);
+ g_signal_connect (info->accountlist, "select_row",
+ G_CALLBACK (on_accountlist_select_row), info);
+ g_signal_connect (glade_xml_get_widget (xml, "aqhbci_again_button"),
+ "clicked",
+ G_CALLBACK (on_aqhbci_button), info);
+ g_signal_connect (glade_xml_get_widget (xml, "updatelist_button"),
+ "clicked",
+ G_CALLBACK (on_button_clicked), info);
+ g_signal_connect (page, "prepare",
+ G_CALLBACK (on_accountlist_prepare), info);
+ g_signal_connect (page, "back",
+ G_CALLBACK (on_accountlist_back), info);
}
- /*gtk_signal_connect (GTK_OBJECT(dialog), "destroy",*/
- /* GTK_SIGNAL_FUNC(gnc_hierarchy_destroy_cb), NULL);*/
+ /*g_signal_connect (dialog, "destroy",*/
+ /* G_CALLBACK(gnc_hierarchy_destroy_cb), NULL);*/
gtk_widget_show_all (info->window);
}
Modified: gnucash/trunk/src/import-export/hbci/hbci-interaction.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/hbci-interaction.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/import-export/hbci/hbci-interaction.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -803,10 +803,10 @@
(GTK_TOGGLE_BUTTON (data->close_checkbutton),
gnc_gconf_get_bool(GCONF_SECTION, KEY_CLOSE_ON_FINISH, NULL));
- gtk_signal_connect (GTK_OBJECT (data->abort_button), "clicked",
- GTK_SIGNAL_FUNC (on_button_clicked), data);
- gtk_signal_connect (GTK_OBJECT (data->close_button), "clicked",
- GTK_SIGNAL_FUNC (on_button_clicked), data);
+ g_signal_connect (data->abort_button, "clicked",
+ G_CALLBACK (on_button_clicked), data);
+ g_signal_connect (data->close_button, "clicked",
+ G_CALLBACK (on_button_clicked), data);
if (data->parent)
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (data->parent));
Modified: gnucash/trunk/src/import-export/import-main-matcher.c
===================================================================
--- gnucash/trunk/src/import-export/import-main-matcher.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/import-export/import-main-matcher.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -284,7 +284,7 @@
GTK_WINDOW(info->dialog));
glade_xml_signal_connect_data(xml, "on_matcher_help_close_clicked",
- GTK_SIGNAL_FUNC(on_matcher_help_close_clicked),
+ G_CALLBACK(on_matcher_help_close_clicked),
help_dialog);
gtk_widget_show(help_dialog);
@@ -449,16 +449,16 @@
/* Connect signals */
glade_xml_signal_connect_data(xml, "downloaded_transaction_select_cb",
- GTK_SIGNAL_FUNC(clist_select_row_cb),
+ G_CALLBACK(clist_select_row_cb),
info);
glade_xml_signal_connect_data(xml, "on_matcher_ok_clicked",
- GTK_SIGNAL_FUNC(on_matcher_ok_clicked),
+ G_CALLBACK(on_matcher_ok_clicked),
info);
glade_xml_signal_connect_data(xml, "on_matcher_cancel_clicked",
- GTK_SIGNAL_FUNC(on_matcher_cancel_clicked),
+ G_CALLBACK(on_matcher_cancel_clicked),
info);
glade_xml_signal_connect_data(xml, "on_matcher_help_clicked",
- GTK_SIGNAL_FUNC(on_matcher_help_clicked),
+ G_CALLBACK(on_matcher_help_clicked),
info);
/*Initialise pixmaps*/
Modified: gnucash/trunk/src/import-export/import-match-picker.c
===================================================================
--- gnucash/trunk/src/import-export/import-match-picker.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/import-export/import-match-picker.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -284,11 +284,11 @@
/* connect the signals in the interface */
glade_xml_signal_connect_data(xml,
"match_transaction_select_cb",
- GTK_SIGNAL_FUNC(match_transaction_select_cb),
+ G_CALLBACK(match_transaction_select_cb),
matcher);
glade_xml_signal_connect_data(xml,
"match_transaction_unselect_cb",
- GTK_SIGNAL_FUNC(match_transaction_unselect_cb),
+ G_CALLBACK(match_transaction_unselect_cb),
matcher);
matcher->transaction_matcher = glade_xml_get_widget (xml, "match_picker");
Modified: gnucash/trunk/src/import-export/qif-import/dialog-account-picker.c
===================================================================
--- gnucash/trunk/src/import-export/qif-import/dialog-account-picker.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/import-export/qif-import/dialog-account-picker.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -257,7 +257,7 @@
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_account_picker_new_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_account_picker_new_cb), wind);
+ G_CALLBACK (gnc_ui_qif_account_picker_new_cb), wind);
wind->dialog = glade_xml_get_widget (xml, "QIF Import Account Picker");
wind->treeview = glade_xml_get_widget (xml, "account_tree");
@@ -270,17 +270,17 @@
scm_gc_protect_object(wind->map_entry);
- gtk_signal_connect(GTK_OBJECT(wind->treeview), "tree_select_row",
- GTK_SIGNAL_FUNC(gnc_ui_qif_account_picker_select_cb),
- wind);
+ g_signal_connect(wind->treeview, "tree_select_row",
+ G_CALLBACK(gnc_ui_qif_account_picker_select_cb),
+ wind);
- gtk_signal_connect(GTK_OBJECT(wind->treeview), "tree_unselect_row",
- GTK_SIGNAL_FUNC(gnc_ui_qif_account_picker_unselect_cb),
- wind);
+ g_signal_connect(wind->treeview, "tree_unselect_row",
+ G_CALLBACK(gnc_ui_qif_account_picker_unselect_cb),
+ wind);
- gtk_signal_connect_after(GTK_OBJECT(wind->dialog), "map",
- GTK_SIGNAL_FUNC(gnc_ui_qif_account_picker_map_cb),
- wind);
+ g_signal_connect_after(wind->dialog, "map",
+ G_CALLBACK(gnc_ui_qif_account_picker_map_cb),
+ wind);
button = glade_xml_get_widget (xml, "newbutton");
gtk_button_set_use_stock(GTK_BUTTON(button), TRUE);
Modified: gnucash/trunk/src/import-export/qif-import/druid-qif-import.c
===================================================================
--- gnucash/trunk/src/import-export/qif-import/druid-qif-import.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/import-export/qif-import/druid-qif-import.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -1485,9 +1485,9 @@
new_page = make_qif_druid_page(commodity);
- gtk_signal_connect(GTK_OBJECT(new_page->page), "next",
- GTK_SIGNAL_FUNC(gnc_ui_qif_import_comm_check_cb),
- wind);
+ g_signal_connect(new_page->page, "next",
+ G_CALLBACK(gnc_ui_qif_import_comm_check_cb),
+ wind);
wind->commodity_pages = g_list_append(wind->commodity_pages,
new_page->page);
@@ -1816,103 +1816,103 @@
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_cancel_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_cancel_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_cancel_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_generic_next_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_generic_next_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_generic_next_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_generic_back_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_generic_back_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_generic_back_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_select_file_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_select_file_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_select_file_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_load_file_back_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_load_file_back_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_load_file_back_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_load_file_next_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_load_file_next_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_load_file_next_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_date_format_next_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_date_format_next_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_date_format_next_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_select_loaded_file_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_select_loaded_file_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_select_loaded_file_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_loaded_files_prepare_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_loaded_files_prepare_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_loaded_files_prepare_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_load_another_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_load_another_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_load_another_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_unload_file_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_unload_file_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_unload_file_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_default_acct_next_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_default_acct_next_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_default_acct_next_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_default_acct_back_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_default_acct_back_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_default_acct_back_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_account_line_select_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_account_line_select_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_account_line_select_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_category_line_select_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_category_line_select_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_category_line_select_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_memo_line_select_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_memo_line_select_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_memo_line_select_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_accounts_prepare_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_accounts_prepare_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_accounts_prepare_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_categories_prepare_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_categories_prepare_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_categories_prepare_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_memo_prepare_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_memo_prepare_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_memo_prepare_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_memo_next_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_memo_next_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_memo_next_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_currency_next_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_currency_next_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_currency_next_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_commodity_prepare_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_commodity_prepare_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_commodity_prepare_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_duplicate_new_select_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_duplicate_new_select_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_duplicate_new_select_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_duplicate_old_select_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_duplicate_old_select_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_duplicate_old_select_cb), retval);
glade_xml_signal_connect_data
(xml, "gnc_ui_qif_import_finish_cb",
- GTK_SIGNAL_FUNC (gnc_ui_qif_import_finish_cb), retval);
+ G_CALLBACK (gnc_ui_qif_import_finish_cb), retval);
retval->window = glade_xml_get_widget (xml, "QIF Import Druid");
Modified: gnucash/trunk/src/register/ledger-core/dialog-dup-trans.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/dialog-dup-trans.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/register/ledger-core/dialog-dup-trans.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -128,8 +128,8 @@
dt_dialog->num_edit = num_spin;
gtk_entry_set_activates_default(GTK_ENTRY(num_spin), TRUE);
- gtk_signal_connect(GTK_OBJECT(num_spin), "output",
- GTK_SIGNAL_FUNC(gnc_dup_trans_output_cb), dt_dialog);
+ g_signal_connect(num_spin, "output",
+ G_CALLBACK(gnc_dup_trans_output_cb), dt_dialog);
if (num_str && parse_num (num_str, &num))
gtk_spin_button_set_value (GTK_SPIN_BUTTON (num_spin), num + 1);
Modified: gnucash/trunk/src/register/register-gnome/datecell-gnome.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/datecell-gnome.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/register/register-gnome/datecell-gnome.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -236,7 +236,8 @@
if (!box->signals_connected)
return;
- gtk_signal_disconnect_by_data (GTK_OBJECT (box->date_picker), cell);
+ g_signal_handlers_disconnect_matched (box->date_picker, G_SIGNAL_MATCH_DATA,
+ 0, 0, NULL, NULL, cell);
box->signals_connected = FALSE;
}
@@ -249,14 +250,14 @@
if (box->signals_connected)
return;
- gtk_signal_connect (GTK_OBJECT(box->date_picker), "date_selected",
- GTK_SIGNAL_FUNC(date_selected_cb), cell);
+ g_signal_connect (box->date_picker, "date_selected",
+ G_CALLBACK(date_selected_cb), cell);
- gtk_signal_connect(GTK_OBJECT(box->date_picker), "date_picked",
- GTK_SIGNAL_FUNC(date_picked_cb), cell);
+ g_signal_connect(box->date_picker, "date_picked",
+ G_CALLBACK(date_picked_cb), cell);
- gtk_signal_connect(GTK_OBJECT(box->date_picker), "key_press_event",
- GTK_SIGNAL_FUNC(key_press_item_cb), cell);
+ g_signal_connect(box->date_picker, "key_press_event",
+ G_CALLBACK(key_press_item_cb), cell);
box->signals_connected = TRUE;
}
@@ -269,7 +270,8 @@
if (!box->signals_connected)
return;
- gtk_signal_handler_block_by_data (GTK_OBJECT (box->date_picker), cell);
+ g_signal_handlers_block_matched (box->date_picker, G_SIGNAL_MATCH_DATA,
+ 0, 0, NULL, NULL, cell);
}
static void
@@ -280,7 +282,8 @@
if (!box->signals_connected)
return;
- gtk_signal_handler_unblock_by_data (GTK_OBJECT (box->date_picker), cell);
+ g_signal_handlers_unblock_matched (box->date_picker, G_SIGNAL_MATCH_DATA,
+ 0, 0, NULL, NULL, cell);
}
static void
Modified: gnucash/trunk/src/register/register-gnome/gnucash-date-picker.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/gnucash-date-picker.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/register/register-gnome/gnucash-date-picker.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -77,7 +77,7 @@
gpointer data)
{
/* So the sheet doesn't use it. */
- gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), "button_press_event");
+ g_signal_stop_emission_by_name (widget, "button_press_event");
return TRUE;
}
@@ -91,11 +91,9 @@
{
case GDK_Return:
case GDK_KP_Enter:
- gtk_signal_emit (GTK_OBJECT (date_picker),
- gnc_date_picker_signals[DATE_PICKED]);
+ g_signal_emit (date_picker, gnc_date_picker_signals[DATE_PICKED], 0);
+ g_signal_stop_emission_by_name (widget, "key_press_event");
- gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), "key_press_event");
-
return TRUE;
case GDK_Up:
@@ -111,10 +109,10 @@
}
/* These go to the sheet */
- gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), "key_press_event");
+ g_signal_stop_emission_by_name (widget, "key_press_event");
- gtk_signal_emit (GTK_OBJECT (date_picker),
- gnc_date_picker_signals[KEY_PRESS_EVENT], event);
+ g_signal_emit (date_picker,
+ gnc_date_picker_signals[KEY_PRESS_EVENT], 0, event);
return TRUE;
}
@@ -130,32 +128,32 @@
object_class = GTK_OBJECT_CLASS (date_picker_class);
gnc_date_picker_signals[DATE_SELECTED] =
- gtk_signal_new("date_selected",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE(object_class),
- GTK_SIGNAL_OFFSET(GNCDatePickerClass,
- date_selected),
- gtk_signal_default_marshaller,
- GTK_TYPE_NONE, 0);
+ g_signal_new("date_selected",
+ G_TYPE_FROM_CLASS(object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(GNCDatePickerClass, date_selected),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
gnc_date_picker_signals[DATE_PICKED] =
- gtk_signal_new("date_picked",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE(object_class),
- GTK_SIGNAL_OFFSET(GNCDatePickerClass,
- date_picked),
- gtk_signal_default_marshaller,
- GTK_TYPE_NONE, 0);
+ g_signal_new("date_picked",
+ G_TYPE_FROM_CLASS(object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(GNCDatePickerClass, date_picked),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
gnc_date_picker_signals[KEY_PRESS_EVENT] =
- gtk_signal_new ("key_press_event",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE(object_class),
- GTK_SIGNAL_OFFSET(GNCDatePickerClass,
- key_press_event),
- gtk_marshal_NONE__POINTER,
- GTK_TYPE_NONE, 1,
- GDK_TYPE_EVENT);
+ g_signal_new ("key_press_event",
+ G_TYPE_FROM_CLASS(object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(GNCDatePickerClass, key_press_event),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE, 1,
+ GDK_TYPE_EVENT);
date_picker_class->date_selected = NULL;
date_picker_class->date_picked = NULL;
@@ -193,13 +191,13 @@
static void
day_selected (GtkCalendar *calendar, GNCDatePicker *gdp)
{
- gtk_signal_emit (GTK_OBJECT (gdp), gnc_date_picker_signals [DATE_SELECTED]);
+ g_signal_emit (gdp, gnc_date_picker_signals [DATE_SELECTED], 0);
}
static void
day_selected_double_click (GtkCalendar *calendar, GNCDatePicker *gdp)
{
- gtk_signal_emit (GTK_OBJECT (gdp), gnc_date_picker_signals [DATE_PICKED]);
+ g_signal_emit (gdp, gnc_date_picker_signals [DATE_PICKED], 0);
}
@@ -243,21 +241,21 @@
date_picker->calendar = GTK_CALENDAR (calendar);
- gtk_signal_connect_after (GTK_OBJECT (calendar), "button_press_event",
- GTK_SIGNAL_FUNC (gnc_date_picker_button_event),
- date_picker);
+ g_signal_connect_after (calendar, "button_press_event",
+ G_CALLBACK (gnc_date_picker_button_event),
+ date_picker);
- gtk_signal_connect (GTK_OBJECT (calendar), "key_press_event",
- GTK_SIGNAL_FUNC (gnc_date_picker_key_event),
- date_picker);
+ g_signal_connect (calendar, "key_press_event",
+ G_CALLBACK (gnc_date_picker_key_event),
+ date_picker);
- gtk_signal_connect (GTK_OBJECT (calendar), "day_selected",
- GTK_SIGNAL_FUNC (day_selected),
- date_picker);
+ g_signal_connect (calendar, "day_selected",
+ G_CALLBACK (day_selected),
+ date_picker);
- gtk_signal_connect (GTK_OBJECT (calendar), "day_selected_double_click",
- GTK_SIGNAL_FUNC (day_selected_double_click),
- date_picker);
+ g_signal_connect (calendar, "day_selected_double_click",
+ G_CALLBACK (day_selected_double_click),
+ date_picker);
return item;
}
Modified: gnucash/trunk/src/register/register-gnome/gnucash-item-edit.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/gnucash-item-edit.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/register/register-gnome/gnucash-item-edit.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -1028,7 +1028,7 @@
{
GncItemEdit *item_edit = GNC_ITEM_EDIT (data);
- gtk_signal_emit_stop_by_name (GTK_OBJECT(widget), "key_press_event");
+ g_signal_stop_emission_by_name (widget, "key_press_event");
gtk_widget_event (GTK_WIDGET(item_edit->sheet), (GdkEvent *) event);
@@ -1053,13 +1053,15 @@
if (!gnc_table_confirm_change (table, virt_loc))
{
- gtk_signal_handler_block_by_data
- (GTK_OBJECT (button), data);
+ g_signal_handlers_block_matched
+ (button, G_SIGNAL_MATCH_DATA,
+ 0, 0, NULL, NULL, data);
gtk_toggle_button_set_active (button, FALSE);
- gtk_signal_handler_unblock_by_data
- (GTK_OBJECT (button), data);
+ g_signal_handlers_unblock_matched
+ (button, G_SIGNAL_MATCH_DATA,
+ 0, 0, NULL, NULL, data);
return;
}
@@ -1084,7 +1086,8 @@
obj = GTK_OBJECT (item_edit->popup_toggle.toggle_button);
- gtk_signal_handler_block_by_data (obj, item_edit);
+ g_signal_handlers_block_matched (obj, G_SIGNAL_MATCH_DATA,
+ 0, 0, NULL, NULL, item_edit);
}
@@ -1098,7 +1101,8 @@
obj = GTK_OBJECT (item_edit->popup_toggle.toggle_button);
- gtk_signal_handler_unblock_by_data (obj, item_edit);
+ g_signal_handlers_unblock_matched (obj, G_SIGNAL_MATCH_DATA,
+ 0, 0, NULL, NULL, item_edit);
}
@@ -1114,13 +1118,13 @@
object = GTK_OBJECT(item_edit->popup_toggle.toggle_button);
- gtk_signal_connect (object, "toggled",
- GTK_SIGNAL_FUNC(gnc_item_edit_popup_toggled),
- item_edit);
+ g_signal_connect (object, "toggled",
+ G_CALLBACK(gnc_item_edit_popup_toggled),
+ item_edit);
- gtk_signal_connect (object, "key_press_event",
- GTK_SIGNAL_FUNC(key_press_popup_cb),
- item_edit);
+ g_signal_connect (object, "key_press_event",
+ G_CALLBACK(key_press_popup_cb),
+ item_edit);
item_edit->popup_toggle.signals_connected = TRUE;
}
@@ -1134,8 +1138,9 @@
if (!item_edit->popup_toggle.signals_connected)
return;
- gtk_signal_disconnect_by_data
- (GTK_OBJECT(item_edit->popup_toggle.toggle_button), item_edit);
+ g_signal_handlers_disconnect_matched
+ (item_edit->popup_toggle.toggle_button, G_SIGNAL_MATCH_DATA,
+ 0, 0, NULL, NULL, item_edit);
item_edit->popup_toggle.signals_connected = FALSE;
}
Modified: gnucash/trunk/src/register/register-gnome/gnucash-sheet.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/gnucash-sheet.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/register/register-gnome/gnucash-sheet.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -546,7 +546,7 @@
gnome_canvas_request_redraw (GNOME_CANVAS (sheet), 0, 0,
sheet->width + 1, sheet->height + 1);
- gtk_signal_emit_by_name (GTK_OBJECT (sheet->reg), "redraw_all");
+ g_signal_emit_by_name (sheet->reg, "redraw_all");
}
void
@@ -555,7 +555,7 @@
g_return_if_fail (sheet != NULL);
g_return_if_fail (GNUCASH_IS_SHEET(sheet));
- gtk_signal_emit_by_name (GTK_OBJECT (sheet->reg), "redraw_help");
+ g_signal_emit_by_name (sheet->reg, "redraw_help");
}
void
@@ -1588,8 +1588,7 @@
switch (event->keyval) {
case GDK_Return:
case GDK_KP_Enter:
- gtk_signal_emit_by_name(GTK_OBJECT(sheet->reg),
- "activate_cursor");
+ g_signal_emit_by_name(sheet->reg, "activate_cursor");
return TRUE;
break;
case GDK_Tab:
Modified: gnucash/trunk/src/report/report-gnome/dialog-column-view.c
===================================================================
--- gnucash/trunk/src/report/report-gnome/dialog-column-view.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/report/report-gnome/dialog-column-view.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -241,23 +241,23 @@
glade_xml_signal_connect_data
(xml, "gnc_column_view_edit_add_cb",
- GTK_SIGNAL_FUNC (gnc_column_view_edit_add_cb), r);
+ G_CALLBACK (gnc_column_view_edit_add_cb), r);
glade_xml_signal_connect_data
(xml, "gnc_column_view_edit_remove_cb",
- GTK_SIGNAL_FUNC (gnc_column_view_edit_remove_cb), r);
+ G_CALLBACK (gnc_column_view_edit_remove_cb), r);
glade_xml_signal_connect_data
(xml, "gnc_edit_column_view_move_up_cb",
- GTK_SIGNAL_FUNC (gnc_edit_column_view_move_up_cb), r);
+ G_CALLBACK (gnc_edit_column_view_move_up_cb), r);
glade_xml_signal_connect_data
(xml, "gnc_edit_column_view_move_down_cb",
- GTK_SIGNAL_FUNC (gnc_edit_column_view_move_down_cb), r);
+ G_CALLBACK (gnc_edit_column_view_move_down_cb), r);
glade_xml_signal_connect_data
(xml, "gnc_column_view_edit_size_cb",
- GTK_SIGNAL_FUNC (gnc_column_view_edit_size_cb), r);
+ G_CALLBACK (gnc_column_view_edit_size_cb), r);
editor = glade_xml_get_widget (xml, "view_contents_table");
r->available = GTK_CLIST (glade_xml_get_widget (xml, "available_list"));
Modified: gnucash/trunk/src/report/report-gnome/dialog-style-sheet.c
===================================================================
--- gnucash/trunk/src/report/report-gnome/dialog-style-sheet.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/report/report-gnome/dialog-style-sheet.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -345,10 +345,10 @@
selection = gtk_tree_view_get_selection (ss->list_view);
gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
- gtk_signal_connect(GTK_OBJECT(ss->toplevel), "response",
- GTK_SIGNAL_FUNC(gnc_style_sheet_select_dialog_response_cb), ss);
- gtk_signal_connect(GTK_OBJECT(ss->list_view), "event-after",
- GTK_SIGNAL_FUNC(gnc_style_sheet_select_dialog_event_cb), ss);
+ g_signal_connect(ss->toplevel, "response",
+ G_CALLBACK(gnc_style_sheet_select_dialog_response_cb), ss);
+ g_signal_connect(ss->list_view, "event-after",
+ G_CALLBACK(gnc_style_sheet_select_dialog_event_cb), ss);
gnc_style_sheet_select_dialog_fill(ss);
Modified: gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c
===================================================================
--- gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c 2005-11-30 01:58:05 UTC (rev 12070)
+++ gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c 2005-11-30 04:05:31 UTC (rev 12071)
@@ -342,8 +342,8 @@
gnc_html_show_url(priv->html, type, url_location, url_label, 0);
gnc_window_set_progressbar_window( NULL );
- gtk_signal_connect(GTK_OBJECT(priv->container), "expose_event",
- GTK_SIGNAL_FUNC(gnc_plugin_page_report_expose_event_cb), report);
+ g_signal_connect(priv->container, "expose_event",
+ G_CALLBACK(gnc_plugin_page_report_expose_event_cb), report);
gtk_widget_show_all( GTK_WIDGET(priv->container) );
More information about the gnucash-changes
mailing list