diff options
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/color_dlg.c | 98 | ||||
-rw-r--r-- | gtk/color_edit_dlg.c | 74 | ||||
-rw-r--r-- | gtk/dfilter_expr_dlg.c | 78 | ||||
-rw-r--r-- | gtk/filter_dlg.c | 102 | ||||
-rw-r--r-- | gtk/find_dlg.c | 78 | ||||
-rw-r--r-- | gtk/gui_prefs.c | 62 | ||||
-rw-r--r-- | gtk/layout_prefs.c | 74 | ||||
-rw-r--r-- | gtk/rtp_analysis.c | 72 | ||||
-rw-r--r-- | gtk/simple_dialog.c | 46 | ||||
-rw-r--r-- | gtk/tcp_graph.c | 62 |
10 files changed, 373 insertions, 373 deletions
diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c index 87d4d4080c..893c27c6ea 100644 --- a/gtk/color_dlg.c +++ b/gtk/color_dlg.c @@ -214,7 +214,7 @@ colorize_dialog_new (char *filter) * Default size is set so that it should fit into every usual screen resolution. * All other widgets are always packed depending on the current window size. */ color_win = dlg_window_new ("Wireshark: Coloring Rules"); - OBJECT_SET_DATA(color_win, "color_win", color_win); + g_object_set_data(G_OBJECT(color_win), "color_win", color_win); gtk_window_set_default_size(GTK_WINDOW(color_win), DEF_WIDTH, DEF_HEIGHT * 2/3); dlg_vbox = gtk_vbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (dlg_vbox), 5); @@ -365,21 +365,21 @@ colorize_dialog_new (char *filter) } gtk_box_pack_start (GTK_BOX (dlg_vbox), button_ok_hbox, FALSE, FALSE, 5); - color_ok = OBJECT_GET_DATA(button_ok_hbox, GTK_STOCK_OK); + color_ok = g_object_get_data(G_OBJECT(button_ok_hbox), GTK_STOCK_OK); gtk_tooltips_set_tip (tooltips, color_ok, ("Apply the color filters to the display and close this dialog"), NULL); - color_apply = OBJECT_GET_DATA(button_ok_hbox, GTK_STOCK_APPLY); + color_apply = g_object_get_data(G_OBJECT(button_ok_hbox), GTK_STOCK_APPLY); gtk_tooltips_set_tip (tooltips, color_apply, ("Apply the color filters to the display and keep this dialog open"), NULL); - color_save = OBJECT_GET_DATA(button_ok_hbox, GTK_STOCK_SAVE); + color_save = g_object_get_data(G_OBJECT(button_ok_hbox), GTK_STOCK_SAVE); gtk_tooltips_set_tip (tooltips, color_save, ("Save the color filters permanently and keep this dialog open"), NULL); - color_cancel = OBJECT_GET_DATA(button_ok_hbox, GTK_STOCK_CANCEL); + color_cancel = g_object_get_data(G_OBJECT(button_ok_hbox), GTK_STOCK_CANCEL); window_set_cancel_button(color_win, color_cancel, color_cancel_cb); gtk_tooltips_set_tip (tooltips, color_cancel, ("Cancel changes done (since last \"Apply\") and close this dialog"), NULL); if(topic_available(HELP_COLORING_RULES_DIALOG)) { - color_help = OBJECT_GET_DATA(button_ok_hbox, GTK_STOCK_HELP); + color_help = g_object_get_data(G_OBJECT(button_ok_hbox), GTK_STOCK_HELP); gtk_tooltips_set_tip (tooltips, color_help, ("Get help about this dialog"), NULL); SIGNAL_CONNECT(color_help, "clicked", topic_cb, HELP_COLORING_RULES_DIALOG); } @@ -388,33 +388,33 @@ colorize_dialog_new (char *filter) /* signals and such */ SIGNAL_CONNECT(color_win, "destroy", color_destroy_cb, NULL); - OBJECT_SET_DATA(color_filter_up, COLOR_FILTERS_CL, color_filters); + g_object_set_data(G_OBJECT(color_filter_up), COLOR_FILTERS_CL, color_filters); SIGNAL_CONNECT(color_filter_up, "clicked", color_filter_up_cb, NULL); - OBJECT_SET_DATA(color_filter_down, COLOR_FILTERS_CL, color_filters); + g_object_set_data(G_OBJECT(color_filter_down), COLOR_FILTERS_CL, color_filters); SIGNAL_CONNECT(color_filter_down, "clicked", color_filter_down_cb, NULL); SIGNAL_CONNECT(selection, "changed", remember_selected_row, color_filters); SIGNAL_CONNECT(color_filters, "button_press_event", color_filters_button_cb, NULL); - OBJECT_SET_DATA(color_filters, COLOR_UP_LB, color_filter_up); - OBJECT_SET_DATA(color_filters, COLOR_DOWN_LB, color_filter_down); - OBJECT_SET_DATA(color_filters, COLOR_EDIT_LB, color_edit); - OBJECT_SET_DATA(color_filters, COLOR_ENABLE_LB, color_enable); - OBJECT_SET_DATA(color_filters, COLOR_DISABLE_LB, color_disable); - OBJECT_SET_DATA(color_filters, COLOR_DELETE_LB, color_delete); - OBJECT_SET_DATA(color_new, COLOR_FILTERS_CL, color_filters); + g_object_set_data(G_OBJECT(color_filters), COLOR_UP_LB, color_filter_up); + g_object_set_data(G_OBJECT(color_filters), COLOR_DOWN_LB, color_filter_down); + g_object_set_data(G_OBJECT(color_filters), COLOR_EDIT_LB, color_edit); + g_object_set_data(G_OBJECT(color_filters), COLOR_ENABLE_LB, color_enable); + g_object_set_data(G_OBJECT(color_filters), COLOR_DISABLE_LB, color_disable); + g_object_set_data(G_OBJECT(color_filters), COLOR_DELETE_LB, color_delete); + g_object_set_data(G_OBJECT(color_new), COLOR_FILTERS_CL, color_filters); SIGNAL_CONNECT(color_new, "clicked", color_new_cb, NULL); - OBJECT_SET_DATA(color_edit, COLOR_FILTERS_CL, color_filters); + g_object_set_data(G_OBJECT(color_edit), COLOR_FILTERS_CL, color_filters); SIGNAL_CONNECT(color_edit, "clicked", color_edit_cb, NULL); - OBJECT_SET_DATA(color_enable, COLOR_FILTERS_CL, color_filters); + g_object_set_data(G_OBJECT(color_enable), COLOR_FILTERS_CL, color_filters); SIGNAL_CONNECT(color_enable, "clicked", color_disable_cb, FALSE); - OBJECT_SET_DATA(color_disable, COLOR_FILTERS_CL, color_filters); + g_object_set_data(G_OBJECT(color_disable), COLOR_FILTERS_CL, color_filters); SIGNAL_CONNECT(color_disable, "clicked", color_disable_cb, TRUE); - OBJECT_SET_DATA(color_delete, COLOR_EDIT_LB, color_edit); - OBJECT_SET_DATA(color_delete, COLOR_FILTERS_CL, color_filters); + g_object_set_data(G_OBJECT(color_delete), COLOR_EDIT_LB, color_edit); + g_object_set_data(G_OBJECT(color_delete), COLOR_FILTERS_CL, color_filters); SIGNAL_CONNECT(color_delete, "clicked", color_delete_cb, NULL); SIGNAL_CONNECT(color_export, "clicked", color_export_cb, NULL); - OBJECT_SET_DATA(color_import, COLOR_FILTERS_CL, color_filters); + g_object_set_data(G_OBJECT(color_import), COLOR_FILTERS_CL, color_filters); SIGNAL_CONNECT(color_import, "clicked", color_import_cb, NULL); - OBJECT_SET_DATA(color_clear, COLOR_FILTERS_CL, color_filters); + g_object_set_data(G_OBJECT(color_clear), COLOR_FILTERS_CL, color_filters); SIGNAL_CONNECT(color_clear, "clicked", color_clear_cb, NULL); SIGNAL_CONNECT(color_ok, "clicked", color_ok_cb, NULL); SIGNAL_CONNECT(color_apply, "clicked", color_apply_cb, NULL); @@ -426,7 +426,7 @@ colorize_dialog_new (char *filter) /* prepare filter list content */ color_filters_clone(color_filters); - OBJECT_SET_DATA(color_win, COLOR_FILTER_LIST, &color_filter_edit_list); + g_object_set_data(G_OBJECT(color_win), COLOR_FILTER_LIST, &color_filter_edit_list); gtk_widget_show_all(color_win); @@ -504,7 +504,7 @@ color_filter_up_cb(GtkButton *button, gpointer user_data _U_) GtkTreeSelection *sel; amount = -1; - color_filters = (GtkWidget *)OBJECT_GET_DATA(button, COLOR_FILTERS_CL); + color_filters = (GtkWidget *)g_object_get_data(G_OBJECT(button), COLOR_FILTERS_CL); for (filter_number = 0; filter_number < num_of_filters; filter_number++) { @@ -529,7 +529,7 @@ color_filter_down_cb(GtkButton *button, gpointer user_data _U_) GtkTreeModel *model; amount = +1; - color_filters = (GtkWidget *)OBJECT_GET_DATA(button, COLOR_FILTERS_CL); + color_filters = (GtkWidget *)g_object_get_data(G_OBJECT(button), COLOR_FILTERS_CL); for (filter_number = num_of_filters - 1; filter_number >= 0; filter_number--) { @@ -613,28 +613,28 @@ remember_selected_row(GtkTreeSelection *sel, gpointer color_filters) */ /* We can only edit if there is exactly one filter selected */ - button = (GtkWidget *)OBJECT_GET_DATA(color_filters, COLOR_EDIT_LB); + button = (GtkWidget *)g_object_get_data(G_OBJECT(color_filters), COLOR_EDIT_LB); gtk_widget_set_sensitive (button, data.count == 1); /* We can enable any number of filters */ - button = (GtkWidget *)OBJECT_GET_DATA(color_filters, COLOR_ENABLE_LB); + button = (GtkWidget *)g_object_get_data(G_OBJECT(color_filters), COLOR_ENABLE_LB); gtk_widget_set_sensitive (button, !data.all_enabled); /* We can disable any number of filters */ - button = (GtkWidget *)OBJECT_GET_DATA(color_filters, COLOR_DISABLE_LB); + button = (GtkWidget *)g_object_get_data(G_OBJECT(color_filters), COLOR_DISABLE_LB); gtk_widget_set_sensitive (button, !data.all_disabled); /* We can delete any number of filters */ - button = (GtkWidget *)OBJECT_GET_DATA(color_filters, COLOR_DELETE_LB); + button = (GtkWidget *)g_object_get_data(G_OBJECT(color_filters), COLOR_DELETE_LB); gtk_widget_set_sensitive (button, TRUE); /* * We can move them up *if* one of them isn't the top row, * and move them down *if* one of them isn't the bottom row. */ - button = (GtkWidget *)OBJECT_GET_DATA(color_filters, COLOR_UP_LB); + button = (GtkWidget *)g_object_get_data(G_OBJECT(color_filters), COLOR_UP_LB); gtk_widget_set_sensitive(button, !data.first_selected); - button = (GtkWidget *)OBJECT_GET_DATA(color_filters, COLOR_DOWN_LB); + button = (GtkWidget *)g_object_get_data(G_OBJECT(color_filters), COLOR_DOWN_LB); gtk_widget_set_sensitive(button, !data.last_selected); } else @@ -646,18 +646,18 @@ remember_selected_row(GtkTreeSelection *sel, gpointer color_filters) * selected row. */ if (!row_is_moving) { - button = (GtkWidget *)OBJECT_GET_DATA(color_filters, COLOR_UP_LB); + button = (GtkWidget *)g_object_get_data(G_OBJECT(color_filters), COLOR_UP_LB); gtk_widget_set_sensitive (button, FALSE); - button = (GtkWidget *)OBJECT_GET_DATA(color_filters, COLOR_DOWN_LB); + button = (GtkWidget *)g_object_get_data(G_OBJECT(color_filters), COLOR_DOWN_LB); gtk_widget_set_sensitive (button, FALSE); } - button = (GtkWidget *)OBJECT_GET_DATA(color_filters, COLOR_EDIT_LB); + button = (GtkWidget *)g_object_get_data(G_OBJECT(color_filters), COLOR_EDIT_LB); gtk_widget_set_sensitive (button, FALSE); - button = (GtkWidget *)OBJECT_GET_DATA(color_filters, COLOR_ENABLE_LB); + button = (GtkWidget *)g_object_get_data(G_OBJECT(color_filters), COLOR_ENABLE_LB); gtk_widget_set_sensitive (button, FALSE); - button = (GtkWidget *)OBJECT_GET_DATA(color_filters, COLOR_DISABLE_LB); + button = (GtkWidget *)g_object_get_data(G_OBJECT(color_filters), COLOR_DISABLE_LB); gtk_widget_set_sensitive (button, FALSE); - button = (GtkWidget *)OBJECT_GET_DATA(color_filters, COLOR_DELETE_LB); + button = (GtkWidget *)g_object_get_data(G_OBJECT(color_filters), COLOR_DELETE_LB); gtk_widget_set_sensitive (button, FALSE); } } @@ -761,7 +761,7 @@ create_new_color_filter(GtkButton *button, const char *filter) GtkWidget *color_filters; GtkTreeSelection *sel; - color_filters = (GtkWidget *)OBJECT_GET_DATA(button, COLOR_FILTERS_CL); + color_filters = (GtkWidget *)g_object_get_data(G_OBJECT(button), COLOR_FILTERS_CL); /* unselect all filters */ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(color_filters)); @@ -797,7 +797,7 @@ color_edit_cb(GtkButton *button, gpointer user_data _U_) { GtkWidget *color_filters; - color_filters = (GtkWidget *)OBJECT_GET_DATA(button, COLOR_FILTERS_CL); + color_filters = (GtkWidget *)g_object_get_data(G_OBJECT(button), COLOR_FILTERS_CL); g_assert(row_selected != -1); edit_color_filter_dialog(color_filters, FALSE /* is not a new filter */); } @@ -830,7 +830,7 @@ color_disable_cb(GtkWidget *widget, gboolean action_disable) GtkTreeModel *model; GtkTreeSelection *sel; - color_filters = (GtkWidget *)OBJECT_GET_DATA(widget, COLOR_FILTERS_CL); + color_filters = (GtkWidget *)g_object_get_data(G_OBJECT(widget), COLOR_FILTERS_CL); for (filter_number = 0; filter_number < num_of_filters; filter_number++) { @@ -843,9 +843,9 @@ color_disable_cb(GtkWidget *widget, gboolean action_disable) gtk_list_store_set(GTK_LIST_STORE(model), &iter, 4, action_disable, -1); } } - button = (GtkWidget *)OBJECT_GET_DATA(color_filters, COLOR_ENABLE_LB); + button = (GtkWidget *)g_object_get_data(G_OBJECT(color_filters), COLOR_ENABLE_LB); gtk_widget_set_sensitive(button, action_disable); - button = (GtkWidget *)OBJECT_GET_DATA(color_filters, COLOR_DISABLE_LB); + button = (GtkWidget *)g_object_get_data(G_OBJECT(color_filters), COLOR_DISABLE_LB); gtk_widget_set_sensitive(button, !action_disable); } @@ -887,11 +887,11 @@ color_delete_cb(GtkWidget *widget, gpointer user_data _U_) { GtkWidget *color_filters; gint row, num_filters; - GtkTreeModel *model; - GtkTreeIter iter; - GtkTreeSelection *sel; + GtkTreeModel *model; + GtkTreeIter iter; + GtkTreeSelection *sel; - color_filters = (GtkWidget *)OBJECT_GET_DATA(widget, COLOR_FILTERS_CL); + color_filters = (GtkWidget *)g_object_get_data(G_OBJECT(widget), COLOR_FILTERS_CL); /* get the number of filters in the list */ model = gtk_tree_view_get_model(GTK_TREE_VIEW(color_filters)); @@ -913,7 +913,7 @@ color_export_cb(GtkButton *button, gpointer data _U_) { GtkWidget *color_filters; - color_filters = (GtkWidget *)OBJECT_GET_DATA(button, COLOR_FILTERS_CL); + color_filters = (GtkWidget *)g_object_get_data(G_OBJECT(button), COLOR_FILTERS_CL); file_color_export_cmd_cb(color_filters, color_filter_edit_list); } @@ -925,7 +925,7 @@ color_import_cb(GtkButton *button, gpointer data _U_) GtkWidget *color_filters; GtkTreeSelection *sel; - color_filters = (GtkWidget *)OBJECT_GET_DATA(button, COLOR_FILTERS_CL); + color_filters = (GtkWidget *)g_object_get_data(G_OBJECT(button), COLOR_FILTERS_CL); sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(color_filters)); gtk_tree_selection_unselect_all (sel); @@ -940,7 +940,7 @@ color_clear_cmd(GtkWidget *widget) { GtkWidget * color_filters; - color_filters = (GtkWidget *)OBJECT_GET_DATA(widget, COLOR_FILTERS_CL); + color_filters = (GtkWidget *)g_object_get_data(G_OBJECT(widget), COLOR_FILTERS_CL); while (num_of_filters > 0) { diff --git a/gtk/color_edit_dlg.c b/gtk/color_edit_dlg.c index 8196685efb..fc6ed5eb4a 100644 --- a/gtk/color_edit_dlg.c +++ b/gtk/color_edit_dlg.c @@ -138,7 +138,7 @@ edit_color_filter_dialog(GtkWidget *color_filters, /* dialog window */ edit_dialog = dlg_window_new ("Wireshark: Edit Color Filter"); gtk_window_set_default_size(GTK_WINDOW(edit_dialog), 500, -1); - OBJECT_SET_DATA(edit_dialog, "edit_dialog", edit_dialog); + g_object_set_data(G_OBJECT(edit_dialog), "edit_dialog", edit_dialog); colorf->edit_dialog = edit_dialog; dialog_vbox = gtk_vbox_new (FALSE, 0); @@ -235,31 +235,31 @@ edit_color_filter_dialog(GtkWidget *color_filters, gtk_box_pack_start(GTK_BOX(dialog_vbox), bbox, FALSE, FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (bbox), 0); - edit_color_filter_ok = OBJECT_GET_DATA(bbox, GTK_STOCK_OK); + edit_color_filter_ok = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); gtk_tooltips_set_tip (tooltips, edit_color_filter_ok, ("Accept filter color change"), NULL); - edit_color_filter_cancel = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL); + edit_color_filter_cancel = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); gtk_tooltips_set_tip (tooltips, edit_color_filter_cancel, ("Reject filter color change"), NULL); gtk_widget_grab_default(edit_color_filter_ok); /* signals and such */ - OBJECT_SET_DATA(edit_dialog, COLOR_FILTER, colorf); + g_object_set_data(G_OBJECT(edit_dialog), COLOR_FILTER, colorf); SIGNAL_CONNECT(edit_dialog, "destroy", edit_color_filter_destroy_cb, NULL); - OBJECT_SET_DATA(colorize_filter_fg, COLOR_FILTER, colorf); + g_object_set_data(G_OBJECT(colorize_filter_fg), COLOR_FILTER, colorf); SIGNAL_CONNECT(colorize_filter_fg, "clicked", edit_color_filter_fg_cb, NULL); - OBJECT_SET_DATA(colorize_filter_bg, COLOR_FILTER, colorf); + g_object_set_data(G_OBJECT(colorize_filter_bg), COLOR_FILTER, colorf); SIGNAL_CONNECT(colorize_filter_bg, "clicked", edit_color_filter_bg_cb, NULL); - OBJECT_SET_DATA(disabled_cb, COLOR_FILTER, colorf); + g_object_set_data(G_OBJECT(disabled_cb), COLOR_FILTER, colorf); /* SIGNAL_CONNECT(disabled_cb, "clicked", edit_disabled_cb_cb, NULL);*/ - OBJECT_SET_DATA(edit_color_filter_ok, COLOR_FILTERS_CL, color_filters); - OBJECT_SET_DATA(edit_color_filter_ok, COLOR_FILTER, colorf); + g_object_set_data(G_OBJECT(edit_color_filter_ok), COLOR_FILTERS_CL, color_filters); + g_object_set_data(G_OBJECT(edit_color_filter_ok), COLOR_FILTER, colorf); SIGNAL_CONNECT(edit_color_filter_ok, "clicked", edit_color_filter_ok_cb, edit_dialog); /* set callback to delete new filters if cancel chosen */ if (is_new_filter) { - OBJECT_SET_DATA(edit_color_filter_cancel, COLOR_FILTERS_CL, color_filters); + g_object_set_data(G_OBJECT(edit_color_filter_cancel), COLOR_FILTERS_CL, color_filters); SIGNAL_CONNECT(edit_color_filter_cancel, "clicked", edit_new_color_filter_cancel_cb, edit_dialog); } @@ -281,14 +281,14 @@ edit_color_filter_destroy_cb(GObject *object, gpointer user_data _U_) color_filter_t *colorf; GtkWidget *color_sel; - colorf = (color_filter_t *)OBJECT_GET_DATA(object, COLOR_FILTER); + colorf = (color_filter_t *)g_object_get_data(G_OBJECT(object), COLOR_FILTER); colorf->edit_dialog = NULL; /* Destroy any color selection dialogs this dialog had open. */ - color_sel = (GtkWidget *)OBJECT_GET_DATA(object, COLOR_SELECTION_FG); + color_sel = (GtkWidget *)g_object_get_data(G_OBJECT(object), COLOR_SELECTION_FG); if (color_sel != NULL) window_destroy(color_sel); - color_sel = (GtkWidget *)OBJECT_GET_DATA(object, COLOR_SELECTION_BG); + color_sel = (GtkWidget *)g_object_get_data(G_OBJECT(object), COLOR_SELECTION_BG); if (color_sel != NULL) window_destroy(color_sel); } @@ -300,9 +300,9 @@ edit_color_filter_fg_cb(GtkButton *button, gpointer user_data _U_) color_filter_t *colorf; GtkWidget *color_selection_fg; - colorf = (color_filter_t *)OBJECT_GET_DATA(button, COLOR_FILTER); + colorf = (color_filter_t *)g_object_get_data(G_OBJECT(button), COLOR_FILTER); /* Do we already have one open for this dialog? */ - color_selection_fg = OBJECT_GET_DATA(colorf->edit_dialog, COLOR_SELECTION_FG); + color_selection_fg = g_object_get_data(G_OBJECT(colorf->edit_dialog), COLOR_SELECTION_FG); if (color_selection_fg != NULL) { /* Yes. Just reactivate it. */ reactivate_window(color_selection_fg); @@ -310,8 +310,8 @@ edit_color_filter_fg_cb(GtkButton *button, gpointer user_data _U_) /* No. Create a new color selection box, and associate it with this dialog. */ color_selection_fg = color_sel_win_new(colorf, FALSE); - OBJECT_SET_DATA(colorf->edit_dialog, COLOR_SELECTION_FG, color_selection_fg); - OBJECT_SET_DATA(color_selection_fg, COLOR_SELECTION_PARENT, colorf->edit_dialog); + g_object_set_data(G_OBJECT(colorf->edit_dialog), COLOR_SELECTION_FG, color_selection_fg); + g_object_set_data(G_OBJECT(color_selection_fg), COLOR_SELECTION_PARENT, colorf->edit_dialog); } } @@ -323,9 +323,9 @@ edit_color_filter_bg_cb (GtkButton *button, color_filter_t *colorf; GtkWidget *color_selection_bg; - colorf = (color_filter_t *)OBJECT_GET_DATA(button, COLOR_FILTER); + colorf = (color_filter_t *)g_object_get_data(G_OBJECT(button), COLOR_FILTER); /* Do we already have one open for this dialog? */ - color_selection_bg = OBJECT_GET_DATA(colorf->edit_dialog, COLOR_SELECTION_BG); + color_selection_bg = g_object_get_data(G_OBJECT(colorf->edit_dialog), COLOR_SELECTION_BG); if (color_selection_bg != NULL) { /* Yes. Just reactivate it. */ reactivate_window(color_selection_bg); @@ -333,8 +333,8 @@ edit_color_filter_bg_cb (GtkButton *button, /* No. Create a new color selection box, and associate it with this dialog. */ color_selection_bg = color_sel_win_new(colorf, TRUE); - OBJECT_SET_DATA(colorf->edit_dialog, COLOR_SELECTION_BG, color_selection_bg); - OBJECT_SET_DATA(color_selection_bg, COLOR_SELECTION_PARENT, colorf->edit_dialog); + g_object_set_data(G_OBJECT(colorf->edit_dialog), COLOR_SELECTION_BG, color_selection_bg); + g_object_set_data(G_OBJECT(color_selection_bg), COLOR_SELECTION_PARENT, colorf->edit_dialog); } } @@ -346,7 +346,7 @@ edit_disabled_cb_cb (GtkButton *button, { color_filter_t *colorf; - colorf = (color_filter_t *)OBJECT_GET_DATA(button, COLOR_FILTER); + colorf = (color_filter_t *)g_object_get_data(G_OBJECT(button), COLOR_FILTER); colorf->disabled = GTK_TOGGLE_BUTTON (button)->active; printf("Colorfilter %s is now %s\n",colorf->filter_name,colorf->disabled?"disabled":"enabled"); @@ -397,8 +397,8 @@ edit_color_filter_ok_cb (GtkButton *button, " Please try again. Filter unchanged.\n%s\n", filter_name, dfilter_error_msg); } else { - color_filters = (GtkWidget *)OBJECT_GET_DATA(button, COLOR_FILTERS_CL); - colorf = (color_filter_t *)OBJECT_GET_DATA(button, COLOR_FILTER); + color_filters = (GtkWidget *)g_object_get_data(G_OBJECT(button), COLOR_FILTERS_CL); + colorf = (color_filter_t *)g_object_get_data(G_OBJECT(button), COLOR_FILTER); if (colorf->filter_name != NULL) g_free(colorf->filter_name); @@ -432,7 +432,7 @@ static void edit_new_color_filter_cancel_cb(GtkButton *button, gpointer user_data _U_) { /* Delete the entry. As a side effect this destroys the edit_dialog window. */ - color_delete(num_of_filters-1, (GtkWidget*)OBJECT_GET_DATA(button, COLOR_FILTERS_CL)); + color_delete(num_of_filters-1, (GtkWidget*)g_object_get_data(G_OBJECT(button), COLOR_FILTERS_CL)); } static GtkWidget* @@ -457,7 +457,7 @@ color_sel_win_new(color_filter_t *colorf, gboolean is_bg) } color_sel_win = gtk_color_selection_dialog_new(title); g_free(title); - OBJECT_SET_DATA(color_sel_win, "color_sel_win", color_sel_win); + g_object_set_data(G_OBJECT(color_sel_win), "color_sel_win", color_sel_win); gtk_container_set_border_width (GTK_CONTAINER (color_sel_win), 10); if (color != NULL) { @@ -468,11 +468,11 @@ color_sel_win_new(color_filter_t *colorf, gboolean is_bg) } color_sel_ok = GTK_COLOR_SELECTION_DIALOG (color_sel_win)->ok_button; - OBJECT_SET_DATA(color_sel_win, "color_sel_ok", color_sel_ok); + g_object_set_data(G_OBJECT(color_sel_win), "color_sel_ok", color_sel_ok); GTK_WIDGET_SET_FLAGS (color_sel_ok, GTK_CAN_DEFAULT); color_sel_cancel = GTK_COLOR_SELECTION_DIALOG (color_sel_win)->cancel_button; - OBJECT_SET_DATA(color_sel_win, "color_sel_cancel", color_sel_cancel); + g_object_set_data(G_OBJECT(color_sel_win), "color_sel_cancel", color_sel_cancel); GTK_WIDGET_SET_FLAGS (color_sel_cancel, GTK_CAN_DEFAULT); window_set_cancel_button(color_sel_win, color_sel_cancel, NULL); /* ensure esc does req'd local cxl action. */ /* esc as handled by the */ @@ -480,7 +480,7 @@ color_sel_win_new(color_filter_t *colorf, gboolean is_bg) /* doesn't result in this happening. */ color_sel_help = GTK_COLOR_SELECTION_DIALOG (color_sel_win)->help_button; - OBJECT_SET_DATA(color_sel_win, "color_sel_help", color_sel_help); + g_object_set_data(G_OBJECT(color_sel_win), "color_sel_help", color_sel_help); GTK_WIDGET_SET_FLAGS (color_sel_help, GTK_CAN_DEFAULT); @@ -499,20 +499,20 @@ color_sel_win_destroy(GtkWidget *sel_win) GtkWidget *color_selection_fg, *color_selection_bg; /* Find the "Edit color filter" dialog box with which this is associated. */ - parent = (GtkWidget *)OBJECT_GET_DATA(sel_win, COLOR_SELECTION_PARENT); + parent = (GtkWidget *)g_object_get_data(G_OBJECT(sel_win), COLOR_SELECTION_PARENT); /* Find that dialog box's foreground and background color selection boxes, if any. */ - color_selection_fg = OBJECT_GET_DATA(parent, COLOR_SELECTION_FG); - color_selection_bg = OBJECT_GET_DATA(parent, COLOR_SELECTION_BG); + color_selection_fg = g_object_get_data(G_OBJECT(parent), COLOR_SELECTION_FG); + color_selection_bg = g_object_get_data(G_OBJECT(parent), COLOR_SELECTION_BG); if (sel_win == color_selection_fg) { /* This was its foreground color selection box; it isn't, anymore. */ - OBJECT_SET_DATA(parent, COLOR_SELECTION_FG, NULL); + g_object_set_data(G_OBJECT(parent), COLOR_SELECTION_FG, NULL); } if (sel_win == color_selection_bg) { /* This was its background color selection box; it isn't, anymore. */ - OBJECT_SET_DATA(parent, COLOR_SELECTION_BG, NULL); + g_object_set_data(G_OBJECT(parent), COLOR_SELECTION_BG, NULL); } /* Now destroy it. */ @@ -542,12 +542,12 @@ color_sel_ok_cb (GtkButton *button _U_, } else { /* Find the "Edit color filter" dialog box with which this is associated. */ - parent = (GtkWidget *)OBJECT_GET_DATA(color_dialog, COLOR_SELECTION_PARENT); + parent = (GtkWidget *)g_object_get_data(G_OBJECT(color_dialog), COLOR_SELECTION_PARENT); /* Find that dialog box's foreground and background color selection boxes, if any. */ - color_selection_fg = OBJECT_GET_DATA(parent, COLOR_SELECTION_FG); - color_selection_bg = OBJECT_GET_DATA(parent, COLOR_SELECTION_BG); + color_selection_fg = g_object_get_data(G_OBJECT(parent), COLOR_SELECTION_FG); + color_selection_bg = g_object_get_data(G_OBJECT(parent), COLOR_SELECTION_BG); is_bg = (color_dialog == color_selection_bg); color_sel_win_destroy(color_dialog); diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c index f32fbe2477..97af2c4b9c 100644 --- a/gtk/dfilter_expr_dlg.c +++ b/gtk/dfilter_expr_dlg.c @@ -102,24 +102,24 @@ static void field_select_row_cb(GtkTreeSelection *sel, gpointer tree) { GtkWidget *window = gtk_widget_get_toplevel(tree); - GtkWidget *relation_list = OBJECT_GET_DATA(window, + GtkWidget *relation_list = g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_RELATION_LIST_KEY); - GtkWidget *range_label = OBJECT_GET_DATA(window, + GtkWidget *range_label = g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_RANGE_LABEL_KEY); - GtkWidget *range_entry = OBJECT_GET_DATA(window, + GtkWidget *range_entry = g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_RANGE_ENTRY_KEY); - GtkWidget *value_label = OBJECT_GET_DATA(window, + GtkWidget *value_label = g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_LABEL_KEY); - GtkWidget *value_entry = OBJECT_GET_DATA(window, + GtkWidget *value_entry = g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_ENTRY_KEY); - GtkWidget *value_list_label = OBJECT_GET_DATA(window, - E_DFILTER_EXPR_VALUE_LIST_LABEL_KEY); - GtkWidget *value_list = OBJECT_GET_DATA(window, - E_DFILTER_EXPR_VALUE_LIST_KEY); - GtkWidget *value_list_scrolled_win = OBJECT_GET_DATA(window, - E_DFILTER_EXPR_VALUE_LIST_SW_KEY); - GtkWidget *ok_bt = OBJECT_GET_DATA(window, - E_DFILTER_EXPR_OK_BT_KEY); + GtkWidget *value_list_label = g_object_get_data(G_OBJECT(window), + E_DFILTER_EXPR_VALUE_LIST_LABEL_KEY); + GtkWidget *value_list = g_object_get_data(G_OBJECT(window), + E_DFILTER_EXPR_VALUE_LIST_KEY); + GtkWidget *value_list_scrolled_win = g_object_get_data(G_OBJECT(window), + E_DFILTER_EXPR_VALUE_LIST_SW_KEY); + GtkWidget *ok_bt = g_object_get_data(G_OBJECT(window), + E_DFILTER_EXPR_OK_BT_KEY); header_field_info *hfinfo, *cur_hfinfo; const char *value_type; char value_label_string[1024+1]; /* XXX - should be large enough */ @@ -133,7 +133,7 @@ field_select_row_cb(GtkTreeSelection *sel, gpointer tree) /* * What was the item that was last selected? */ - cur_hfinfo = OBJECT_GET_DATA(window, E_DFILTER_EXPR_CURRENT_VAR_KEY); + cur_hfinfo = g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_CURRENT_VAR_KEY); if (cur_hfinfo == hfinfo) { /* * It's still selected; no need to change anything. @@ -144,7 +144,7 @@ field_select_row_cb(GtkTreeSelection *sel, gpointer tree) /* * Mark it as currently selected. */ - OBJECT_SET_DATA(window, E_DFILTER_EXPR_CURRENT_VAR_KEY, hfinfo); + g_object_set_data(G_OBJECT(window), E_DFILTER_EXPR_CURRENT_VAR_KEY, hfinfo); show_relations(relation_list, hfinfo->type); @@ -289,21 +289,21 @@ relation_list_sel_cb(GtkTreeSelection *sel, gpointer user_data _U_) { GtkWidget *window = gtk_widget_get_toplevel(GTK_WIDGET(gtk_tree_selection_get_tree_view(sel))); GtkWidget *range_label = - OBJECT_GET_DATA(window, E_DFILTER_EXPR_RANGE_LABEL_KEY); + g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_RANGE_LABEL_KEY); GtkWidget *range_entry = - OBJECT_GET_DATA(window, E_DFILTER_EXPR_RANGE_ENTRY_KEY); + g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_RANGE_ENTRY_KEY); GtkWidget *value_label = - OBJECT_GET_DATA(window, E_DFILTER_EXPR_VALUE_LABEL_KEY); + g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_LABEL_KEY); GtkWidget *value_entry = - OBJECT_GET_DATA(window, E_DFILTER_EXPR_VALUE_ENTRY_KEY); + g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_ENTRY_KEY); GtkWidget *value_list_label = - OBJECT_GET_DATA(window, E_DFILTER_EXPR_VALUE_LIST_LABEL_KEY); + g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_LIST_LABEL_KEY); GtkWidget *value_list = - OBJECT_GET_DATA(window, E_DFILTER_EXPR_VALUE_LIST_KEY); + g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_LIST_KEY); GtkWidget *value_list_scrolled_win = - OBJECT_GET_DATA(window, E_DFILTER_EXPR_VALUE_LIST_SW_KEY); + g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_LIST_SW_KEY); header_field_info *hfinfo = - OBJECT_GET_DATA(window, E_DFILTER_EXPR_CURRENT_VAR_KEY); + g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_CURRENT_VAR_KEY); gchar *item_str; GtkTreeModel *model; GtkTreeIter iter; @@ -535,7 +535,7 @@ value_list_sel_cb(GtkTreeSelection *sel, gpointer value_entry_arg) GtkWidget *window = gtk_widget_get_toplevel(GTK_WIDGET(gtk_tree_selection_get_tree_view(sel))); GtkTreeModel *model; GtkTreeIter iter; - header_field_info *hfinfo = OBJECT_GET_DATA(window, + header_field_info *hfinfo = g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_CURRENT_VAR_KEY); const value_string *value = NULL; char value_string[11+1]; /* long enough for 32-bit octal value */ @@ -627,11 +627,11 @@ dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg) GtkWidget *filter_te = filter_te_arg; GtkWidget *window = gtk_widget_get_toplevel(w); GtkWidget *relation_list = - OBJECT_GET_DATA(window, E_DFILTER_EXPR_RELATION_LIST_KEY); + g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_RELATION_LIST_KEY); GtkWidget *range_entry = - OBJECT_GET_DATA(window, E_DFILTER_EXPR_RANGE_ENTRY_KEY); + g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_RANGE_ENTRY_KEY); GtkWidget *value_entry = - OBJECT_GET_DATA(window, E_DFILTER_EXPR_VALUE_ENTRY_KEY); + g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_ENTRY_KEY); header_field_info *hfinfo; gchar *item_str; gchar *range_str, *stripped_range_str; @@ -648,7 +648,7 @@ dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg) /* * Get the variable to be tested. */ - hfinfo = OBJECT_GET_DATA(window, E_DFILTER_EXPR_CURRENT_VAR_KEY); + hfinfo = g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_CURRENT_VAR_KEY); /* * Get the relation operator to use. @@ -1171,11 +1171,11 @@ dfilter_expr_dlg_new(GtkWidget *filter_te) gtk_box_pack_start(GTK_BOX(main_vb), list_bb, FALSE, FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (list_bb), 0); - ok_bt = OBJECT_GET_DATA(list_bb, GTK_STOCK_OK); + ok_bt = g_object_get_data(G_OBJECT(list_bb), GTK_STOCK_OK); gtk_widget_set_sensitive(ok_bt, FALSE); SIGNAL_CONNECT(ok_bt, "clicked", dfilter_expr_dlg_accept_cb, filter_te); - cancel_bt = OBJECT_GET_DATA(list_bb, GTK_STOCK_CANCEL); + cancel_bt = g_object_get_data(G_OBJECT(list_bb), GTK_STOCK_CANCEL); window_set_cancel_button(window, cancel_bt, NULL); SIGNAL_CONNECT(cancel_bt, "clicked", dfilter_expr_dlg_cancel_cb, window); @@ -1188,16 +1188,16 @@ dfilter_expr_dlg_new(GtkWidget *filter_te) dlg_set_activate(range_entry, ok_bt); dlg_set_activate(value_entry, ok_bt); - OBJECT_SET_DATA(window, E_DFILTER_EXPR_RELATION_LIST_KEY, relation_list); - OBJECT_SET_DATA(window, E_DFILTER_EXPR_RANGE_LABEL_KEY, range_label); - OBJECT_SET_DATA(window, E_DFILTER_EXPR_RANGE_ENTRY_KEY, range_entry); - OBJECT_SET_DATA(window, E_DFILTER_EXPR_VALUE_LABEL_KEY, value_label); - OBJECT_SET_DATA(window, E_DFILTER_EXPR_VALUE_ENTRY_KEY, value_entry); - OBJECT_SET_DATA(window, E_DFILTER_EXPR_VALUE_LIST_KEY, value_list); - OBJECT_SET_DATA(window, E_DFILTER_EXPR_VALUE_LIST_LABEL_KEY, value_list_label); - OBJECT_SET_DATA(window, E_DFILTER_EXPR_VALUE_LIST_SW_KEY, + g_object_set_data(G_OBJECT(window), E_DFILTER_EXPR_RELATION_LIST_KEY, relation_list); + g_object_set_data(G_OBJECT(window), E_DFILTER_EXPR_RANGE_LABEL_KEY, range_label); + g_object_set_data(G_OBJECT(window), E_DFILTER_EXPR_RANGE_ENTRY_KEY, range_entry); + g_object_set_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_LABEL_KEY, value_label); + g_object_set_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_ENTRY_KEY, value_entry); + g_object_set_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_LIST_KEY, value_list); + g_object_set_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_LIST_LABEL_KEY, value_list_label); + g_object_set_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_LIST_SW_KEY, value_list_scrolled_win); - OBJECT_SET_DATA(window, E_DFILTER_EXPR_OK_BT_KEY, ok_bt); + g_object_set_data(G_OBJECT(window), E_DFILTER_EXPR_OK_BT_KEY, ok_bt); SIGNAL_CONNECT(window, "delete_event", dfilter_expr_dlg_delete_event_cb, window); diff --git a/gtk/filter_dlg.c b/gtk/filter_dlg.c index 95485ca625..ee187b6564 100644 --- a/gtk/filter_dlg.c +++ b/gtk/filter_dlg.c @@ -113,7 +113,7 @@ capture_filter_construct_cb(GtkWidget *w, gpointer user_data _U_) }; /* Has a filter dialog box already been opened for that button? */ - filter_browse_w = OBJECT_GET_DATA(w, E_FILT_DIALOG_PTR_KEY); + filter_browse_w = g_object_get_data(G_OBJECT(w), E_FILT_DIALOG_PTR_KEY); if (filter_browse_w != NULL) { /* Yes. Just re-activate that dialog box. */ @@ -122,7 +122,7 @@ capture_filter_construct_cb(GtkWidget *w, gpointer user_data _U_) } /* No. Get the text entry attached to the button. */ - parent_filter_te = OBJECT_GET_DATA(w, E_FILT_TE_PTR_KEY); + parent_filter_te = g_object_get_data(G_OBJECT(w), E_FILT_TE_PTR_KEY); /* Now create a new dialog, without an "Add Expression..." button. */ filter_browse_w = filter_dialog_new(w, parent_filter_te, @@ -150,7 +150,7 @@ display_filter_construct_cb(GtkWidget *w, gpointer construct_args_ptr) GtkWidget *parent_filter_te; /* Has a filter dialog box already been opened for the button? */ - filter_browse_w = OBJECT_GET_DATA(w, E_FILT_DIALOG_PTR_KEY); + filter_browse_w = g_object_get_data(G_OBJECT(w), E_FILT_DIALOG_PTR_KEY); if (filter_browse_w != NULL) { /* Yes. Just re-activate that dialog box. */ @@ -159,7 +159,7 @@ display_filter_construct_cb(GtkWidget *w, gpointer construct_args_ptr) } /* No. Get the text entry attached to the button. */ - parent_filter_te = OBJECT_GET_DATA(w, E_FILT_TE_PTR_KEY); + parent_filter_te = g_object_get_data(G_OBJECT(w), E_FILT_TE_PTR_KEY); /* Now create a new dialog, possibly with an "Apply" button, and definitely with an "Add Expression..." button. */ @@ -176,11 +176,11 @@ filter_button_destroy_cb(GtkWidget *button, gpointer user_data _U_) /* Is there a filter edit/selection dialog associated with this button? */ - filter_w = OBJECT_GET_DATA(button, E_FILT_DIALOG_PTR_KEY); + filter_w = g_object_get_data(G_OBJECT(button), E_FILT_DIALOG_PTR_KEY); if (filter_w != NULL) { /* Yes. Break the association, and destroy the dialog. */ - OBJECT_SET_DATA(button, E_FILT_DIALOG_PTR_KEY, NULL); + g_object_set_data(G_OBJECT(button), E_FILT_DIALOG_PTR_KEY, NULL); window_destroy(filter_w); } } @@ -231,7 +231,7 @@ dfilter_dialog_cb(GtkWidget *w _U_) FALSE }; - display_filter_construct_cb(OBJECT_GET_DATA(top_level, E_FILT_BT_PTR_KEY), &args); + display_filter_construct_cb(g_object_get_data(G_OBJECT(top_level), E_FILT_BT_PTR_KEY), &args); } /* List of capture filter dialogs, so that if the list of filters changes @@ -299,7 +299,7 @@ fill_list(GtkWidget *main_w, filter_list_type_t list_type, const gchar *filter_ GtkTreeIter iter; GtkTreeIter *l_select = NULL; - filter_l = GTK_TREE_VIEW(OBJECT_GET_DATA(main_w, E_FILT_FILTER_L_KEY)); + filter_l = GTK_TREE_VIEW(g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY)); store = GTK_LIST_STORE(gtk_tree_view_get_model(filter_l)); /* fill in data */ @@ -329,7 +329,7 @@ fill_list(GtkWidget *main_w, filter_list_type_t list_type, const gchar *filter_ #if 0 static void clear_list(GtkWidget *main_w) { - GtkWidget *filter_l = OBJECT_GET_DATA(main_w, E_FILT_FILTER_L_KEY); + GtkWidget *filter_l = g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY); GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(filter_l)); gtk_list_store_clear(GTK_LIST_STORE(model)); @@ -406,8 +406,8 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, tooltips = gtk_tooltips_new (); main_w = dlg_window_new(construct_args->title); - gtk_window_set_default_size(GTK_WINDOW(main_w), 400, 400); - OBJECT_SET_DATA(main_w, E_FILT_CONSTRUCT_ARGS_KEY, construct_args); + gtk_window_set_default_size(GTK_WINDOW(main_w), 400, 400); + g_object_set_data(G_OBJECT(main_w), E_FILT_CONSTRUCT_ARGS_KEY, construct_args); main_vb = gtk_vbox_new(FALSE, 0); gtk_container_border_width(GTK_CONTAINER(main_vb), 5); @@ -448,7 +448,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, del_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_DELETE); gtk_widget_set_sensitive(del_bt, FALSE); SIGNAL_CONNECT(del_bt, "clicked", filter_del_bt_clicked_cb, filter_list_type_p); - OBJECT_SET_DATA(main_w, E_FILT_DEL_BT_KEY, del_bt); + g_object_set_data(G_OBJECT(main_w), E_FILT_DEL_BT_KEY, del_bt); gtk_widget_show(del_bt); gtk_box_pack_start (GTK_BOX (list_bb), del_bt, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, del_bt, ("Delete the selected filter"), NULL); @@ -478,15 +478,15 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, SIGNAL_CONNECT(sel, "changed", filter_sel_list_cb, filter_vb); SIGNAL_CONNECT(filter_l, "button_press_event", filter_sel_list_button_cb, NULL); - OBJECT_SET_DATA(main_w, E_FILT_FILTER_L_KEY, filter_l); + g_object_set_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY, filter_l); gtk_container_add(GTK_CONTAINER(filter_sc), filter_l); gtk_widget_show(filter_l); - OBJECT_SET_DATA(filter_l, E_FILT_DBLFUNC_KEY, filter_dlg_dclick); - OBJECT_SET_DATA(filter_l, E_FILT_DBLARG_KEY, main_w); + g_object_set_data(G_OBJECT(filter_l), E_FILT_DBLFUNC_KEY, filter_dlg_dclick); + g_object_set_data(G_OBJECT(filter_l), E_FILT_DBLARG_KEY, main_w); /* This is a Boolean, but we make it a non-null pointer for TRUE and a null pointer for FALSE, as object data is a pointer. */ - OBJECT_SET_DATA(filter_l, E_FILT_DBLACTIVATE_KEY, + g_object_set_data(G_OBJECT(filter_l), E_FILT_DBLACTIVATE_KEY, construct_args->activate_on_ok ? "" : NULL); /* fill in data */ @@ -515,7 +515,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, name_te = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(middle_hb), name_te, TRUE, TRUE, 0); - OBJECT_SET_DATA(main_w, E_FILT_NAME_TE_KEY, name_te); + g_object_set_data(G_OBJECT(main_w), E_FILT_NAME_TE_KEY, name_te); SIGNAL_CONNECT(name_te, "changed", filter_name_te_changed_cb, filter_list_type_p); gtk_widget_show(name_te); @@ -530,11 +530,11 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, filter_te = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(bottom_hb), filter_te, TRUE, TRUE, 0); - OBJECT_SET_DATA(main_w, E_FILT_FILTER_TE_KEY, filter_te); + g_object_set_data(G_OBJECT(main_w), E_FILT_FILTER_TE_KEY, filter_te); SIGNAL_CONNECT(filter_te, "changed", filter_name_te_changed_cb, filter_list_type_p); gtk_widget_show(filter_te); - OBJECT_SET_DATA(main_w, E_FILT_PARENT_FILTER_TE_KEY, parent_filter_te); + g_object_set_data(G_OBJECT(main_w), E_FILT_PARENT_FILTER_TE_KEY, parent_filter_te); if (list_type == DFILTER_EDITED_LIST) { gtk_tooltips_set_tip(tooltips, filter_te, @@ -557,7 +557,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 5); gtk_widget_show(bbox); - ok_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_OK); + ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); SIGNAL_CONNECT(ok_bt, "clicked", filter_dlg_ok_cb, filter_list_type_p); gtk_tooltips_set_tip (tooltips, ok_bt, ("Apply the filters and close this dialog"), NULL); @@ -571,20 +571,20 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, dlg_set_activate(filter_te, ok_bt); } - apply_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_APPLY); + apply_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_APPLY); SIGNAL_CONNECT(apply_bt, "clicked", filter_dlg_apply_cb, filter_list_type_p); gtk_tooltips_set_tip (tooltips, apply_bt, ("Apply the filters and keep this dialog open"), NULL); - save_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_SAVE); + save_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE); SIGNAL_CONNECT(save_bt, "clicked", filter_dlg_save_cb, filter_list_type_p); gtk_tooltips_set_tip (tooltips, save_bt, ("Save the filters permanently and keep this dialog open"), NULL); - cancel_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL); + cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); gtk_tooltips_set_tip (tooltips, cancel_bt, ("Cancel the changes"), NULL); SIGNAL_CONNECT(cancel_bt, "clicked", filter_dlg_cancel_cb, filter_list_type_p); window_set_cancel_button(main_w, cancel_bt, NULL); - help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP); + help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); if (list_type == CFILTER_EDITED_LIST) { SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_CAPTURE_FILTERS_DIALOG); } else { @@ -602,10 +602,10 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, /* This dialog box was created by a "Filter" button. Set the E_FILT_BUTTON_PTR_KEY for the new dialog to point to the button. */ - OBJECT_SET_DATA(main_w, E_FILT_BUTTON_PTR_KEY, button); + g_object_set_data(G_OBJECT(main_w), E_FILT_BUTTON_PTR_KEY, button); /* Set the E_FILT_DIALOG_PTR_KEY for the button to point to us */ - OBJECT_SET_DATA(button, E_FILT_DIALOG_PTR_KEY, main_w); + g_object_set_data(G_OBJECT(button), E_FILT_DIALOG_PTR_KEY, main_w); } /* DO SELECTION THINGS *AFTER* SHOWING THE DIALOG! */ @@ -654,7 +654,7 @@ filter_dlg_dclick(GtkWidget *filter_l, gpointer main_w_arg, gpointer activate) { GtkWidget *main_w = GTK_WIDGET(main_w_arg); GtkWidget *parent_filter_te = - OBJECT_GET_DATA(main_w, E_FILT_PARENT_FILTER_TE_KEY); + g_object_get_data(G_OBJECT(main_w), E_FILT_PARENT_FILTER_TE_KEY); GList *flp; filter_def *filt; GtkTreeSelection *sel; @@ -734,9 +734,9 @@ static void filter_apply(GtkWidget *main_w, gboolean destroy) { construct_args_t *construct_args = - OBJECT_GET_DATA(main_w, E_FILT_CONSTRUCT_ARGS_KEY); + g_object_get_data(G_OBJECT(main_w), E_FILT_CONSTRUCT_ARGS_KEY); GtkWidget *parent_filter_te = - OBJECT_GET_DATA(main_w, E_FILT_PARENT_FILTER_TE_KEY); + g_object_get_data(G_OBJECT(main_w), E_FILT_PARENT_FILTER_TE_KEY); GtkWidget *filter_te; const gchar *filter_string; @@ -746,7 +746,7 @@ filter_apply(GtkWidget *main_w, gboolean destroy) * box; put the filter in our text entry widget into that * text entry widget. */ - filter_te = OBJECT_GET_DATA(main_w, E_FILT_FILTER_TE_KEY); + filter_te = g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_TE_KEY); filter_string = (const gchar *)gtk_entry_get_text(GTK_ENTRY(filter_te)); gtk_entry_set_text(GTK_ENTRY(parent_filter_te), filter_string); @@ -910,11 +910,11 @@ filter_dlg_destroy_cb(GtkWidget *win, gpointer data) /* Get the button that requested that we be popped up, if any. (It should arrange to destroy us if it's destroyed, so that we don't get a pointer to a non-existent window here.) */ - button = OBJECT_GET_DATA(win, E_FILT_BUTTON_PTR_KEY); + button = g_object_get_data(G_OBJECT(win), E_FILT_BUTTON_PTR_KEY); if (button != NULL) { /* Tell it we no longer exist. */ - OBJECT_SET_DATA(button, E_FILT_DIALOG_PTR_KEY, NULL); + g_object_set_data(G_OBJECT(button), E_FILT_DIALOG_PTR_KEY, NULL); } else { /* This is an editing dialog popped up from, for example, a menu item; note that we no longer have one. */ @@ -945,9 +945,9 @@ filter_sel_list_button_cb(GtkWidget *list, GdkEventButton *event, gpointer func_activate; if (event->type == GDK_2BUTTON_PRESS) { - func = OBJECT_GET_DATA(list, E_FILT_DBLFUNC_KEY); - func_arg = OBJECT_GET_DATA(list, E_FILT_DBLARG_KEY); - func_activate = OBJECT_GET_DATA(list, E_FILT_DBLACTIVATE_KEY); + func = g_object_get_data(G_OBJECT(list), E_FILT_DBLFUNC_KEY); + func_arg = g_object_get_data(G_OBJECT(list), E_FILT_DBLARG_KEY); + func_activate = g_object_get_data(G_OBJECT(list), E_FILT_DBLACTIVATE_KEY); if (func) (*func)(list, func_arg, func_activate); @@ -963,11 +963,11 @@ filter_sel_list_cb(GtkTreeSelection *sel, gpointer data _U_) GtkWidget *main_w = gtk_widget_get_toplevel(filter_l); GtkTreeModel *model; GtkTreeIter iter; - GtkWidget *name_te = OBJECT_GET_DATA(main_w, E_FILT_NAME_TE_KEY); - GtkWidget *filter_te = OBJECT_GET_DATA(main_w, E_FILT_FILTER_TE_KEY); - GtkWidget *chg_bt = OBJECT_GET_DATA(main_w, E_FILT_CHG_BT_KEY); - GtkWidget *copy_bt = OBJECT_GET_DATA(main_w, E_FILT_COPY_BT_KEY); - GtkWidget *del_bt = OBJECT_GET_DATA(main_w, E_FILT_DEL_BT_KEY); + GtkWidget *name_te = g_object_get_data(G_OBJECT(main_w), E_FILT_NAME_TE_KEY); + GtkWidget *filter_te = g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_TE_KEY); + GtkWidget *chg_bt = g_object_get_data(G_OBJECT(main_w), E_FILT_CHG_BT_KEY); + GtkWidget *copy_bt = g_object_get_data(G_OBJECT(main_w), E_FILT_COPY_BT_KEY); + GtkWidget *del_bt = g_object_get_data(G_OBJECT(main_w), E_FILT_DEL_BT_KEY); filter_def *filt; gchar *name = NULL, *strval = NULL; GList *flp; @@ -1042,7 +1042,7 @@ new_filter_cb(gpointer data, gpointer user_data) new_filter_cb_args_t *args = user_data; filter_def *nfilt = args->nflp->data; - filter_l = GTK_TREE_VIEW(OBJECT_GET_DATA(main_w, E_FILT_FILTER_L_KEY)); + filter_l = GTK_TREE_VIEW(g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY)); store = GTK_LIST_STORE(gtk_tree_view_get_model(filter_l)); gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, 0, nfilt->name, 1, args->nflp, -1); @@ -1057,9 +1057,9 @@ static void filter_new_bt_clicked_cb(GtkWidget *w, gpointer data) { GtkWidget *main_w = gtk_widget_get_toplevel(w); - GtkWidget *name_te = OBJECT_GET_DATA(main_w, E_FILT_NAME_TE_KEY); - GtkWidget *filter_te = OBJECT_GET_DATA(main_w, E_FILT_FILTER_TE_KEY); - GtkWidget *filter_l = OBJECT_GET_DATA(main_w, E_FILT_FILTER_L_KEY); + GtkWidget *name_te = g_object_get_data(G_OBJECT(main_w), E_FILT_NAME_TE_KEY); + GtkWidget *filter_te = g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_TE_KEY); + GtkWidget *filter_l = g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY); filter_list_type_t list_type = *(filter_list_type_t *)data; GList *fl_entry; const gchar *name, *strval; @@ -1112,7 +1112,7 @@ static void chg_filter_cb(gpointer data, gpointer user_data) { GtkWidget *main_w = data; - GtkWidget *filter_l = OBJECT_GET_DATA(main_w, E_FILT_FILTER_L_KEY); + GtkWidget *filter_l = g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY); gtk_tree_model_foreach(gtk_tree_view_get_model(GTK_TREE_VIEW(filter_l)), chg_list_item_cb, user_data); @@ -1122,9 +1122,9 @@ static void filter_name_te_changed_cb(GtkWidget *w, gpointer data) { GtkWidget *main_w = gtk_widget_get_toplevel(w); - GtkWidget *name_te = OBJECT_GET_DATA(main_w, E_FILT_NAME_TE_KEY); - GtkWidget *filter_te = OBJECT_GET_DATA(main_w, E_FILT_FILTER_TE_KEY); - GtkWidget *filter_l = OBJECT_GET_DATA(main_w, E_FILT_FILTER_L_KEY); + GtkWidget *name_te = g_object_get_data(G_OBJECT(main_w), E_FILT_NAME_TE_KEY); + GtkWidget *filter_te = g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_TE_KEY); + GtkWidget *filter_l = g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY); filter_def *filt; GList *fl_entry; filter_list_type_t list_type = *(filter_list_type_t *)data; @@ -1169,7 +1169,7 @@ static void delete_filter_cb(gpointer data, gpointer user_data) { GtkWidget *main_w = data; - GtkWidget *filter_l = OBJECT_GET_DATA(main_w, E_FILT_FILTER_L_KEY); + GtkWidget *filter_l = g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY); gchar *pos = (gchar *)user_data; GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(filter_l)); GtkTreeIter iter; @@ -1182,7 +1182,7 @@ static void filter_del_bt_clicked_cb(GtkWidget *w, gpointer data) { GtkWidget *main_w = gtk_widget_get_toplevel(w); - GtkWidget *filter_l = OBJECT_GET_DATA(main_w, E_FILT_FILTER_L_KEY); + GtkWidget *filter_l = g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_L_KEY); filter_list_type_t list_type = *(filter_list_type_t *)data; GList *fl_entry; gchar *pos; @@ -1216,7 +1216,7 @@ filter_add_expr_bt_cb(GtkWidget *w _U_, gpointer main_w_arg) GtkWidget *main_w = GTK_WIDGET(main_w_arg); GtkWidget *filter_te, *dfilter_w; - filter_te = OBJECT_GET_DATA(main_w, E_FILT_FILTER_TE_KEY); + filter_te = g_object_get_data(G_OBJECT(main_w), E_FILT_FILTER_TE_KEY); dfilter_w = dfilter_expr_dlg_new(filter_te); /* If we're opening a series of modal dialogs (such as when going diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c index 0710b349f4..52773614b0 100644 --- a/gtk/find_dlg.c +++ b/gtk/find_dlg.c @@ -200,15 +200,15 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) filter_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args); SIGNAL_CONNECT(filter_bt, "destroy", filter_button_destroy_cb, NULL); - OBJECT_SET_DATA(filter_bt, E_FILT_TE_BUTTON_KEY, filter_bt); + g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_BUTTON_KEY, filter_bt); gtk_box_pack_start(GTK_BOX(filter_hb), filter_bt, FALSE, TRUE, 0); gtk_tooltips_set_tip (tooltips, filter_bt, ("Click on the filter button to select a display filter,\nor enter your search criteria into the text box"), NULL); gtk_widget_show(filter_bt); filter_text_box = gtk_entry_new(); if (cfile.sfilter) gtk_entry_set_text(GTK_ENTRY(filter_text_box), cfile.sfilter); - OBJECT_SET_DATA(filter_bt, E_FILT_TE_PTR_KEY, filter_text_box); - OBJECT_SET_DATA(find_frame_w, E_FILT_TE_PTR_KEY, filter_text_box); + g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_text_box); + g_object_set_data(G_OBJECT(find_frame_w), E_FILT_TE_PTR_KEY, filter_text_box); gtk_box_pack_start(GTK_BOX(filter_hb), filter_text_box, TRUE, TRUE, 0); SIGNAL_CONNECT(filter_text_box, "changed", find_filter_te_syntax_check_cb, find_frame_w); gtk_widget_show(filter_text_box); @@ -325,30 +325,30 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0); gtk_widget_show(bbox); - ok_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_FIND); + ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_FIND); SIGNAL_CONNECT(ok_bt, "clicked", find_frame_ok_cb, find_frame_w); - cancel_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL); + cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); SIGNAL_CONNECT(cancel_bt, "clicked", find_frame_close_cb, find_frame_w); if(topic_available(HELP_FIND_DIALOG)) { - help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP); + help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_FIND_DIALOG); } /* Attach pointers to needed widgets to the capture prefs window/object */ - OBJECT_SET_DATA(find_frame_w, E_FIND_FILT_KEY, filter_text_box); - OBJECT_SET_DATA(find_frame_w, E_FIND_BACKWARD_KEY, up_rb); - OBJECT_SET_DATA(find_frame_w, E_FIND_FILTERDATA_KEY, filter_rb); - OBJECT_SET_DATA(find_frame_w, E_FIND_HEXDATA_KEY, hex_rb); - OBJECT_SET_DATA(find_frame_w, E_FIND_STRINGDATA_KEY, string_rb); - OBJECT_SET_DATA(find_frame_w, E_FIND_STRINGTYPE_LABEL_KEY, combo_lb); - OBJECT_SET_DATA(find_frame_w, E_FIND_STRINGTYPE_KEY, combo_cb); - OBJECT_SET_DATA(find_frame_w, E_CASE_SEARCH_KEY, case_cb); - OBJECT_SET_DATA(find_frame_w, E_SOURCE_HEX_KEY, hex_data_rb); - OBJECT_SET_DATA(find_frame_w, E_SOURCE_DECODE_KEY, decode_data_rb); - OBJECT_SET_DATA(find_frame_w, E_SOURCE_SUMMARY_KEY, summary_data_rb); - OBJECT_SET_DATA(find_frame_w, E_FILT_TE_BUTTON_KEY, filter_bt); + g_object_set_data(G_OBJECT(find_frame_w), E_FIND_FILT_KEY, filter_text_box); + g_object_set_data(G_OBJECT(find_frame_w), E_FIND_BACKWARD_KEY, up_rb); + g_object_set_data(G_OBJECT(find_frame_w), E_FIND_FILTERDATA_KEY, filter_rb); + g_object_set_data(G_OBJECT(find_frame_w), E_FIND_HEXDATA_KEY, hex_rb); + g_object_set_data(G_OBJECT(find_frame_w), E_FIND_STRINGDATA_KEY, string_rb); + g_object_set_data(G_OBJECT(find_frame_w), E_FIND_STRINGTYPE_LABEL_KEY, combo_lb); + g_object_set_data(G_OBJECT(find_frame_w), E_FIND_STRINGTYPE_KEY, combo_cb); + g_object_set_data(G_OBJECT(find_frame_w), E_CASE_SEARCH_KEY, case_cb); + g_object_set_data(G_OBJECT(find_frame_w), E_SOURCE_HEX_KEY, hex_data_rb); + g_object_set_data(G_OBJECT(find_frame_w), E_SOURCE_DECODE_KEY, decode_data_rb); + g_object_set_data(G_OBJECT(find_frame_w), E_SOURCE_SUMMARY_KEY, summary_data_rb); + g_object_set_data(G_OBJECT(find_frame_w), E_FILT_TE_BUTTON_KEY, filter_bt); /* * Now that we've attached the pointers, connect the signals - if @@ -402,8 +402,8 @@ find_filter_te_syntax_check_cb(GtkWidget *w, gpointer parent_w) guint8 *bytes = NULL; size_t nbytes; - hex_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_HEXDATA_KEY); - string_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_STRINGDATA_KEY); + hex_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_HEXDATA_KEY); + string_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_STRINGDATA_KEY); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (hex_rb))) { /* @@ -452,7 +452,7 @@ hex_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w) { GtkWidget *filter_text_box; - filter_text_box = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_FILT_TE_PTR_KEY); + filter_text_box = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_FILT_TE_PTR_KEY); /* Re-check the display filter. */ find_filter_te_syntax_check_cb(filter_text_box, parent_w); @@ -469,15 +469,15 @@ string_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w) GtkWidget *string_rb, *hex_data_rb, *decode_data_rb, *summary_data_rb, *data_combo_lb, *data_combo_cb, *data_case_cb, *filter_text_box; - string_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_STRINGDATA_KEY); - hex_data_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_SOURCE_HEX_KEY); - decode_data_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_SOURCE_DECODE_KEY); - summary_data_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_SOURCE_SUMMARY_KEY); + string_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_STRINGDATA_KEY); + hex_data_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_SOURCE_HEX_KEY); + decode_data_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_SOURCE_DECODE_KEY); + summary_data_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_SOURCE_SUMMARY_KEY); - data_combo_lb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_STRINGTYPE_LABEL_KEY); - data_combo_cb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_STRINGTYPE_KEY); - data_case_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CASE_SEARCH_KEY); - filter_text_box = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_FILT_TE_PTR_KEY); + data_combo_lb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_STRINGTYPE_LABEL_KEY); + data_combo_cb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_STRINGTYPE_KEY); + data_case_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CASE_SEARCH_KEY); + filter_text_box = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_FILT_TE_PTR_KEY); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(string_rb))) { gtk_widget_set_sensitive(GTK_WIDGET(hex_data_rb), TRUE); @@ -508,8 +508,8 @@ filter_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w) { GtkWidget *filter_bt, *filter_rb; - filter_bt = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FILT_TE_BUTTON_KEY); - filter_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_FILTERDATA_KEY); + filter_bt = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FILT_TE_BUTTON_KEY); + filter_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_FILTERDATA_KEY); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(filter_rb))) { @@ -535,14 +535,14 @@ find_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) dfilter_t *sfcode = NULL; gboolean found_packet=FALSE; - filter_te = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_FILT_KEY); - up_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_BACKWARD_KEY); - hex_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_HEXDATA_KEY); - string_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_STRINGDATA_KEY); - combo_cb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_FIND_STRINGTYPE_KEY); - case_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CASE_SEARCH_KEY); - decode_data_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_SOURCE_DECODE_KEY); - summary_data_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, E_SOURCE_SUMMARY_KEY); + filter_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_FILT_KEY); + up_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_BACKWARD_KEY); + hex_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_HEXDATA_KEY); + string_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_STRINGDATA_KEY); + combo_cb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_FIND_STRINGTYPE_KEY); + case_cb = (GtkWidget *) g_object_get_data(G_OBJECT(parent_w), E_CASE_SEARCH_KEY); + decode_data_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_SOURCE_DECODE_KEY); + summary_data_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_SOURCE_SUMMARY_KEY); filter_text = gtk_entry_get_text(GTK_ENTRY(filter_te)); string_type = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(combo_cb)->entry)); diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c index 88d9a15316..40a06c4f64 100644 --- a/gtk/gui_prefs.c +++ b/gtk/gui_prefs.c @@ -187,7 +187,7 @@ gui_prefs_show(void) prefs.gui_plist_sel_browse); gtk_tooltips_set_tip(tooltips, plist_browse_om, "Choose to browse " "or select a packet for detailed dissection.", NULL); - OBJECT_SET_DATA(main_vb, PLIST_SEL_BROWSE_KEY, plist_browse_om); + g_object_set_data(G_OBJECT(main_vb), PLIST_SEL_BROWSE_KEY, plist_browse_om); /* Proto tree selection browseable */ ptree_browse_om = create_preference_option_menu(main_tb, pos++, @@ -195,26 +195,26 @@ gui_prefs_show(void) prefs.gui_ptree_sel_browse); gtk_tooltips_set_tip(tooltips, ptree_browse_om, "Choose to browse " "or select.", NULL); - OBJECT_SET_DATA(main_vb, PTREE_SEL_BROWSE_KEY, ptree_browse_om); + g_object_set_data(G_OBJECT(main_vb), PTREE_SEL_BROWSE_KEY, ptree_browse_om); /* Geometry prefs */ save_position_cb = create_preference_check_button(main_tb, pos++, "Save window position:", NULL, prefs.gui_geometry_save_position); gtk_tooltips_set_tip(tooltips, save_position_cb, "Whether to save the " "position of the main window.", NULL); - OBJECT_SET_DATA(main_vb, GEOMETRY_POSITION_KEY, save_position_cb); + g_object_set_data(G_OBJECT(main_vb), GEOMETRY_POSITION_KEY, save_position_cb); save_size_cb = create_preference_check_button(main_tb, pos++, "Save window size:", NULL, prefs.gui_geometry_save_size); gtk_tooltips_set_tip(tooltips, save_size_cb, "Whether to save the " "size of the main window.", NULL); - OBJECT_SET_DATA(main_vb, GEOMETRY_SIZE_KEY, save_size_cb); + g_object_set_data(G_OBJECT(main_vb), GEOMETRY_SIZE_KEY, save_size_cb); save_maximized_cb = create_preference_check_button(main_tb, pos++, "Save maximized state:", NULL, prefs.gui_geometry_save_maximized); gtk_tooltips_set_tip(tooltips, save_maximized_cb, "Whether to save the " "maximed state of the main window.", NULL); - OBJECT_SET_DATA(main_vb, GEOMETRY_MAXIMIZED_KEY, save_maximized_cb); + g_object_set_data(G_OBJECT(main_vb), GEOMETRY_MAXIMIZED_KEY, save_maximized_cb); #ifdef _WIN32 /* How the console window should be opened */ @@ -223,7 +223,7 @@ gui_prefs_show(void) prefs.gui_console_open); gtk_tooltips_set_tip(tooltips, console_open_om, "Whether to open a console window " "(Automatic will open a console if messages appear).", NULL); - OBJECT_SET_DATA(main_vb, GUI_CONSOLE_OPEN_KEY, console_open_om); + g_object_set_data(G_OBJECT(main_vb), GUI_CONSOLE_OPEN_KEY, console_open_om); #endif /* Allow user to select where they want the File Open dialog to open to @@ -238,8 +238,8 @@ gui_prefs_show(void) "Directory:", NULL, prefs.gui_fileopen_dir); gtk_tooltips_set_tip(tooltips, fileopen_dir_te, "The \"File Open\" dialog defaults always to this directory.", NULL); - OBJECT_SET_DATA(main_vb, GUI_FILEOPEN_KEY, fileopen_rb); - OBJECT_SET_DATA(main_vb, GUI_FILEOPEN_DIR_KEY, fileopen_dir_te); + g_object_set_data(G_OBJECT(main_vb), GUI_FILEOPEN_KEY, fileopen_rb); + g_object_set_data(G_OBJECT(main_vb), GUI_FILEOPEN_DIR_KEY, fileopen_dir_te); SIGNAL_CONNECT(fileopen_rb, "clicked", fileopen_selected_cb, main_vb); SIGNAL_CONNECT(fileopen_dir_te, "focus-out-event", fileopen_dir_changed_cb, main_vb); @@ -251,7 +251,7 @@ gui_prefs_show(void) gtk_entry_set_text(GTK_ENTRY(fileopen_preview_te), current_val_str); gtk_tooltips_set_tip(tooltips, fileopen_preview_te, "Reading preview data in the \"File Open\" dialog will be stopped after given seconds.", NULL); - OBJECT_SET_DATA(main_vb, GUI_FILEOPEN_PREVIEW_KEY, fileopen_preview_te); + g_object_set_data(G_OBJECT(main_vb), GUI_FILEOPEN_PREVIEW_KEY, fileopen_preview_te); SIGNAL_CONNECT(fileopen_preview_te, "focus_out_event", fileopen_preview_changed_cb, main_vb); /* Number of entries in the recent_files list ... */ @@ -261,7 +261,7 @@ gui_prefs_show(void) gtk_entry_set_text(GTK_ENTRY(recent_files_count_max_te), current_val_str); gtk_tooltips_set_tip(tooltips, recent_files_count_max_te, "Maximum number of entries in the \"File/Open Recent\" list.", NULL); - OBJECT_SET_DATA(main_vb, GUI_RECENT_FILES_COUNT_KEY, recent_files_count_max_te); + g_object_set_data(G_OBJECT(main_vb), GUI_RECENT_FILES_COUNT_KEY, recent_files_count_max_te); SIGNAL_CONNECT(recent_files_count_max_te, "focus_out_event", recent_files_count_changed_cb, main_vb); fileopen_selected_cb(NULL, main_vb); @@ -271,14 +271,14 @@ gui_prefs_show(void) "Ask for unsaved capture files:", NULL, prefs.gui_ask_unsaved); gtk_tooltips_set_tip(tooltips, ask_unsaved_cb, "Whether a dialog should " "pop up in case of an unsaved capture file.", NULL); - OBJECT_SET_DATA(main_vb, GUI_ASK_UNSAVED_KEY, ask_unsaved_cb); + g_object_set_data(G_OBJECT(main_vb), GUI_ASK_UNSAVED_KEY, ask_unsaved_cb); /* do we want to wrap when searching for data? */ find_wrap_cb = create_preference_check_button(main_tb, pos++, "Wrap to end/beginning of file during a find:", NULL, prefs.gui_find_wrap); gtk_tooltips_set_tip(tooltips, find_wrap_cb, "Whether a search should " "wrap in a capture file.", NULL); - OBJECT_SET_DATA(main_vb, GUI_FIND_WRAP_KEY, find_wrap_cb); + g_object_set_data(G_OBJECT(main_vb), GUI_FIND_WRAP_KEY, find_wrap_cb); /* show an explicit Save button for settings dialogs (preferences and alike)? */ use_pref_save_cb = create_preference_check_button(main_tb, pos++, @@ -286,7 +286,7 @@ gui_prefs_show(void) gtk_tooltips_set_tip(tooltips, use_pref_save_cb, "Whether the various settings dialogs (e.g. Preferences) should " "use an explicit save button - for advanced users.", NULL); - OBJECT_SET_DATA(main_vb, GUI_USE_PREF_SAVE_KEY, use_pref_save_cb); + g_object_set_data(G_OBJECT(main_vb), GUI_USE_PREF_SAVE_KEY, use_pref_save_cb); /* Webbrowser */ if (browser_needs_pref()) { @@ -295,7 +295,7 @@ gui_prefs_show(void) gtk_entry_set_text(GTK_ENTRY(webbrowser_te), prefs.gui_webbrowser); gtk_tooltips_set_tip(tooltips, webbrowser_te, "Command line to " "desired browser.", NULL); - OBJECT_SET_DATA(main_vb, GUI_WEBBROWSER_KEY, webbrowser_te); + g_object_set_data(G_OBJECT(main_vb), GUI_WEBBROWSER_KEY, webbrowser_te); } /* Show 'em what we got */ @@ -355,40 +355,40 @@ void gui_prefs_fetch(GtkWidget *w) { prefs.gui_plist_sel_browse = fetch_enum_value( - OBJECT_GET_DATA(w, PLIST_SEL_BROWSE_KEY), selection_mode_vals); + g_object_get_data(G_OBJECT(w), PLIST_SEL_BROWSE_KEY), selection_mode_vals); prefs.gui_ptree_sel_browse = fetch_enum_value( - OBJECT_GET_DATA(w, PTREE_SEL_BROWSE_KEY), selection_mode_vals); + g_object_get_data(G_OBJECT(w), PTREE_SEL_BROWSE_KEY), selection_mode_vals); prefs.gui_geometry_save_position = - gtk_toggle_button_get_active(OBJECT_GET_DATA(w, GEOMETRY_POSITION_KEY)); + gtk_toggle_button_get_active(g_object_get_data(G_OBJECT(w), GEOMETRY_POSITION_KEY)); prefs.gui_geometry_save_size = - gtk_toggle_button_get_active(OBJECT_GET_DATA(w, GEOMETRY_SIZE_KEY)); + gtk_toggle_button_get_active(g_object_get_data(G_OBJECT(w), GEOMETRY_SIZE_KEY)); prefs.gui_geometry_save_maximized = - gtk_toggle_button_get_active(OBJECT_GET_DATA(w, GEOMETRY_MAXIMIZED_KEY)); + gtk_toggle_button_get_active(g_object_get_data(G_OBJECT(w), GEOMETRY_MAXIMIZED_KEY)); #ifdef _WIN32 prefs.gui_console_open = fetch_enum_value( - OBJECT_GET_DATA(w, GUI_CONSOLE_OPEN_KEY), gui_console_open_vals); + g_object_get_data(G_OBJECT(w), GUI_CONSOLE_OPEN_KEY), gui_console_open_vals); #endif prefs.gui_fileopen_style = fetch_preference_radio_buttons_val( - OBJECT_GET_DATA(w, GUI_FILEOPEN_KEY), gui_fileopen_vals); + g_object_get_data(G_OBJECT(w), GUI_FILEOPEN_KEY), gui_fileopen_vals); if (prefs.gui_fileopen_dir != NULL) g_free(prefs.gui_fileopen_dir); prefs.gui_fileopen_dir = g_strdup(gtk_entry_get_text( - GTK_ENTRY(OBJECT_GET_DATA(w, GUI_FILEOPEN_DIR_KEY)))); + GTK_ENTRY(g_object_get_data(G_OBJECT(w), GUI_FILEOPEN_DIR_KEY)))); prefs.gui_ask_unsaved = - gtk_toggle_button_get_active(OBJECT_GET_DATA(w, GUI_ASK_UNSAVED_KEY)); + gtk_toggle_button_get_active(g_object_get_data(G_OBJECT(w), GUI_ASK_UNSAVED_KEY)); prefs.gui_find_wrap = - gtk_toggle_button_get_active(OBJECT_GET_DATA(w, GUI_FIND_WRAP_KEY)); + gtk_toggle_button_get_active(g_object_get_data(G_OBJECT(w), GUI_FIND_WRAP_KEY)); prefs.gui_use_pref_save = - gtk_toggle_button_get_active(OBJECT_GET_DATA(w, GUI_USE_PREF_SAVE_KEY)); + gtk_toggle_button_get_active(g_object_get_data(G_OBJECT(w), GUI_USE_PREF_SAVE_KEY)); if (browser_needs_pref()) { g_free(prefs.gui_webbrowser); prefs.gui_webbrowser = g_strdup(gtk_entry_get_text( - GTK_ENTRY(OBJECT_GET_DATA(w, GUI_WEBBROWSER_KEY)))); + GTK_ENTRY(g_object_get_data(G_OBJECT(w), GUI_WEBBROWSER_KEY)))); } /* * XXX - we need to have a way to fetch the preferences into @@ -480,7 +480,7 @@ recent_files_count_changed_cb(GtkWidget *recent_files_entry _U_, GtkWidget *recent_files_count_te; guint newval; - recent_files_count_te = (GtkWidget *)OBJECT_GET_DATA(parent_w, GUI_RECENT_FILES_COUNT_KEY); + recent_files_count_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), GUI_RECENT_FILES_COUNT_KEY); /* * Now, just convert the string to a number and store it in the prefs @@ -505,7 +505,7 @@ fileopen_preview_changed_cb(GtkWidget *recent_files_entry _U_, GtkWidget *fileopen_preview_te; guint newval; - fileopen_preview_te = (GtkWidget *)OBJECT_GET_DATA(parent_w, GUI_FILEOPEN_PREVIEW_KEY); + fileopen_preview_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), GUI_FILEOPEN_PREVIEW_KEY); /* * Now, just convert the string to a number and store it in the prefs @@ -530,7 +530,7 @@ fileopen_dir_changed_cb(GtkWidget *fileopen_entry _U_, GdkEvent *event _U_, gpoi char *lastchar; gint fileopen_dir_te_length; - fileopen_dir_te = (GtkWidget *)OBJECT_GET_DATA(parent_w, GUI_FILEOPEN_DIR_KEY); + fileopen_dir_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), GUI_FILEOPEN_DIR_KEY); fileopen_dir_te_length = strlen(gtk_entry_get_text (GTK_ENTRY(fileopen_entry))); if (fileopen_dir_te_length == 0) return FALSE; @@ -545,8 +545,8 @@ fileopen_selected_cb(GtkWidget *mybutton_rb _U_, gpointer parent_w) { GtkWidget *fileopen_rb, *fileopen_dir_te; - fileopen_rb = (GtkWidget *)OBJECT_GET_DATA(parent_w, GUI_FILEOPEN_KEY); - fileopen_dir_te = (GtkWidget *)OBJECT_GET_DATA(parent_w, GUI_FILEOPEN_DIR_KEY); + fileopen_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), GUI_FILEOPEN_KEY); + fileopen_dir_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), GUI_FILEOPEN_DIR_KEY); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(fileopen_rb))) { diff --git a/gtk/layout_prefs.c b/gtk/layout_prefs.c index 0d67c821d3..204b618bdf 100644 --- a/gtk/layout_prefs.c +++ b/gtk/layout_prefs.c @@ -106,10 +106,10 @@ static GtkWidget *layout_content_radio_vbox(GtkWidget *main_vb, GtkTooltips *too gtk_tooltips_set_tip (tooltips, radio_pbytes_rb, "Put the packet bytes hexdump in this pane.", NULL); gtk_container_add(GTK_CONTAINER(radio_vb), radio_pbytes_rb); - OBJECT_SET_DATA(radio_vb, LAYOUT_NONE_RB_KEY, radio_none_rb); - OBJECT_SET_DATA(radio_vb, LAYOUT_PLIST_RB_KEY, radio_plist_rb); - OBJECT_SET_DATA(radio_vb, LAYOUT_PDETAILS_RB_KEY, radio_pdetails_rb); - OBJECT_SET_DATA(radio_vb, LAYOUT_PBYTES_RB_KEY, radio_pbytes_rb); + g_object_set_data(G_OBJECT(radio_vb), LAYOUT_NONE_RB_KEY, radio_none_rb); + g_object_set_data(G_OBJECT(radio_vb), LAYOUT_PLIST_RB_KEY, radio_plist_rb); + g_object_set_data(G_OBJECT(radio_vb), LAYOUT_PDETAILS_RB_KEY, radio_pdetails_rb); + g_object_set_data(G_OBJECT(radio_vb), LAYOUT_PBYTES_RB_KEY, radio_pbytes_rb); SIGNAL_CONNECT(radio_none_rb, "toggled", layout_validate_cb, main_vb); SIGNAL_CONNECT(radio_plist_rb, "toggled", layout_validate_cb, main_vb); @@ -141,13 +141,13 @@ layout_type_changed_cb (GtkToggleButton * togglebutton, gpointer user_data) static layout_pane_content_e layout_pane_get_content(GtkWidget * radio_vb) { - if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(OBJECT_GET_DATA(radio_vb, LAYOUT_NONE_RB_KEY)))) + if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(radio_vb), LAYOUT_NONE_RB_KEY)))) return layout_pane_content_none; - if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(OBJECT_GET_DATA(radio_vb, LAYOUT_PLIST_RB_KEY)))) + if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(radio_vb), LAYOUT_PLIST_RB_KEY)))) return layout_pane_content_plist; - if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(OBJECT_GET_DATA(radio_vb, LAYOUT_PDETAILS_RB_KEY)))) + if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(radio_vb), LAYOUT_PDETAILS_RB_KEY)))) return layout_pane_content_pdetails; - if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(OBJECT_GET_DATA(radio_vb, LAYOUT_PBYTES_RB_KEY)))) + if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(radio_vb), LAYOUT_PBYTES_RB_KEY)))) return layout_pane_content_pbytes; g_assert_not_reached(); @@ -159,16 +159,16 @@ static void layout_pane_set_content(GtkWidget * radio_vb, layout_pane_content_e switch(pane_content) { case(layout_pane_content_none): - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(OBJECT_GET_DATA(radio_vb, LAYOUT_NONE_RB_KEY)), TRUE); + gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(radio_vb), LAYOUT_NONE_RB_KEY)), TRUE); break; case(layout_pane_content_plist): - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(OBJECT_GET_DATA(radio_vb, LAYOUT_PLIST_RB_KEY)), TRUE); + gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(radio_vb), LAYOUT_PLIST_RB_KEY)), TRUE); break; case(layout_pane_content_pdetails): - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(OBJECT_GET_DATA(radio_vb, LAYOUT_PDETAILS_RB_KEY)), TRUE); + gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(radio_vb), LAYOUT_PDETAILS_RB_KEY)), TRUE); break; case(layout_pane_content_pbytes): - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(OBJECT_GET_DATA(radio_vb, LAYOUT_PBYTES_RB_KEY)), TRUE); + gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(radio_vb), LAYOUT_PBYTES_RB_KEY)), TRUE); break; default: g_assert_not_reached(); @@ -179,21 +179,21 @@ static void layout_pane_set_content(GtkWidget * radio_vb, layout_pane_content_e static void layout_set(GtkWidget * main_vb, layout_t *layout) { GtkWidget *radio_vb; - GtkWidget ** layout_type_buttons = OBJECT_GET_DATA(main_vb, LAYOUT_TYPE_BUTTONS_KEY); + GtkWidget ** layout_type_buttons = g_object_get_data(G_OBJECT(main_vb), LAYOUT_TYPE_BUTTONS_KEY); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(layout_type_buttons[layout->type - 1]), TRUE); - radio_vb = OBJECT_GET_DATA(main_vb, LAYOUT_CONTENT1_VB_KEY); + radio_vb = g_object_get_data(G_OBJECT(main_vb), LAYOUT_CONTENT1_VB_KEY); layout_pane_set_content(radio_vb, layout->content[0]); - radio_vb = OBJECT_GET_DATA(main_vb, LAYOUT_CONTENT2_VB_KEY); + radio_vb = g_object_get_data(G_OBJECT(main_vb), LAYOUT_CONTENT2_VB_KEY); layout_pane_set_content(radio_vb, layout->content[1]); - radio_vb = OBJECT_GET_DATA(main_vb, LAYOUT_CONTENT3_VB_KEY); + radio_vb = g_object_get_data(G_OBJECT(main_vb), LAYOUT_CONTENT3_VB_KEY); layout_pane_set_content(radio_vb, layout->content[2]); } static void layout_get(GtkWidget * main_vb, layout_t *layout_out) { GtkWidget *radio_vb; - GtkWidget ** layout_type_buttons = OBJECT_GET_DATA(main_vb, LAYOUT_TYPE_BUTTONS_KEY); + GtkWidget ** layout_type_buttons = g_object_get_data(G_OBJECT(main_vb), LAYOUT_TYPE_BUTTONS_KEY); int i; for (i=0; i<LAYOUT_QTY; ++i) { @@ -203,11 +203,11 @@ static void layout_get(GtkWidget * main_vb, layout_t *layout_out) { } } - radio_vb = OBJECT_GET_DATA(main_vb, LAYOUT_CONTENT1_VB_KEY); + radio_vb = g_object_get_data(G_OBJECT(main_vb), LAYOUT_CONTENT1_VB_KEY); layout_out->content[0] = layout_pane_get_content(radio_vb); - radio_vb = OBJECT_GET_DATA(main_vb, LAYOUT_CONTENT2_VB_KEY); + radio_vb = g_object_get_data(G_OBJECT(main_vb), LAYOUT_CONTENT2_VB_KEY); layout_out->content[1] = layout_pane_get_content(radio_vb); - radio_vb = OBJECT_GET_DATA(main_vb, LAYOUT_CONTENT3_VB_KEY); + radio_vb = g_object_get_data(G_OBJECT(main_vb), LAYOUT_CONTENT3_VB_KEY); layout_out->content[2] = layout_pane_get_content(radio_vb); } @@ -342,7 +342,7 @@ layout_prefs_show(void) gtk_box_pack_start (GTK_BOX(button_hb), type_tb, TRUE, FALSE, 0); } - OBJECT_SET_DATA(main_vb, LAYOUT_TYPE_BUTTONS_KEY, layout_type_buttons); + g_object_set_data(G_OBJECT(main_vb), LAYOUT_TYPE_BUTTONS_KEY, layout_type_buttons); /* radio hbox */ radio_hb = gtk_hbox_new(FALSE, 0); @@ -352,17 +352,17 @@ layout_prefs_show(void) radio_vb = layout_content_radio_vbox(main_vb, tooltips, 1, prefs.gui_layout_content_1); gtk_container_set_border_width(GTK_CONTAINER(radio_vb), 6); gtk_box_pack_start (GTK_BOX(radio_hb), radio_vb, FALSE, FALSE, 0); - OBJECT_SET_DATA(main_vb, LAYOUT_CONTENT1_VB_KEY, radio_vb); + g_object_set_data(G_OBJECT(main_vb), LAYOUT_CONTENT1_VB_KEY, radio_vb); radio_vb = layout_content_radio_vbox(main_vb, tooltips, 2, prefs.gui_layout_content_2); gtk_container_set_border_width(GTK_CONTAINER(radio_vb), 6); gtk_box_pack_start (GTK_BOX(radio_hb), radio_vb, FALSE, FALSE, 0); - OBJECT_SET_DATA(main_vb, LAYOUT_CONTENT2_VB_KEY, radio_vb); + g_object_set_data(G_OBJECT(main_vb), LAYOUT_CONTENT2_VB_KEY, radio_vb); radio_vb = layout_content_radio_vbox(main_vb, tooltips, 3, prefs.gui_layout_content_3); gtk_container_set_border_width(GTK_CONTAINER(radio_vb), 6); gtk_box_pack_start (GTK_BOX(radio_hb), radio_vb, FALSE, FALSE, 0); - OBJECT_SET_DATA(main_vb, LAYOUT_CONTENT3_VB_KEY, radio_vb); + g_object_set_data(G_OBJECT(main_vb), LAYOUT_CONTENT3_VB_KEY, radio_vb); default_vb = gtk_vbox_new(FALSE, 0); default_bt = gtk_button_new_with_label("Default panes"); @@ -390,7 +390,7 @@ layout_prefs_show(void) gtk_tooltips_set_tip(tooltips, scrollbar_om, "Select where the vertical scrollbar " "will be displayed in the panes.", NULL); - OBJECT_SET_DATA(main_vb, SCROLLBAR_PLACEMENT_KEY, scrollbar_om); + g_object_set_data(G_OBJECT(main_vb), SCROLLBAR_PLACEMENT_KEY, scrollbar_om); /* Alternating row colors in list and tree views */ altern_colors_om = create_preference_option_menu(main_tb, pos++, @@ -399,7 +399,7 @@ layout_prefs_show(void) gtk_tooltips_set_tip(tooltips, altern_colors_om, "Select whether or not the rows of " "lists and trees have alternating color.", NULL); - OBJECT_SET_DATA(main_vb, ALTERN_COLORS_KEY, altern_colors_om); + g_object_set_data(G_OBJECT(main_vb), ALTERN_COLORS_KEY, altern_colors_om); /* Hex Dump highlight style */ highlight_style_om = create_preference_option_menu(main_tb, pos++, @@ -408,7 +408,7 @@ layout_prefs_show(void) gtk_tooltips_set_tip(tooltips, highlight_style_om, "Select the style in which the " "hex dump will be displayed.", NULL); - OBJECT_SET_DATA(main_vb, HEX_DUMP_HIGHLIGHT_STYLE_KEY, highlight_style_om); + g_object_set_data(G_OBJECT(main_vb), HEX_DUMP_HIGHLIGHT_STYLE_KEY, highlight_style_om); /* Toolbar prefs */ toolbar_style_om = create_preference_option_menu(main_tb, pos++, @@ -417,7 +417,7 @@ layout_prefs_show(void) gtk_tooltips_set_tip(tooltips, toolbar_style_om, "Select the style in which the " "toolbar will be displayed.", NULL); - OBJECT_SET_DATA(main_vb, GUI_TOOLBAR_STYLE_KEY, toolbar_style_om); + g_object_set_data(G_OBJECT(main_vb), GUI_TOOLBAR_STYLE_KEY, toolbar_style_om); /* Placement of Filter toolbar */ filter_toolbar_placement_om = create_preference_option_menu(main_tb, pos++, @@ -426,7 +426,7 @@ layout_prefs_show(void) gtk_tooltips_set_tip(tooltips, filter_toolbar_placement_om, "Select where the filter " "toolbar will be displayed." , NULL); - OBJECT_SET_DATA(main_vb, FILTER_TOOLBAR_PLACEMENT_KEY, filter_toolbar_placement_om); + g_object_set_data(G_OBJECT(main_vb), FILTER_TOOLBAR_PLACEMENT_KEY, filter_toolbar_placement_om); /* Window title */ window_title_te = create_preference_entry(main_tb, pos++, @@ -436,7 +436,7 @@ layout_prefs_show(void) gtk_tooltips_set_tip(tooltips, window_title_te, "Enter the text to be prepended to the " "window title.", NULL); - OBJECT_SET_DATA(main_vb, GUI_WINDOW_TITLE_KEY, window_title_te); + g_object_set_data(G_OBJECT(main_vb), GUI_WINDOW_TITLE_KEY, window_title_te); /* Show 'em what we got */ gtk_widget_show_all(main_vb); @@ -463,22 +463,22 @@ layout_prefs_fetch(GtkWidget *w) prefs.gui_layout_content_3 = layout_fetched.content[2]; prefs.gui_scrollbar_on_right = fetch_enum_value( - OBJECT_GET_DATA(w, SCROLLBAR_PLACEMENT_KEY), + g_object_get_data(G_OBJECT(w), SCROLLBAR_PLACEMENT_KEY), scrollbar_placement_vals); prefs.gui_altern_colors = fetch_enum_value( - OBJECT_GET_DATA(w, ALTERN_COLORS_KEY), altern_colors_vals); + g_object_get_data(G_OBJECT(w), ALTERN_COLORS_KEY), altern_colors_vals); prefs.filter_toolbar_show_in_statusbar = fetch_enum_value( - OBJECT_GET_DATA(w, FILTER_TOOLBAR_PLACEMENT_KEY), filter_toolbar_placement_vals); + g_object_get_data(G_OBJECT(w), FILTER_TOOLBAR_PLACEMENT_KEY), filter_toolbar_placement_vals); prefs.gui_hex_dump_highlight_style = fetch_enum_value( - OBJECT_GET_DATA(w, HEX_DUMP_HIGHLIGHT_STYLE_KEY), highlight_style_vals); + g_object_get_data(G_OBJECT(w), HEX_DUMP_HIGHLIGHT_STYLE_KEY), highlight_style_vals); prefs.gui_toolbar_main_style = fetch_enum_value( - OBJECT_GET_DATA(w, GUI_TOOLBAR_STYLE_KEY), toolbar_style_vals); + g_object_get_data(G_OBJECT(w), GUI_TOOLBAR_STYLE_KEY), toolbar_style_vals); if (prefs.gui_window_title != NULL) g_free(prefs.gui_window_title); prefs.gui_window_title = g_strdup(gtk_entry_get_text( - GTK_ENTRY(OBJECT_GET_DATA(w, GUI_WINDOW_TITLE_KEY)))); + GTK_ENTRY(g_object_get_data(G_OBJECT(w), GUI_WINDOW_TITLE_KEY)))); } void @@ -491,7 +491,7 @@ layout_prefs_apply(GtkWidget *w _U_) void layout_prefs_destroy(GtkWidget *main_vb) { - GtkWidget ** layout_type_buttons = OBJECT_GET_DATA(main_vb, LAYOUT_TYPE_BUTTONS_KEY); + GtkWidget ** layout_type_buttons = g_object_get_data(G_OBJECT(main_vb), LAYOUT_TYPE_BUTTONS_KEY); g_free(layout_type_buttons); } diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index 8a2b0c9c00..9b52c4e2f8 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -1339,7 +1339,7 @@ static gint quit(GtkWidget *widget, GdkEventExpose *event _U_) { user_data_t *user_data; - user_data=(user_data_t *)OBJECT_GET_DATA(widget, "user_data_t"); + user_data=(user_data_t *)g_object_get_data(G_OBJECT(widget), "user_data_t"); user_data->dlg.dialog_graph.window = NULL; return TRUE; @@ -1350,7 +1350,7 @@ static gint expose_event(GtkWidget *widget, GdkEventExpose *event) { user_data_t *user_data; - user_data=(user_data_t *)OBJECT_GET_DATA(widget, "user_data_t"); + user_data=(user_data_t *)g_object_get_data(G_OBJECT(widget), "user_data_t"); if(!user_data){ exit(10); } @@ -1372,7 +1372,7 @@ static gint configure_event(GtkWidget *widget, GdkEventConfigure *event _U_) user_data_t *user_data; int i; - user_data=(user_data_t *)OBJECT_GET_DATA(widget, "user_data_t"); + user_data=(user_data_t *)g_object_get_data(G_OBJECT(widget), "user_data_t"); if(!user_data){ exit(10); @@ -1433,7 +1433,7 @@ static void create_draw_area(user_data_t* user_data, GtkWidget *box) { user_data->dlg.dialog_graph.draw_area=gtk_drawing_area_new(); SIGNAL_CONNECT(user_data->dlg.dialog_graph.draw_area, "destroy", quit, user_data); - OBJECT_SET_DATA(user_data->dlg.dialog_graph.draw_area, "user_data_t", user_data); + g_object_set_data(G_OBJECT(user_data->dlg.dialog_graph.draw_area), "user_data_t", user_data); WIDGET_SET_SIZE(user_data->dlg.dialog_graph.draw_area, user_data->dlg.dialog_graph.pixmap_width, user_data->dlg.dialog_graph.pixmap_height); @@ -1547,7 +1547,7 @@ static void yscale_select(GtkWidget *item, gpointer key) user_data_t *user_data; user_data=(user_data_t *)key; - val=(long)OBJECT_GET_DATA(item, "yscale_max"); + val=(long)g_object_get_data(G_OBJECT(item), "yscale_max"); user_data->dlg.dialog_graph.max_y_units=val; dialog_graph_redraw(user_data); @@ -1560,7 +1560,7 @@ static void pixels_per_tick_select(GtkWidget *item, gpointer key) user_data_t *user_data; user_data=(user_data_t *)key; - val=(long)OBJECT_GET_DATA(item, "pixels_per_tick"); + val=(long)g_object_get_data(G_OBJECT(item), "pixels_per_tick"); user_data->dlg.dialog_graph.pixels_per_tick=val; dialog_graph_redraw(user_data); } @@ -1572,7 +1572,7 @@ static void tick_interval_select(GtkWidget *item, gpointer key) user_data_t *user_data; user_data=(user_data_t *)key; - val=(long)OBJECT_GET_DATA(item, "tick_interval"); + val=(long)g_object_get_data(G_OBJECT(item), "tick_interval"); user_data->dlg.dialog_graph.interval=val; cf_retap_packets(&cfile, FALSE); @@ -1593,7 +1593,7 @@ static void create_yscale_max_menu_items(user_data_t* user_data, GtkWidget *menu g_snprintf(str, 15, "%u ms", yscale_max[i]/1000); } menu_item=gtk_menu_item_new_with_label(str); - OBJECT_SET_DATA(menu_item, "yscale_max", + g_object_set_data(G_OBJECT(menu_item), "yscale_max", GUINT_TO_POINTER(yscale_max[i])); SIGNAL_CONNECT(menu_item, "activate", yscale_select, user_data); gtk_widget_show(menu_item); @@ -1613,7 +1613,7 @@ static void create_pixels_per_tick_menu_items(user_data_t* user_data, GtkWidget g_snprintf(str, 5, "%u", pixels_per_tick[i]); menu_item=gtk_menu_item_new_with_label(str); - OBJECT_SET_DATA(menu_item, "pixels_per_tick", + g_object_set_data(G_OBJECT(menu_item), "pixels_per_tick", GUINT_TO_POINTER(pixels_per_tick[i])); SIGNAL_CONNECT(menu_item, "activate", pixels_per_tick_select, user_data); gtk_widget_show(menu_item); @@ -1643,7 +1643,7 @@ static void create_tick_interval_menu_items(user_data_t* user_data, GtkWidget *m } menu_item=gtk_menu_item_new_with_label(str); - OBJECT_SET_DATA(menu_item, "tick_interval", + g_object_set_data(G_OBJECT(menu_item), "tick_interval", GUINT_TO_POINTER(tick_interval_values[i])); SIGNAL_CONNECT(menu_item, "activate", tick_interval_select, (gpointer)user_data); gtk_widget_show(menu_item); @@ -1748,7 +1748,7 @@ static void dialog_graph_init_window(user_data_t* user_data) gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); - bt_close = OBJECT_GET_DATA(hbox, GTK_STOCK_CLOSE); + bt_close = g_object_get_data(G_OBJECT(hbox), GTK_STOCK_CLOSE); window_set_cancel_button(user_data->dlg.dialog_graph.window, bt_close, window_cancel_button_cb); SIGNAL_CONNECT(user_data->dlg.dialog_graph.window, "delete_event", window_delete_event_cb, NULL); @@ -1874,10 +1874,10 @@ static void save_csv_as_ok_cb(GtkWidget *bt _U_, gpointer fs /*user_data_t *user return; } - rev = (GtkWidget*)OBJECT_GET_DATA(bt, "reversed_rb"); - forw = (GtkWidget*)OBJECT_GET_DATA(bt, "forward_rb"); - both = (GtkWidget*)OBJECT_GET_DATA(bt, "both_rb"); - user_data = (user_data_t*)OBJECT_GET_DATA(bt, "user_data"); + rev = (GtkWidget*)g_object_get_data(G_OBJECT(bt), "reversed_rb"); + forw = (GtkWidget*)g_object_get_data(G_OBJECT(bt), "forward_rb"); + both = (GtkWidget*)g_object_get_data(G_OBJECT(bt), "both_rb"); + user_data = (user_data_t*)g_object_get_data(G_OBJECT(bt), "user_data"); if (GTK_TOGGLE_BUTTON(forw)->active || GTK_TOGGLE_BUTTON(both)->active) { fp = eth_fopen(g_dest, "w"); @@ -2067,10 +2067,10 @@ static void save_csv_as_cb(GtkWidget *bt _U_, user_data_t *user_data _U_) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(both_rb), TRUE); ok_bt = GTK_FILE_SELECTION(user_data->dlg.save_csv_as_w)->ok_button; - OBJECT_SET_DATA(ok_bt, "forward_rb", forward_rb); - OBJECT_SET_DATA(ok_bt, "reversed_rb", reversed_rb); - OBJECT_SET_DATA(ok_bt, "both_rb", both_rb); - OBJECT_SET_DATA(ok_bt, "user_data", user_data); + g_object_set_data(G_OBJECT(ok_bt), "forward_rb", forward_rb); + g_object_set_data(G_OBJECT(ok_bt), "reversed_rb", reversed_rb); + g_object_set_data(G_OBJECT(ok_bt), "both_rb", both_rb); + g_object_set_data(G_OBJECT(ok_bt), "user_data", user_data); SIGNAL_CONNECT(ok_bt, "clicked", save_csv_as_ok_cb, user_data->dlg.save_csv_as_w); @@ -2406,14 +2406,14 @@ static void save_voice_as_ok_cb(GtkWidget *ok_bt _U_, gpointer fs _U_) return; } - /*wav = (GtkWidget *)OBJECT_GET_DATA(ok_bt, "wav_rb"); - sw = (GtkWidget *)OBJECT_GET_DATA(ok_bt, "sw_rb");*/ - au = (GtkWidget *)OBJECT_GET_DATA(ok_bt, "au_rb"); - raw = (GtkWidget *)OBJECT_GET_DATA(ok_bt, "raw_rb"); - rev = (GtkWidget *)OBJECT_GET_DATA(ok_bt, "reversed_rb"); - forw = (GtkWidget *)OBJECT_GET_DATA(ok_bt, "forward_rb"); - both = (GtkWidget *)OBJECT_GET_DATA(ok_bt, "both_rb"); - user_data = (user_data_t *)OBJECT_GET_DATA(ok_bt, "user_data"); + /*wav = (GtkWidget *)g_object_get_data(G_OBJECT(ok_bt), "wav_rb"); + sw = (GtkWidget *)g_object_get_data(G_OBJECT(ok_bt), "sw_rb");*/ + au = (GtkWidget *)g_object_get_data(G_OBJECT(ok_bt), "au_rb"); + raw = (GtkWidget *)g_object_get_data(G_OBJECT(ok_bt), "raw_rb"); + rev = (GtkWidget *)g_object_get_data(G_OBJECT(ok_bt), "reversed_rb"); + forw = (GtkWidget *)g_object_get_data(G_OBJECT(ok_bt), "forward_rb"); + both = (GtkWidget *)g_object_get_data(G_OBJECT(ok_bt), "both_rb"); + user_data = (user_data_t *)g_object_get_data(G_OBJECT(ok_bt), "user_data"); /* XXX user clicks the ok button, but we know we can't save the voice info because f.e. * we don't support that codec. So we pop up a warning. Maybe it would be better to @@ -2699,14 +2699,14 @@ static void on_save_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data _U_) */ ok_bt = GTK_FILE_SELECTION(user_data->dlg.save_voice_as_w)->ok_button; - /*OBJECT_SET_DATA(ok_bt, "wav_rb", wav_rb);*/ - OBJECT_SET_DATA(ok_bt, "au_rb", au_rb); - /*OBJECT_SET_DATA(ok_bt, "sw_rb", sw_rb);*/ - OBJECT_SET_DATA(ok_bt, "raw_rb", raw_rb); - OBJECT_SET_DATA(ok_bt, "forward_rb", forward_rb); - OBJECT_SET_DATA(ok_bt, "reversed_rb", reversed_rb); - OBJECT_SET_DATA(ok_bt, "both_rb", both_rb); - OBJECT_SET_DATA(ok_bt, "user_data", user_data); + /*g_object_set_data(G_OBJECT(ok_bt), "wav_rb", wav_rb);*/ + g_object_set_data(G_OBJECT(ok_bt), "au_rb", au_rb); + /*g_object_set_data(G_OBJECT(ok_bt), "sw_rb", sw_rb);*/ + g_object_set_data(G_OBJECT(ok_bt), "raw_rb", raw_rb); + g_object_set_data(G_OBJECT(ok_bt), "forward_rb", forward_rb); + g_object_set_data(G_OBJECT(ok_bt), "reversed_rb", reversed_rb); + g_object_set_data(G_OBJECT(ok_bt), "both_rb", both_rb); + g_object_set_data(G_OBJECT(ok_bt), "user_data", user_data); SIGNAL_CONNECT(ok_bt, "clicked", save_voice_as_ok_cb, user_data->dlg.save_voice_as_w); @@ -3033,7 +3033,7 @@ static void create_rtp_dialog(user_data_t* user_data) /* Start a notebook for flipping between sets of changes */ notebook = gtk_notebook_new(); gtk_container_add(GTK_CONTAINER(main_vb), notebook); - OBJECT_SET_DATA(window, "notebook", notebook); + g_object_set_data(G_OBJECT(window), "notebook", notebook); user_data->dlg.notebook_signal_id = SIGNAL_CONNECT(notebook, "switch_page", on_notebook_switch_page, user_data); diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c index 614e06fb0c..2f023c0651 100644 --- a/gtk/simple_dialog.c +++ b/gtk/simple_dialog.c @@ -190,7 +190,7 @@ display_simple_dialog(gint type, gint btn_mask, char *message) /* optional check button */ ask_cb = gtk_check_button_new_with_label("replace with text..."); gtk_container_add(GTK_CONTAINER(msg_vb), ask_cb); - OBJECT_SET_DATA(win, CHECK_BUTTON, ask_cb); + g_object_set_data(G_OBJECT(win), CHECK_BUTTON, ask_cb); /* Button row */ switch(btn_mask) { @@ -220,44 +220,44 @@ display_simple_dialog(gint type, gint btn_mask, char *message) gtk_container_add(GTK_CONTAINER(main_vb), bbox); gtk_widget_show(bbox); - ok_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_OK); + ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); if(ok_bt) { - OBJECT_SET_DATA(ok_bt, CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_OK)); + g_object_set_data(G_OBJECT(ok_bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_OK)); SIGNAL_CONNECT(ok_bt, "clicked", simple_dialog_cancel_cb, win); } - save_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_SAVE); + save_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE); if (save_bt) { - OBJECT_SET_DATA(save_bt, CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_SAVE)); + g_object_set_data(G_OBJECT(save_bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_SAVE)); SIGNAL_CONNECT(save_bt, "clicked", simple_dialog_cancel_cb, win); } - dont_save_bt = OBJECT_GET_DATA(bbox, WIRESHARK_STOCK_DONT_SAVE); + dont_save_bt = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_DONT_SAVE); if (dont_save_bt) { - OBJECT_SET_DATA(dont_save_bt, CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_DONT_SAVE)); + g_object_set_data(G_OBJECT(dont_save_bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_DONT_SAVE)); SIGNAL_CONNECT(dont_save_bt, "clicked", simple_dialog_cancel_cb, win); } - bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLEAR); + bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLEAR); if(bt) { - OBJECT_SET_DATA(bt, CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_CLEAR)); + g_object_set_data(G_OBJECT(bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_CLEAR)); SIGNAL_CONNECT(bt, "clicked", simple_dialog_cancel_cb, win); } - yes_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_YES); + yes_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_YES); if(yes_bt) { - OBJECT_SET_DATA(yes_bt, CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_YES)); + g_object_set_data(G_OBJECT(yes_bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_YES)); SIGNAL_CONNECT(yes_bt, "clicked", simple_dialog_cancel_cb, win); } - bt = OBJECT_GET_DATA(bbox, GTK_STOCK_NO); + bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_NO); if(bt) { - OBJECT_SET_DATA(bt, CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_NO)); + g_object_set_data(G_OBJECT(bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_NO)); SIGNAL_CONNECT(bt, "clicked", simple_dialog_cancel_cb, win); } - bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL); + bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); if(bt) { - OBJECT_SET_DATA(bt, CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_CANCEL)); + g_object_set_data(G_OBJECT(bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_CANCEL)); window_set_cancel_button(win, bt, simple_dialog_cancel_cb); } @@ -362,9 +362,9 @@ simple_dialog(ESD_TYPE_E type, gint btn_mask, const gchar *msg_format, ...) static void simple_dialog_cancel_cb(GtkWidget *w, gpointer win) { - gint button = GPOINTER_TO_INT( OBJECT_GET_DATA(w, CALLBACK_BTN_KEY)); - simple_dialog_cb_t callback_fct = OBJECT_GET_DATA(win, CALLBACK_FCT_KEY); - gpointer data = OBJECT_GET_DATA(win, CALLBACK_DATA_KEY); + gint button = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), CALLBACK_BTN_KEY)); + simple_dialog_cb_t callback_fct = g_object_get_data(G_OBJECT(win), CALLBACK_FCT_KEY); + gpointer data = g_object_get_data(G_OBJECT(win), CALLBACK_DATA_KEY); if (callback_fct) (callback_fct) (win, button, data); @@ -375,18 +375,18 @@ simple_dialog_cancel_cb(GtkWidget *w, gpointer win) { void simple_dialog_close(gpointer dialog) { - window_destroy(GTK_WIDGET(dialog)); + window_destroy(GTK_WIDGET(dialog)); } void simple_dialog_set_cb(gpointer dialog, simple_dialog_cb_t callback_fct, gpointer data) { - OBJECT_SET_DATA(GTK_WIDGET(dialog), CALLBACK_FCT_KEY, callback_fct); - OBJECT_SET_DATA(GTK_WIDGET(dialog), CALLBACK_DATA_KEY, data); + g_object_set_data(G_OBJECT(GTK_WIDGET(dialog)), CALLBACK_FCT_KEY, callback_fct); + g_object_set_data(G_OBJECT(GTK_WIDGET(dialog)), CALLBACK_DATA_KEY, data); } void simple_dialog_check_set(gpointer dialog, gchar *text _U_) { - GtkWidget *ask_cb = OBJECT_GET_DATA(dialog, CHECK_BUTTON); + GtkWidget *ask_cb = g_object_get_data(G_OBJECT(dialog), CHECK_BUTTON); /* XXX - find a way to set the GtkButton label in GTK 1.x */ gtk_button_set_label(GTK_BUTTON(ask_cb), text); @@ -394,7 +394,7 @@ void simple_dialog_check_set(gpointer dialog, gchar *text _U_) { } gboolean simple_dialog_check_get(gpointer dialog) { - GtkWidget *ask_cb = OBJECT_GET_DATA(GTK_WIDGET(dialog), CHECK_BUTTON); + GtkWidget *ask_cb = g_object_get_data(G_OBJECT(GTK_WIDGET(dialog)), CHECK_BUTTON); return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ask_cb)); } diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c index 030932df63..3f13fb943d 100644 --- a/gtk/tcp_graph.c +++ b/gtk/tcp_graph.c @@ -653,11 +653,11 @@ static void create_drawing_area (struct graph *g) g->toplevel = dlg_window_new ("Tcp Graph"); gtk_window_set_title(GTK_WINDOW(g->toplevel), window_title); gtk_widget_set_name (g->toplevel, "Test Graph"); - OBJECT_SET_DATA(g->toplevel, "graph", g); + g_object_set_data(G_OBJECT(g->toplevel), "graph", g); /* Create the drawing area */ g->drawing_area = gtk_drawing_area_new (); - OBJECT_SET_DATA(g->drawing_area, "graph", g); + g_object_set_data(G_OBJECT(g->drawing_area), "graph", g); g->x_axis->drawing_area = g->y_axis->drawing_area = g->drawing_area; gtk_drawing_area_size (GTK_DRAWING_AREA (g->drawing_area), g->wp.width + g->wp.x + RMARGIN_WIDTH, @@ -822,10 +822,10 @@ static void control_panel_create (struct graph *g) gtk_table_attach (GTK_TABLE (table), bbox, 0, 1, 1, 2, GTK_FILL|GTK_EXPAND, GTK_FILL, 5, 5); - help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP); + help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); SIGNAL_CONNECT(help_bt, "clicked", callback_create_help, g); - close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE); + close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(toplevel, close_bt, NULL); SIGNAL_CONNECT(close_bt, "clicked", callback_close, g); @@ -983,7 +983,7 @@ static void callback_create_help(GtkWidget *widget _U_, gpointer data _U_) gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0); gtk_widget_show(bbox); - close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE); + close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(toplevel, close_bt, window_cancel_button_cb); SIGNAL_CONNECT(toplevel, "delete_event", window_delete_event_cb, NULL); @@ -1063,8 +1063,8 @@ static GtkWidget *control_panel_create_zoom_group (struct graph *g) zoom_same_toggle = gtk_check_button_new_with_label("Keep them the same"); zoom_ratio_toggle = gtk_check_button_new_with_label("Preserve their ratio"); - OBJECT_SET_DATA(zoom_same_toggle, "flag", (gpointer)ZOOM_STEPS_SAME); - OBJECT_SET_DATA(zoom_ratio_toggle, "flag", + g_object_set_data(G_OBJECT(zoom_same_toggle), "flag", (gpointer)ZOOM_STEPS_SAME); + g_object_set_data(G_OBJECT(zoom_ratio_toggle), "flag", (gpointer)ZOOM_STEPS_KEEP_RATIO); SIGNAL_CONNECT(zoom_same_toggle, "clicked", callback_zoom_flags, g); SIGNAL_CONNECT(zoom_ratio_toggle, "clicked", callback_zoom_flags, g); @@ -1092,8 +1092,8 @@ static GtkWidget *control_panel_create_zoom_group (struct graph *g) zoom_frame = gtk_frame_new ("Zoom"); gtk_container_add (GTK_CONTAINER (zoom_frame), zoom_box); - OBJECT_SET_DATA(zoom_h_step, "direction", GINT_TO_POINTER(0)); - OBJECT_SET_DATA(zoom_v_step, "direction", GINT_TO_POINTER(1)); + g_object_set_data(G_OBJECT(zoom_h_step), "direction", GINT_TO_POINTER(0)); + g_object_set_data(G_OBJECT(zoom_v_step), "direction", GINT_TO_POINTER(1)); SIGNAL_CONNECT(zoom_in, "toggled", callback_zoom_inout, g); SIGNAL_CONNECT(zoom_h_step, "changed", callback_zoom_step, g); @@ -1123,7 +1123,7 @@ static void callback_zoom_step (GtkWidget *spin, gpointer data) GtkSpinButton *widget_this, *widget_other; double old_this; - direction = (long)OBJECT_GET_DATA(spin, "direction"); + direction = (long)g_object_get_data(G_OBJECT(spin), "direction"); value = gtk_spin_button_get_value_as_float (GTK_SPIN_BUTTON (spin)); if (direction) { @@ -1162,7 +1162,7 @@ static void callback_zoom_step (GtkWidget *spin, gpointer data) static void callback_zoom_flags (GtkWidget *toggle, gpointer data) { struct graph *g = (struct graph * )data; - int flag = (long)OBJECT_GET_DATA(toggle, "flag"); + int flag = (long)g_object_get_data(G_OBJECT(toggle), "flag"); if (GTK_TOGGLE_BUTTON (toggle)->active) g->zoom.flags |= flag; @@ -1265,10 +1265,10 @@ static GtkWidget *control_panel_create_magnify_group (struct graph *g) g->magnify.widget.h_zoom = (GtkSpinButton * )mag_h_zoom; g->magnify.widget.v_zoom = (GtkSpinButton * )mag_v_zoom; - OBJECT_SET_DATA(mag_h_zoom, "direction", GINT_TO_POINTER(0)); - OBJECT_SET_DATA(mag_v_zoom, "direction", GINT_TO_POINTER(1)); - OBJECT_SET_DATA(mag_zoom_same, "flag", (gpointer)MAGZOOMS_SAME); - OBJECT_SET_DATA(mag_zoom_ratio, "flag", (gpointer)MAGZOOMS_SAME_RATIO); + g_object_set_data(G_OBJECT(mag_h_zoom), "direction", GINT_TO_POINTER(0)); + g_object_set_data(G_OBJECT(mag_v_zoom), "direction", GINT_TO_POINTER(1)); + g_object_set_data(G_OBJECT(mag_zoom_same), "flag", (gpointer)MAGZOOMS_SAME); + g_object_set_data(G_OBJECT(mag_zoom_ratio), "flag", (gpointer)MAGZOOMS_SAME_RATIO); SIGNAL_CONNECT(mag_width, "changed", callback_mag_width, g); SIGNAL_CONNECT(mag_height, "changed", callback_mag_height, g); @@ -1324,7 +1324,7 @@ static void callback_mag_zoom (GtkWidget *spin, gpointer data) g->magnify.flags &= ~MAGZOOMS_IGNORE; return; } - direction = (long)OBJECT_GET_DATA(spin, "direction"); + direction = (long)g_object_get_data(G_OBJECT(spin), "direction"); value = gtk_spin_button_get_value_as_float (GTK_SPIN_BUTTON (spin)); if (direction) { @@ -1367,7 +1367,7 @@ static void callback_mag_zoom (GtkWidget *spin, gpointer data) static void callback_mag_flags (GtkWidget *toggle, gpointer data) { struct graph *g = (struct graph * )data; - int flag = (long)OBJECT_GET_DATA(toggle, "flag"); + int flag = (long)g_object_get_data(G_OBJECT(toggle), "flag"); if (GTK_TOGGLE_BUTTON (toggle)->active) g->magnify.flags |= flag; @@ -1506,11 +1506,11 @@ static GtkWidget *control_panel_create_graph_type_group (struct graph *g) graph_frame = gtk_frame_new ("Graph type:"); gtk_container_add (GTK_CONTAINER (graph_frame), graph_box); - OBJECT_SET_DATA(graph_tseqstevens, "new-graph-type", + g_object_set_data(G_OBJECT(graph_tseqstevens), "new-graph-type", GINT_TO_POINTER(0)); - OBJECT_SET_DATA(graph_tseqttrace, "new-graph-type", GINT_TO_POINTER(1)); - OBJECT_SET_DATA(graph_tput, "new-graph-type", GINT_TO_POINTER(2)); - OBJECT_SET_DATA(graph_rtt, "new-graph-type", GINT_TO_POINTER(3)); + g_object_set_data(G_OBJECT(graph_tseqttrace), "new-graph-type", GINT_TO_POINTER(1)); + g_object_set_data(G_OBJECT(graph_tput), "new-graph-type", GINT_TO_POINTER(2)); + g_object_set_data(G_OBJECT(graph_rtt), "new-graph-type", GINT_TO_POINTER(3)); SIGNAL_CONNECT(graph_tseqttrace, "toggled", callback_graph_type, g); SIGNAL_CONNECT(graph_tseqstevens, "toggled", callback_graph_type, g); @@ -1527,7 +1527,7 @@ static void callback_graph_type (GtkWidget *toggle, gpointer data) int old_type, new_type; struct graph *g = (struct graph * )data; - new_type = (long)OBJECT_GET_DATA(toggle,"new-graph-type"); + new_type = (long)g_object_get_data(G_OBJECT(toggle),"new-graph-type"); if (!GTK_TOGGLE_BUTTON (toggle)->active) return; @@ -2732,7 +2732,7 @@ static void magnify_draw (struct graph *g) static gint configure_event (GtkWidget *widget, GdkEventConfigure *event) { - struct graph *g = (struct graph *) OBJECT_GET_DATA(widget, "graph"); + struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph"); struct { double x, y; } zoom; @@ -2791,7 +2791,7 @@ static gint configure_event (GtkWidget *widget, GdkEventConfigure *event) static gint expose_event (GtkWidget *widget, GdkEventExpose *event) { - struct graph *g = (struct graph *) OBJECT_GET_DATA(widget, "graph"); + struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph"); debug(DBS_FENTRY) puts ("expose_event()"); @@ -2815,7 +2815,7 @@ static gint expose_event (GtkWidget *widget, GdkEventExpose *event) static gint button_press_event (GtkWidget *widget, GdkEventButton *event) { - struct graph *g = (struct graph *) OBJECT_GET_DATA(widget, "graph"); + struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph"); debug(DBS_FENTRY) puts ("button_press_event()"); @@ -2910,7 +2910,7 @@ static gint button_press_event (GtkWidget *widget, GdkEventButton *event) static gint motion_notify_event (GtkWidget *widget, GdkEventMotion *event) { - struct graph *g = (struct graph *) OBJECT_GET_DATA(widget, "graph"); + struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph"); int x, y; GdkModifierType state; @@ -2967,7 +2967,7 @@ static gint motion_notify_event (GtkWidget *widget, GdkEventMotion *event) static gint button_release_event (GtkWidget *widget, GdkEventButton *event) { - struct graph *g = (struct graph *) OBJECT_GET_DATA(widget, "graph"); + struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph"); debug(DBS_FENTRY) puts ("button_release_event()"); @@ -2981,7 +2981,7 @@ static gint button_release_event (GtkWidget *widget, GdkEventButton *event) static gint key_press_event (GtkWidget *widget, GdkEventKey *event) { - struct graph *g = (struct graph *) OBJECT_GET_DATA(widget, "graph"); + struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph"); debug(DBS_FENTRY) puts ("key_press_event()"); @@ -3015,7 +3015,7 @@ static gint key_press_event (GtkWidget *widget, GdkEventKey *event) static gint key_release_event (GtkWidget *widget, GdkEventKey *event) { - struct graph *g = (struct graph *) OBJECT_GET_DATA(widget, "graph"); + struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph"); debug(DBS_FENTRY) puts ("key_release_event()"); @@ -3028,7 +3028,7 @@ static gint key_release_event (GtkWidget *widget, GdkEventKey *event) static gint leave_notify_event (GtkWidget *widget, GdkEventCrossing *event _U_) { - struct graph *g = (struct graph *) OBJECT_GET_DATA(widget, "graph"); + struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph"); if (g->cross.erase_needed) cross_erase (g); @@ -3038,7 +3038,7 @@ static gint leave_notify_event (GtkWidget *widget, GdkEventCrossing *event _U_) static gint enter_notify_event (GtkWidget *widget, GdkEventCrossing *event _U_) { - struct graph *g = (struct graph *) OBJECT_GET_DATA(widget, "graph"); + struct graph *g = (struct graph *) g_object_get_data(G_OBJECT(widget), "graph"); /* graph_pixmap_display (g); */ if (g->cross.draw) { |