IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Gtk code cleanups: Avoid GtkObject where possible

Browse Source
This commit is contained in:
Geert Janssens 2015-08-22 14:52:57 +02:00
parent 8825d3feb7
commit b182f2f2e4
33 changed files with 66 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gnome-search/search-core-type.c
View File

@ -58,7 +58,7 @@ struct _GNCSearchCoreTypePrivate
#define _PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_SEARCH_CORE_TYPE, GNCSearchCoreTypePrivate))
static GtkObjectClass *parent_class;
static GObjectClass *parent_class;
static GHashTable *typeTable = NULL;

2
src/gnome-search/search-core-type.h
View File

@ -33,7 +33,7 @@
typedef struct
{
GtkObject parent;
GObject parent;
/* This appears to be unused */
GNCSearchParam * param;

4
src/gnome-utils/dialog-account.c
View File

@ -146,7 +146,7 @@ void gnc_account_renumber_prefix_changed_cb (GtkEditable *editable, RenumberDial
void gnc_account_renumber_interval_changed_cb (GtkSpinButton *spinbutton, RenumberDialog *data);
void gnc_account_renumber_response_cb (GtkDialog *dialog, gint response, RenumberDialog *data);
void gnc_account_window_destroy_cb (GtkObject *object, gpointer data);
void gnc_account_window_destroy_cb (GtkWidget *object, gpointer data);
void opening_equity_cb (GtkWidget *w, gpointer data);
void gnc_account_name_changed_cb(GtkWidget *widget, gpointer data);
void gnc_account_color_default_cb(GtkWidget *widget, gpointer data);
@ -970,7 +970,7 @@ gnc_account_window_response_cb (GtkDialog *dialog,
}
void
gnc_account_window_destroy_cb (GtkObject *object, gpointer data)
gnc_account_window_destroy_cb (GtkWidget *object, gpointer data)
{
AccountWindow *aw = data;
Account *account;

2
src/gnome-utils/dialog-book-close.c
View File

@ -254,7 +254,7 @@ static void close_handler(gpointer data)
gtk_widget_destroy(dialog);
}
static void destroy_cb(GtkObject *object, gpointer data)
static void destroy_cb(GObject *object, gpointer data)
{
struct CloseBookWindow *cbw;

4
src/gnome-utils/gnc-date-delta.c
View File

@ -254,9 +254,9 @@ fill_polarity_combo(GNCDateDelta *gdd)
static void
create_children (GNCDateDelta *gdd)
{
GtkObject *adj;
GInitiallyUnowned *adj;
adj = gtk_adjustment_new(1.0, 1.0, 1000.0, 1.0, 5.0, 5.0);
adj = G_INITIALLY_UNOWNED (gtk_adjustment_new(1.0, 1.0, 1000.0, 1.0, 5.0, 5.0));
gdd->value_spin = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 1.0, 0);
gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(gdd->value_spin), TRUE);
gtk_box_pack_start(GTK_BOX(gdd), gdd->value_spin, FALSE, FALSE, 0);

2
src/gnome-utils/gnc-splash.c
View File

@ -38,7 +38,7 @@ static GtkWidget * progress = NULL;
static GtkWidget * progress_bar = NULL;
static void
splash_destroy_cb (GtkObject *object, gpointer user_data)
splash_destroy_cb (GtkWidget *object, gpointer user_data)
{
splash = NULL;
}

2
src/gnome-utils/gnc-tree-model-account.c
View File

@ -131,7 +131,7 @@ gnc_tree_model_account_update_color (gpointer gsettings, gchar *key, gpointer us
/************************************************************/
/** A pointer to the parent class of an account tree model. */
static GtkObjectClass *parent_class = NULL;
static GObjectClass *parent_class = NULL;
GType
gnc_tree_model_account_get_type (void)

2
src/gnome-utils/gnc-tree-model-commodity.c
View File

@ -104,7 +104,7 @@ typedef struct GncTreeModelCommodityPrivate
(G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_TREE_MODEL_COMMODITY, GncTreeModelCommodityPrivate))
/** A pointer to the parent class of a commodity tree model. */
static GtkObjectClass *parent_class = NULL;
static GObjectClass *parent_class = NULL;
GType
gnc_tree_model_commodity_get_type (void)

2
src/gnome-utils/gnc-tree-model-owner.c
View File

@ -130,7 +130,7 @@ gnc_tree_model_owner_update_color (gpointer gsettings, gchar *key, gpointer user
/************************************************************/
/** A pointer to the parent class of an owner tree model. */
static GtkObjectClass *parent_class = NULL;
static GObjectClass *parent_class = NULL;
GType
gnc_tree_model_owner_get_type (void)

2
src/gnome-utils/gnc-tree-model-split-reg.c
View File

@ -227,7 +227,7 @@ gtm_sr_make_iter (GncTreeModelSplitReg *model, gint f, GList *tnode, GList *snod
/************************************************************/
/** A pointer to the parent class of the split register tree model. */
static GtkObjectClass *parent_class = NULL;
static GObjectClass *parent_class = NULL;
GType
gnc_tree_model_split_reg_get_type (void)

2
src/gnome/assistant-acct-period.c
View File

@ -199,7 +199,7 @@ get_close_status_str (AcctPeriodInfo *info)
/* =============================================================== */
static void
ap_assistant_destroy_cb (GtkObject *object, gpointer data)
ap_assistant_destroy_cb (GtkWidget *object, gpointer data)
{
AcctPeriodInfo *info = data;

2
src/gnome/assistant-hierarchy.c
View File

@ -135,7 +135,7 @@ destroy_hash_helper (gpointer key, gpointer value, gpointer user_data)
}
static void
gnc_hierarchy_destroy_cb (GtkObject *obj, hierarchy_data *data)
gnc_hierarchy_destroy_cb (GtkWidget *obj, hierarchy_data *data)
{
GHashTable *hash;

4
src/gnome/assistant-loan.c
View File

@ -306,7 +306,7 @@ typedef struct toCreateSX_
/**************************************************************************/
static void loan_assistant_window_destroy_cb( GtkObject *object, gpointer user_data );
static void loan_assistant_window_destroy_cb( GtkWidget *object, gpointer user_data );
static void loan_assistant_close_handler( gpointer user_data );
static void loan_assistant_data_init( LoanAssistantData *ldd );
@ -382,7 +382,7 @@ loan_assistant_close_handler( gpointer user_data )
static
void
loan_assistant_window_destroy_cb( GtkObject *object, gpointer user_data )
loan_assistant_window_destroy_cb( GtkWidget *object, gpointer user_data )
{
LoanAssistantData *ldd = user_data;

4
src/gnome/assistant-stock-split.c
View File

@ -80,7 +80,7 @@ typedef struct
/** declarations *******************************************************/
void gnc_stock_split_assistant_window_destroy_cb (GtkObject *object, gpointer user_data);
void gnc_stock_split_assistant_window_destroy_cb (GtkWidget *object, gpointer user_data);
void gnc_stock_split_assistant_prepare (GtkAssistant *assistant,
GtkWidget *page,
gpointer user_data);
@ -97,7 +97,7 @@ void gnc_stock_split_assistant_cancel (GtkAssistant *gtkassistant
/******* implementations ***********************************************/
void
gnc_stock_split_assistant_window_destroy_cb (GtkObject *object, gpointer user_data)
gnc_stock_split_assistant_window_destroy_cb (GtkWidget *object, gpointer user_data)
{
StockSplitInfo *info = user_data;

4
src/gnome/dialog-commodities.c
View File

@ -64,14 +64,14 @@ typedef struct
} CommoditiesDialog;
void gnc_commodities_window_destroy_cb (GtkObject *object, CommoditiesDialog *cd);
void gnc_commodities_window_destroy_cb (GtkWidget *object, CommoditiesDialog *cd);
void gnc_commodities_dialog_response (GtkDialog *dialog, gint response, CommoditiesDialog *cd);
void gnc_commodities_show_currencies_toggled (GtkToggleButton *toggle, CommoditiesDialog *cd);
void
gnc_commodities_window_destroy_cb (GtkObject *object, CommoditiesDialog *cd)
gnc_commodities_window_destroy_cb (GtkWidget *object, CommoditiesDialog *cd)
{
gnc_unregister_gui_component_by_data (DIALOG_COMMODITIES_CM_CLASS, cd);

2
src/gnome/dialog-fincalc.c
View File

@ -243,7 +243,7 @@ fincalc_update_calc_button_cb(GtkWidget *unused, FinCalcDialog *fcd)
/* Free the calc button list and free the FinCalcDialog structure. */
static void
fincalc_dialog_destroy(GtkObject *object, gpointer data)
fincalc_dialog_destroy(GObject *object, gpointer data)
{
FinCalcDialog *fcd = data;

4
src/gnome/dialog-lot-viewer.c
View File

@ -121,7 +121,7 @@ static void gnc_split_viewer_fill (GNCLotViewer *lv, GtkListStore *store, SplitL
void lv_title_entry_changed_cb (GtkEntry *ent, gpointer user_data);
void lv_response_cb (GtkDialog *dialog, gint response, gpointer data);
void lv_window_destroy_cb (GtkObject *object, gpointer user_data);
void lv_window_destroy_cb (GtkWidget *object, gpointer user_data);
void lv_paned_notify_cb (GObject *gobject,
GParamSpec *pspec,
gpointer user_data);
@ -659,7 +659,7 @@ lv_selection_changed_cb (GtkTreeSelection *selection,
/* Lot viewer window closed */
void
lv_window_destroy_cb (GtkObject *object, gpointer user_data)
lv_window_destroy_cb (GtkWidget *object, gpointer user_data)
{
GNCLotViewer *lv = user_data;
gnc_close_gui_component_by_data (LOT_VIEWER_CM_CLASS, lv);

4
src/gnome/dialog-price-edit-db.c
View File

@ -59,7 +59,7 @@
static QofLogModule log_module = GNC_MOD_GUI;
void gnc_prices_dialog_window_destroy_cb (GtkObject *object, gpointer data);
void gnc_prices_dialog_window_destroy_cb (GtkWidget *object, gpointer data);
void gnc_prices_dialog_close_cb (GtkDialog *dialog, gpointer data);
void gnc_prices_dialog_response (GtkDialog *dialog, gint response_id, gpointer data);
void gnc_prices_dialog_edit_clicked (GtkWidget *widget, gpointer data);
@ -84,7 +84,7 @@ typedef struct
void
gnc_prices_dialog_window_destroy_cb (GtkObject *object, gpointer data)
gnc_prices_dialog_window_destroy_cb (GtkWidget *object, gpointer data)
{
PricesDialog *pdb_dialog = data;

8
src/gnome/dialog-progress.c
View File

@ -176,7 +176,7 @@ delete_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
static void
destroy_cb(GtkObject *object, gpointer data)
destroy_cb(GtkWidget *object, gpointer data)
{
GNCProgressDialog *progress = data;
@ -196,7 +196,6 @@ static void
gnc_progress_dialog_create(GtkWidget * parent, GNCProgressDialog *progress)
{
GtkWidget *dialog;
GtkObject *tdo;
GtkBuilder *builder;
g_return_if_fail(progress);
@ -207,15 +206,14 @@ gnc_progress_dialog_create(GtkWidget * parent, GNCProgressDialog *progress)
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Progress Dialog"));
progress->dialog = dialog;
tdo = GTK_OBJECT(dialog);
/* parent */
if (parent != NULL)
gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(parent));
g_signal_connect(tdo, "delete_event", G_CALLBACK(delete_cb), progress);
g_signal_connect(G_OBJECT(dialog), "delete_event", G_CALLBACK(delete_cb), progress);
g_signal_connect(tdo, "destroy", G_CALLBACK(destroy_cb), progress);
g_signal_connect(G_OBJECT(dialog), "destroy", G_CALLBACK(destroy_cb), progress);
progress->primary_label = GTK_WIDGET(gtk_builder_get_object (builder, "primary_label"));
gtk_widget_hide(progress->primary_label);

14
src/gnome/dialog-sx-editor.c
View File

@ -153,7 +153,7 @@ static gboolean gnc_sxed_check_consistent( GncSxEditorDialog *sxed );
static gboolean gnc_sxed_check_changed( GncSxEditorDialog *sxed );
static void gnc_sxed_save_sx( GncSxEditorDialog *sxed );
static void gnc_sxed_freq_changed( GncFrequency *gf, gpointer ud );
static void sxed_excal_update_adapt_cb( GtkObject *o, gpointer ud );
static void sxed_excal_update_adapt_cb( GtkWidget *o, gpointer ud );
static void gnc_sxed_update_cal(GncSxEditorDialog *sxed);
void on_sx_check_toggled_cb (GtkWidget *togglebutton, gpointer user_data);
static void gnc_sxed_reg_check_close(GncSxEditorDialog *sxed);
@ -1011,21 +1011,21 @@ gnc_sxed_save_sx( GncSxEditorDialog *sxed )
static void
enabled_toggled_cb( GtkObject *o, GncSxEditorDialog *sxed )
enabled_toggled_cb( GtkToggleButton *o, GncSxEditorDialog *sxed )
{
return;
}
static void
autocreate_toggled_cb( GtkObject *o, GncSxEditorDialog *sxed )
autocreate_toggled_cb( GtkToggleButton *o, GncSxEditorDialog *sxed )
{
if ( !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(o)) )
if ( !gtk_toggle_button_get_active (o) )
{
gtk_toggle_button_set_active( sxed->notifyOpt, FALSE );
}
gtk_widget_set_sensitive( GTK_WIDGET(sxed->notifyOpt),
gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(o) ) );
gtk_toggle_button_get_active (o) );
}
@ -1051,7 +1051,7 @@ remind_toggled_cb( GtkButton *o, GncSxEditorDialog *sxed )
/* Local destruction of dialog */
static void
scheduledxaction_editor_dialog_destroy(GtkObject *object, gpointer data)
scheduledxaction_editor_dialog_destroy(GtkWidget *object, gpointer data)
{
GncSxEditorDialog *sxed = data;
@ -1662,7 +1662,7 @@ gnc_sxed_freq_changed(GncFrequency *gf, gpointer ud)
static void
sxed_excal_update_adapt_cb(GtkObject *o, gpointer ud)
sxed_excal_update_adapt_cb(GtkWidget *o, gpointer ud)
{
gnc_sxed_update_cal((GncSxEditorDialog*)ud);
}

14
src/gnome/dialog-sx-editor2.c
View File

@ -152,7 +152,7 @@ static gboolean gnc_sxed_check_consistent (GncSxEditorDialog2 *sxed);
static gboolean gnc_sxed_check_changed (GncSxEditorDialog2 *sxed);
static void gnc_sxed_save_sx (GncSxEditorDialog2 *sxed);
static void gnc_sxed_freq_changed (GncFrequency *gf, gpointer ud);
static void sxed_excal_update_adapt_cb (GtkObject *o, gpointer ud);
static void sxed_excal_update_adapt_cb (GtkWidget *o, gpointer ud);
static void gnc_sxed_update_cal (GncSxEditorDialog2 *sxed);
static void on_sx_check_toggled_cb (GtkWidget *togglebutton, gpointer user_data);
//void on_sx_check_toggled_cb (GtkWidget *togglebutton, gpointer user_data);
@ -1003,21 +1003,21 @@ gnc_sxed_save_sx (GncSxEditorDialog2 *sxed )
static void
enabled_toggled_cb (GtkObject *o, GncSxEditorDialog2 *sxed)
enabled_toggled_cb (GtkToggleButton *o, GncSxEditorDialog2 *sxed)
{
return;
}
static void
autocreate_toggled_cb (GtkObject *o, GncSxEditorDialog2 *sxed)
autocreate_toggled_cb (GtkToggleButton *o, GncSxEditorDialog2 *sxed)
{
if ( !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(o)))
if ( !gtk_toggle_button_get_active (o))
{
gtk_toggle_button_set_active (sxed->notifyOpt, FALSE);
}
gtk_widget_set_sensitive (GTK_WIDGET (sxed->notifyOpt),
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(o)));
gtk_toggle_button_get_active (o));
}
@ -1043,7 +1043,7 @@ remind_toggled_cb (GtkButton *o, GncSxEditorDialog2 *sxed)
/* Local destruction of dialog */
static void
scheduledxaction_editor_dialog_destroy (GtkObject *object, gpointer data)
scheduledxaction_editor_dialog_destroy (GtkWidget *object, gpointer data)
{
GncSxEditorDialog2 *sxed = data;
@ -1645,7 +1645,7 @@ gnc_sxed_freq_changed (GncFrequency *gf, gpointer ud)
static void
sxed_excal_update_adapt_cb (GtkObject *o, gpointer ud)
sxed_excal_update_adapt_cb (GtkWidget *o, gpointer ud)
{
gnc_sxed_update_cal ((GncSxEditorDialog2*)ud);
}

4
src/gnome/dialog-sx-from-trans.c
View File

@ -139,7 +139,7 @@ sxfti_attach_callbacks(SXFromTransInfo *sxfti)
{
w = GTK_WIDGET(gtk_builder_get_object(sxfti->builder, callbacks[i].name));
g_signal_connect (GTK_OBJECT(w), callbacks[i].signal,
g_signal_connect (G_OBJECT(w), callbacks[i].signal,
G_CALLBACK(callbacks[i].handlerFn),
sxfti );
}
@ -433,7 +433,7 @@ sxftd_init( SXFromTransInfo *sxfti )
start_tt = gnc_time64_get_day_start_gdate (&nextDate);
gnc_date_edit_set_time( sxfti->startDateGDE, start_tt );
g_signal_connect( GTK_OBJECT(sxfti->name), "destroy",
g_signal_connect( G_OBJECT(sxfti->name), "destroy",
G_CALLBACK(sxftd_destroy),
sxfti );

4
src/gnome/dialog-sx-since-last-run.c
View File

@ -126,7 +126,7 @@ GtkTreeModel* gnc_sx_get_slr_state_model(void);
static void _show_created_transactions(GncSxSinceLastRunDialog *app_dialog, GList *created_txn_guids);
static void close_handler(gpointer user_data);
static void dialog_destroy_cb(GtkObject *object, GncSxSinceLastRunDialog *app_dialog);
static void dialog_destroy_cb(GtkWidget *object, GncSxSinceLastRunDialog *app_dialog);
static void dialog_response_cb(GtkDialog *dialog, gint response_id, GncSxSinceLastRunDialog *app_dialog);
/* ------------------------------------------------------------ */
@ -1064,7 +1064,7 @@ close_handler(gpointer user_data)
}
static void
dialog_destroy_cb(GtkObject *object, GncSxSinceLastRunDialog *app_dialog)
dialog_destroy_cb(GtkWidget *object, GncSxSinceLastRunDialog *app_dialog)
{
gnc_unregister_gui_component(app_dialog->component_id);

2
src/gnome/dialog-tax-info.c
View File

@ -741,7 +741,7 @@ identity_edit_destroy_cb (GtkDialog *dialog, gpointer data)
}
static void
window_destroy_cb (GtkObject *object, gpointer data)
window_destroy_cb (GtkWidget *object, gpointer data)
{
TaxInfoDialog *ti_dialog = data;

4
src/gnome/gnc-split-reg.c
View File

@ -233,7 +233,7 @@ static void
gnc_split_reg_class_init( GNCSplitRegClass *klass )
{
int i;
GtkObjectClass *object_class;
GObjectClass *object_class;
static struct similar_signal_info
{
enum gnc_split_reg_signal_enum s;
@ -264,7 +264,7 @@ gnc_split_reg_class_init( GNCSplitRegClass *klass )
{ LAST_SIGNAL, NULL, 0 }
};
object_class = (GtkObjectClass*) klass;
object_class = (GObjectClass*) klass;
for ( i = 0; signals[i].s != INCLUDE_DATE_SIGNAL; i++ )
{

4
src/gnome/gnc-split-reg2.c
View File

@ -140,9 +140,9 @@ static guint gnc_split_reg2_signals[LAST_SIGNAL] = { 0 };
static void
gnc_split_reg2_class_init (GNCSplitReg2Class *klass)
{
GtkObjectClass *object_class;
GObjectClass *object_class;
object_class = (GtkObjectClass*) klass;
object_class = (GObjectClass*) klass;
gnc_split_reg2_signals[HELP_CHANGED] =
g_signal_new("help-changed",

4
src/import-export/aqb/assistant-ab-initial.c
View File

@ -74,7 +74,7 @@ void aai_on_prepare (GtkAssistant *assistant, GtkWidget *page,
void aai_on_finish (GtkAssistant *gtkassistant, gpointer user_data);
void aai_on_cancel (GtkAssistant *assistant, gpointer user_data);
void aai_destroy_cb(GtkObject *object, gpointer user_data);
void aai_destroy_cb(GtkWidget *object, gpointer user_data);
gboolean aai_key_press_event_cb(GtkWidget *widget, GdkEventKey *event, gpointer user_data);
@ -170,7 +170,7 @@ aai_on_cancel (GtkAssistant *gtkassistant, gpointer user_data)
}
void
aai_destroy_cb(GtkObject *object, gpointer user_data)
aai_destroy_cb(GtkWidget *object, gpointer user_data)
{
ABInitialInfo *info = user_data;

2
src/import-export/csv-exp/assistant-csv-export.c
View File

@ -773,7 +773,7 @@ csv_export_assistant_prepare (GtkAssistant *assistant, GtkWidget *page,
* Assistant call back functions
*******************************************************/
static void
csv_export_assistant_destroy_cb (GtkObject *object, gpointer user_data)
csv_export_assistant_destroy_cb (GtkWidget *object, gpointer user_data)
{
CsvExportInfo *info = user_data;
gnc_unregister_gui_component_by_data (ASSISTANT_CSV_EXPORT_CM_CLASS, info);

2
src/import-export/csv-imp/assistant-csv-account-import.c
View File

@ -518,7 +518,7 @@ csv_import_assistant_prepare (GtkAssistant *assistant, GtkWidget *page,
* Assistant call back functions
*******************************************************/
static void
csv_import_assistant_destroy_cb (GtkObject *object, gpointer user_data)
csv_import_assistant_destroy_cb (GtkWidget *object, gpointer user_data)
{
CsvImportInfo *info = user_data;
gnc_unregister_gui_component_by_data (ASSISTANT_CSV_IMPORT_CM_CLASS, info);

2
src/import-export/csv-imp/assistant-csv-trans-import.c
View File

@ -1613,7 +1613,7 @@ csv_import_trans_assistant_prepare (GtkAssistant *assistant, GtkWidget *page,
* Assistant call back functions
*******************************************************/
static void
csv_import_trans_assistant_destroy_cb (GtkObject *object, gpointer user_data)
csv_import_trans_assistant_destroy_cb (GtkWidget *object, gpointer user_data)
{
CsvImportTrans *info = user_data;
gnc_unregister_gui_component_by_data (ASSISTANT_CSV_IMPORT_TRANS_CM_CLASS, info);

4
src/import-export/qif-imp/assistant-qif-import.c
View File

@ -200,7 +200,7 @@ struct _qifassistantpage
typedef struct _qifassistantpage QIFAssistantPage;
static void gnc_ui_qif_import_assistant_destroy (GtkObject *object, gpointer user_data);
static void gnc_ui_qif_import_assistant_destroy (GtkWidget *object, gpointer user_data);
static void gnc_ui_qif_import_assistant_close_handler (gpointer user_data );
void gnc_ui_qif_import_cancel_cb (GtkAssistant *gtkassistant, gpointer user_data);
@ -421,7 +421,7 @@ gnc_ui_qif_import_commodity_destroy(QIFImportWindow * wind)
* close the QIF Import assistant window
**********************************************/
static void
gnc_ui_qif_import_assistant_destroy(GtkObject *object, gpointer user_data)
gnc_ui_qif_import_assistant_destroy(GtkWidget *object, gpointer user_data)
{
QIFImportWindow * wind = user_data;

4
src/register/register-gnome/gnucash-date-picker.c
View File

@ -119,12 +119,12 @@ gnc_date_picker_key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
static void
gnc_date_picker_class_init (GNCDatePickerClass *date_picker_class)
{
GtkObjectClass *object_class;
GObjectClass *object_class;
gnc_date_picker_parent_class =
g_type_class_peek_parent (date_picker_class);
object_class = GTK_OBJECT_CLASS (date_picker_class);
object_class = G_OBJECT_CLASS (date_picker_class);
gnc_date_picker_signals[DATE_SELECTED] =
g_signal_new("date_selected",

12
src/register/register-gnome/gnucash-item-edit.c
View File

@ -993,12 +993,12 @@ gnc_item_edit_popup_toggled (GtkToggleButton *button, gpointer data)
static void
block_toggle_signals(GncItemEdit *item_edit)
{
GtkObject *obj;
GObject *obj;
if (!item_edit->popup_toggle.signals_connected)
return;
obj = GTK_OBJECT (item_edit->popup_toggle.toggle_button);
obj = G_OBJECT (item_edit->popup_toggle.toggle_button);
g_signal_handlers_block_matched (obj, G_SIGNAL_MATCH_DATA,
0, 0, NULL, NULL, item_edit);
@ -1008,12 +1008,12 @@ block_toggle_signals(GncItemEdit *item_edit)
static void
unblock_toggle_signals(GncItemEdit *item_edit)
{
GtkObject *obj;
GObject *obj;
if (!item_edit->popup_toggle.signals_connected)
return;
obj = GTK_OBJECT (item_edit->popup_toggle.toggle_button);
obj = G_OBJECT (item_edit->popup_toggle.toggle_button);
g_signal_handlers_unblock_matched (obj, G_SIGNAL_MATCH_DATA,
0, 0, NULL, NULL, item_edit);
@ -1023,14 +1023,14 @@ unblock_toggle_signals(GncItemEdit *item_edit)
static void
connect_popup_toggle_signals (GncItemEdit *item_edit)
{
GtkObject *object;
GObject *object;
g_return_if_fail(GNC_IS_ITEM_EDIT(item_edit));
if (item_edit->popup_toggle.signals_connected)
return;
object = GTK_OBJECT(item_edit->popup_toggle.toggle_button);
object = G_OBJECT(item_edit->popup_toggle.toggle_button);
g_signal_connect (object, "toggled",
G_CALLBACK(gnc_item_edit_popup_toggled),