osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Replace almost all occurances of GTK_OBJECT by G_OBJECT. 

The remaining uses are inside calls to functions that are deprecated
in gtk3.

svn path=/trunk/; revision=38499
This commit is contained in:
Jörg Mayer 2011-08-12 17:26:20 +00:00
parent 1e2e3edcc0
commit 3a19feec7b
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkvumeter.c
View File

@ -147,7 +147,7 @@ static void gtk_vumeter_destroy (GtkObject *object)
gtk_vumeter_free_colors (vumeter);
GTK_OBJECT_CLASS (parent_class)->destroy (object);
G_OBJECT_CLASS (parent_class)->destroy (object);
}
static void gtk_vumeter_realize (GtkWidget *widget)

4
gtk/main.c
View File

@ -3594,9 +3594,9 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs_p)
gtk_widget_set_name(top_level, "main window");
g_signal_connect(top_level, "delete_event", G_CALLBACK(main_window_delete_event_cb),
NULL);
g_signal_connect(GTK_OBJECT(top_level), "window_state_event",
g_signal_connect(G_OBJECT(top_level), "window_state_event",
G_CALLBACK(window_state_event_cb), NULL);
g_signal_connect(GTK_OBJECT(top_level), "key-press-event",
g_signal_connect(G_OBJECT(top_level), "key-press-event",
G_CALLBACK(top_level_key_pressed_cb), NULL );
/* Vertical container for menu bar, toolbar(s), paned windows and progress/info box */

2
gtk/main_welcome.c
View File

@ -1164,7 +1164,7 @@ welcome_new(void)
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
if_view = gtk_tree_view_new ();
g_object_set(GTK_OBJECT(if_view), "headers-visible", FALSE, NULL);
g_object_set(G_OBJECT(if_view), "headers-visible", FALSE, NULL);
g_object_set_data(G_OBJECT(welcome_hb), TREE_VIEW_INTERFACES, if_view);
renderer = gtk_cell_renderer_pixbuf_new();
column = gtk_tree_view_column_new_with_attributes ("",

6
gtk/menus.c
View File

@ -5129,7 +5129,7 @@ add_menu_recent_capture_file_absolute(gchar *cf_name) {
menu_item = gtk_menu_item_new_with_label(normalized_cf_name);
g_object_set_data(G_OBJECT(menu_item), MENU_RECENT_FILES_KEY, normalized_cf_name);
gtk_menu_shell_prepend (GTK_MENU_SHELL(submenu_recent_files), menu_item);
g_signal_connect_swapped(GTK_OBJECT(menu_item), "activate",
g_signal_connect_swapped(G_OBJECT(menu_item), "activate",
G_CALLBACK(menu_open_recent_file_cmd_cb), (GObject *) menu_item);
gtk_widget_show (menu_item);
@ -5141,7 +5141,7 @@ add_menu_recent_capture_file_absolute(gchar *cf_name) {
/* add new "clear list" item at last position */
menu_item = gtk_image_menu_item_new_from_stock(GTK_STOCK_CLEAR, NULL);
gtk_menu_shell_append (GTK_MENU_SHELL(submenu_recent_files), menu_item);
g_signal_connect_swapped(GTK_OBJECT(menu_item), "activate",
g_signal_connect_swapped(G_OBJECT(menu_item), "activate",
G_CALLBACK(clear_menu_recent_capture_file_cmd_cb), (GObject *) menu_item);
gtk_widget_show (menu_item);
@ -6775,7 +6775,7 @@ rebuild_protocol_prefs_menu (module_t *prefs_module_p, gboolean preferences)
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(menu_item),
gtk_image_new_from_stock(GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU));
gtk_menu_shell_append (GTK_MENU_SHELL(sub_menu), menu_item);
g_signal_connect_swapped(GTK_OBJECT(menu_item), "activate",
g_signal_connect_swapped(G_OBJECT(menu_item), "activate",
G_CALLBACK(properties_cb), (GObject *) menu_item);
gtk_widget_show (menu_item);
g_free (label);

2
gtk/rtp_player.c
View File

@ -2173,7 +2173,7 @@ rtp_player_dlg_create(void)
jitter_spinner = gtk_spin_button_new (jitter_spinner_adj, 5, 0);
gtk_box_pack_start(GTK_BOX(h_jitter_buttons_box), jitter_spinner, FALSE, FALSE, 0);
gtk_widget_set_tooltip_text (jitter_spinner, "The simulated jitter buffer in [ms]");
g_signal_connect(GTK_OBJECT (jitter_spinner_adj), "value_changed", G_CALLBACK(jitter_spinner_value_changed), NULL);
g_signal_connect(G_OBJECT (jitter_spinner_adj), "value_changed", G_CALLBACK(jitter_spinner_value_changed), NULL);
cb_use_rtp_timestamp = gtk_check_button_new_with_label("Use RTP timestamp");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cb_use_rtp_timestamp), FALSE);