XQF
/
xqf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prepare for GTK3

master
Antoine Fontaine 2021-02-28 15:21:24 +01:00 committed by Thomas Debesse
parent 325ca743a0
commit d7d587c284
13 changed files with 161 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/addmaster.c
View File

@ -127,8 +127,7 @@ static void select_master_type_callback (GtkWidget *widget, enum server_type typ
gtk_widget_set_sensitive
(GTK_WIDGET(master_query_type_radios[MASTER_NATIVE]),FALSE);
if (current_master_query_type == MASTER_NATIVE) {
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(master_query_type_radios[MASTER_GAMESPY]),TRUE);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(master_query_type_radios[MASTER_GAMESPY]),TRUE);
}
}
else {
@ -137,12 +136,12 @@ static void select_master_type_callback (GtkWidget *widget, enum server_type typ
}
}
static void master_type_radio_callback (GtkWidget *widget, enum master_query_type type) {
static void master_type_radio_callback(GtkWidget *widget, enum master_query_type type) {
const gchar* master_name;
// This gets called when a button is made inactive AND when it's made active
// so only do this if it's set to active
if (GTK_TOGGLE_BUTTON (master_query_type_radios[type])->active) {
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (master_query_type_radios[type]))) {
current_master_query_type = type;
master_check_master_addr_prefix();
@ -248,8 +247,8 @@ struct master *add_master_dialog (struct master *m) {
gtk_combo_set_use_arrows_always (GTK_COMBO (master_name_combo), TRUE);
gtk_combo_disable_activate (GTK_COMBO (master_name_combo));
g_signal_connect(
GTK_OBJECT (GTK_COMBO (master_name_combo)->entry), "activate",
G_CALLBACK (master_okbutton_callback), GTK_OBJECT (window));
G_OBJECT (GTK_COMBO (master_name_combo)->entry), "activate",
G_CALLBACK (master_okbutton_callback), G_OBJECT (window));
GTK_WIDGET_SET_FLAGS (GTK_COMBO (master_name_combo)->entry, GTK_CAN_FOCUS);
GTK_WIDGET_UNSET_FLAGS (GTK_COMBO (master_name_combo)->button, GTK_CAN_FOCUS);
@ -295,10 +294,10 @@ struct master *add_master_dialog (struct master *m) {
gtk_combo_set_use_arrows_always (GTK_COMBO (master_addr_combo), TRUE);
gtk_combo_disable_activate (GTK_COMBO (master_addr_combo));
g_signal_connect (
GTK_OBJECT (GTK_COMBO (master_addr_combo)->entry), "activate",
G_CALLBACK (master_okbutton_callback), GTK_OBJECT (window));
G_OBJECT (GTK_COMBO (master_addr_combo)->entry), "activate",
G_CALLBACK (master_okbutton_callback), G_OBJECT (window));
g_signal_connect (
GTK_OBJECT (GTK_COMBO (master_addr_combo)->list),
G_OBJECT (GTK_COMBO (master_addr_combo)->list),
"selection-changed",
G_CALLBACK
(master_address_from_history_selected_callback),NULL);
@ -332,7 +331,7 @@ struct master *add_master_dialog (struct master *m) {
if (master_to_edit) {
gtk_widget_set_sensitive (GTK_WIDGET(master_query_type_radios[i]),FALSE);
}
g_signal_connect(GTK_OBJECT (master_query_type_radios[i]), "toggled",
g_signal_connect(G_OBJECT (master_query_type_radios[i]), "toggled",
G_CALLBACK (master_type_radio_callback), (gpointer)i);
gtk_widget_show (master_query_type_radios[i]);
@ -370,7 +369,7 @@ struct master *add_master_dialog (struct master *m) {
button = gtk_button_new_with_label (_("Cancel"));
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_set_usize (button, 80, -1);
g_signal_connect_swapped (GTK_OBJECT (button), "clicked", G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (window));
g_signal_connect_swapped (G_OBJECT (button), "clicked", G_CALLBACK (gtk_widget_destroy), window);
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_widget_show (button);
@ -379,7 +378,7 @@ struct master *add_master_dialog (struct master *m) {
button = gtk_button_new_with_label ("OK");
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_set_usize (button, 80, -1);
g_signal_connect (GTK_OBJECT (button), "clicked", G_CALLBACK(master_okbutton_callback), window);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK(master_okbutton_callback), window);
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_widget_grab_default (button);
gtk_widget_show (button);

18
src/addserver.c
View File

@ -109,11 +109,11 @@ char *add_server_dialog (enum server_type *type, const char* addr) {
gtk_combo_set_use_arrows_always (GTK_COMBO (server_combo), TRUE);
gtk_combo_disable_activate (GTK_COMBO (server_combo));
g_signal_connect (
GTK_OBJECT (GTK_COMBO (server_combo)->entry), "activate",
G_OBJECT (GTK_COMBO (server_combo)->entry), "activate",
G_CALLBACK (server_combo_activate_callback), NULL);
g_signal_connect_swapped (
GTK_OBJECT (GTK_COMBO (server_combo)->entry), "activate",
G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (window));
G_OBJECT (GTK_COMBO (server_combo)->entry), "activate",
G_CALLBACK (gtk_widget_destroy), G_OBJECT (window));
GTK_WIDGET_SET_FLAGS (GTK_COMBO (server_combo)->entry, GTK_CAN_FOCUS);
GTK_WIDGET_UNSET_FLAGS (GTK_COMBO (server_combo)->button, GTK_CAN_FOCUS);
@ -150,8 +150,8 @@ char *add_server_dialog (enum server_type *type, const char* addr) {
button = gtk_button_new_with_label (_("Cancel"));
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_set_usize (button, 80, -1);
g_signal_connect_swapped (GTK_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (window));
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), G_OBJECT (window));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_widget_show (button);
@ -160,11 +160,11 @@ char *add_server_dialog (enum server_type *type, const char* addr) {
button = gtk_button_new_with_label ("OK");
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_set_usize (button, 80, -1);
g_signal_connect_swapped (GTK_OBJECT (button), "clicked",
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (server_combo_activate_callback),
GTK_OBJECT (GTK_COMBO (server_combo)->entry));
g_signal_connect_swapped (GTK_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (window));
G_OBJECT (GTK_COMBO (server_combo)->entry));
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), G_OBJECT (window));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_widget_grab_default (button);
gtk_widget_show (button);

68
src/dialogs.c
View File

@ -51,17 +51,17 @@ GtkWidget *dialog_create_modal_transient_window (const char *title,
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
g_signal_connect (GTK_OBJECT (window), "delete_event",
g_signal_connect (G_OBJECT (window), "delete_event",
G_CALLBACK (window_delete_event_callback), NULL);
if (on_destroy) {
g_signal_connect (GTK_OBJECT (window), "destroy",
g_signal_connect (G_OBJECT (window), "destroy",
G_CALLBACK (on_destroy), NULL);
}
g_signal_connect (GTK_OBJECT (window), "destroy",
g_signal_connect (G_OBJECT (window), "destroy",
G_CALLBACK (gtk_main_quit), NULL);
if (close_on_esc) {
g_signal_connect (GTK_OBJECT (window), "key_press_event",
g_signal_connect (G_OBJECT (window), "key_press_event",
G_CALLBACK (destroy_on_escape), NULL);
}
@ -136,8 +136,8 @@ void dialog_ok (const char *title, const char *fmt, ...) {
button = gtk_button_new_with_label (_("OK"));
gtk_widget_set_usize (button, 96, -1);
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, FALSE, 0);
g_signal_connect_swapped (GTK_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (window));
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), G_OBJECT (window));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_widget_grab_default (button);
gtk_widget_show (button);
@ -211,10 +211,10 @@ int dialog_yesno (const char *title, int defbutton, char *yes, char *no,
button = gtk_button_new_with_label ((yes)? yes : _("Yes"));
gtk_widget_set_usize (button, 96, -1);
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, FALSE, 0);
g_signal_connect (GTK_OBJECT (button), "clicked",
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (yes_button_clicked_callback), &res);
g_signal_connect_swapped (GTK_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (window));
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), G_OBJECT (window));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
if (defbutton == 0)
gtk_widget_grab_default (button);
@ -223,8 +223,8 @@ int dialog_yesno (const char *title, int defbutton, char *yes, char *no,
button = gtk_button_new_with_label ((no)? no : _("No"));
gtk_widget_set_usize (button, 96, -1);
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, FALSE, 0);
g_signal_connect_swapped (GTK_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (window));
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), G_OBJECT (window));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
if (defbutton == 1)
gtk_widget_grab_default (button);
@ -291,10 +291,10 @@ int dialog_yesnoredial (const char *title, int defbutton, char *yes, char *no, c
button = gtk_button_new_with_label ((yes)? yes : _("Yes"));
gtk_widget_set_usize (button, 96, -1);
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, FALSE, 0);
g_signal_connect (GTK_OBJECT (button), "clicked",
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (yes_button_clicked_callback), &res);
g_signal_connect_swapped (GTK_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (window));
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), G_OBJECT (window));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
if (defbutton == 0)
gtk_widget_grab_default (button);
@ -303,8 +303,8 @@ int dialog_yesnoredial (const char *title, int defbutton, char *yes, char *no, c
button = gtk_button_new_with_label ((no)? no : _("No"));
gtk_widget_set_usize (button, 96, -1);
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, FALSE, 0);
g_signal_connect_swapped (GTK_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (window));
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), G_OBJECT (window));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
if (defbutton == 1)
gtk_widget_grab_default (button);
@ -313,10 +313,10 @@ int dialog_yesnoredial (const char *title, int defbutton, char *yes, char *no, c
button = gtk_button_new_with_label ((redial)? redial : _("Redial"));
gtk_widget_set_usize (button, 96, -1);
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, FALSE, 0);
g_signal_connect (GTK_OBJECT (button), "clicked",
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (redial_button_clicked_callback), &res);
g_signal_connect_swapped (GTK_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (window));
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), G_OBJECT (window));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
if (defbutton == 2)
gtk_widget_grab_default (button);
@ -384,21 +384,21 @@ static char *va_enter_string_dialog (int visible, char *optstr, int *optval, cha
gtk_entry_set_visibility (GTK_ENTRY (enter_string_entry), visible);
gtk_widget_set_usize (enter_string_entry, 128, -1);
gtk_box_pack_start (GTK_BOX (hbox), enter_string_entry, TRUE, TRUE, 0);
g_signal_connect (GTK_OBJECT (enter_string_entry), "activate",
g_signal_connect (G_OBJECT (enter_string_entry), "activate",
G_CALLBACK (enter_string_activate_callback), NULL);
g_signal_connect_swapped (GTK_OBJECT (enter_string_entry), "activate",
G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (window));
g_signal_connect_swapped (G_OBJECT (enter_string_entry), "activate",
G_CALLBACK (gtk_widget_destroy), G_OBJECT (window));
gtk_widget_grab_focus (enter_string_entry);
gtk_widget_show (enter_string_entry);
/* OK Button */
button = gtk_button_new_with_label (_("OK"));
g_signal_connect_swapped (GTK_OBJECT (button), "clicked",
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (enter_string_activate_callback),
GTK_OBJECT (enter_string_entry));
g_signal_connect_swapped (GTK_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (window));
G_OBJECT (enter_string_entry));
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), G_OBJECT (window));
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
@ -406,8 +406,8 @@ static char *va_enter_string_dialog (int visible, char *optstr, int *optval, cha
button = gtk_button_new_with_label (_("Cancel"));
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
g_signal_connect_swapped (GTK_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (window));
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), G_OBJECT (window));
gtk_widget_show (button);
gtk_widget_show (hbox);
@ -543,19 +543,19 @@ GtkWidget* file_dialog(const char *title, GtkSignalFunc ok_callback, gpointer da
gtk_window_set_modal (GTK_WINDOW(file_selector),TRUE);
// g_signal_connect (GTK_OBJECT (file_selector), "destroy", (GtkSignalFunc) file_dialog_destroy_callback, &file_selector);
// g_signal_connect (G_OBJECT (file_selector), "destroy", (GtkSignalFunc) file_dialog_destroy_callback, &file_selector);
g_signal_connect (GTK_OBJECT (file_selector->ok_button),
g_signal_connect (G_OBJECT (file_selector->ok_button),
"clicked", ok_callback, data);
g_signal_connect_swapped (GTK_OBJECT (file_selector->ok_button),
g_signal_connect_swapped (G_OBJECT (file_selector->ok_button),
"clicked", (GtkSignalFunc) gtk_widget_destroy,
GTK_OBJECT (file_selector));
G_OBJECT (file_selector));
/* Connect the cancel_button to destroy the widget */
g_signal_connect_swapped (GTK_OBJECT (file_selector->cancel_button),
g_signal_connect_swapped (G_OBJECT (file_selector->cancel_button),
"clicked", (GtkSignalFunc) gtk_widget_destroy,
GTK_OBJECT (file_selector));
G_OBJECT (file_selector));
gtk_widget_show(GTK_WIDGET(file_selector));

6
src/dialogs.h
View File

@ -22,8 +22,10 @@
#include <gtk/gtk.h>
static inline GtkWidget* topmost_parent(GtkWidget* widget) {
for (; widget && widget->parent; widget = widget->parent);
return widget;
GtkWidget *previous_widget = widget;
while ( (widget = gtk_widget_get_parent (widget)) )
previous_widget = widget;
return previous_widget;
}
extern GtkWidget *dialog_create_modal_transient_window (const char *title, int close_on_esc, int allow_resize, GtkSignalFunc on_destroy);

24
src/filter.c
View File

@ -558,17 +558,17 @@ static struct server_filter_vars* server_filter_new_from_widgets() {
struct server_filter_vars* filter = server_filter_vars_new();
if (!filter) return NULL;
filter->filter_retries = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(filter_retries_spinner));
filter->filter_ping = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(filter_ping_spinner));
filter->filter_not_full = GTK_TOGGLE_BUTTON(filter_not_full_check_button)->active;
filter->filter_not_empty = GTK_TOGGLE_BUTTON(filter_not_empty_check_button)->active;
filter->filter_no_password = GTK_TOGGLE_BUTTON(filter_no_password_check_button)->active;
filter->filter_no_cheats = GTK_TOGGLE_BUTTON(filter_no_cheats_check_button)->active;
filter->game_type = gtk_editable_get_chars(GTK_EDITABLE(filter_game_type_entry), 0, -1);
filter->version_contains = gtk_editable_get_chars(GTK_EDITABLE(version_contains_entry), 0, -1);
filter->game_contains = gtk_editable_get_chars(GTK_EDITABLE(game_contains_entry), 0, -1);
filter->map_contains = gtk_editable_get_chars(GTK_EDITABLE(map_contains_entry), 0, -1);
filter->server_name_contains = gtk_editable_get_chars(GTK_EDITABLE(server_name_contains_entry), 0, -1);
filter->filter_retries = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (filter_retries_spinner));
filter->filter_ping = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (filter_ping_spinner));
filter->filter_not_full = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(filter_not_full_check_button));
filter->filter_not_empty = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (filter_not_empty_check_button));
filter->filter_no_password = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (filter_no_password_check_button));
filter->filter_no_cheats = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (filter_no_cheats_check_button));
filter->game_type = gtk_editable_get_chars (GTK_EDITABLE (filter_game_type_entry), 0, -1);
filter->version_contains = gtk_editable_get_chars (GTK_EDITABLE (version_contains_entry), 0, -1);
filter->game_contains = gtk_editable_get_chars (GTK_EDITABLE (game_contains_entry), 0, -1);
filter->map_contains = gtk_editable_get_chars (GTK_EDITABLE (map_contains_entry), 0, -1);
filter->server_name_contains = gtk_editable_get_chars (GTK_EDITABLE (server_name_contains_entry), 0, -1);
#ifdef USE_GEOIP
@ -1796,7 +1796,7 @@ static void populate_country_clist(GtkWidget* clist, gboolean all) {
}
static void country_show_all_changed_callback (GtkWidget *widget, GtkWidget *clist) {
populate_country_clist(clist,gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)));
populate_country_clist(clist, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widget)));
}
/* country selection window */

100
src/pref.c
View File

@ -1758,7 +1758,7 @@ static GtkWidget *q1_skin_box_create (void) {
q1_top_color_button = gtk_button_new_with_label (" ");
gtk_widget_set_usize (q1_top_color_button, 40, -1);
g_signal_connect (GTK_OBJECT (q1_top_color_button), "event",
g_signal_connect (G_OBJECT (q1_top_color_button), "event",
G_CALLBACK (color_button_event_callback), NULL);
gtk_table_attach_defaults (GTK_TABLE (table), q1_top_color_button,
1, 2, 0, 1);
@ -1774,7 +1774,7 @@ static GtkWidget *q1_skin_box_create (void) {
q1_bottom_color_button = gtk_button_new_with_label (" ");
gtk_widget_set_usize (q1_bottom_color_button, 40, -1);
g_signal_connect (GTK_OBJECT (q1_bottom_color_button), "event",
g_signal_connect (G_OBJECT (q1_bottom_color_button), "event",
G_CALLBACK (color_button_event_callback), NULL);
gtk_table_attach_defaults (GTK_TABLE (table), q1_bottom_color_button,
1, 2, 1, 2);
@ -1834,7 +1834,7 @@ static GtkWidget *qw_skin_box_create (void) {
gtk_widget_set_usize(GTK_COMBO(qw_skin_combo)->entry, 112, -1);
gtk_combo_set_use_arrows_always(GTK_COMBO(qw_skin_combo), TRUE);
gtk_combo_set_case_sensitive(GTK_COMBO(qw_skin_combo), TRUE);
g_signal_connect (GTK_OBJECT(GTK_COMBO(qw_skin_combo)->entry),
g_signal_connect (G_OBJECT(GTK_COMBO(qw_skin_combo)->entry),
"changed", G_CALLBACK(qw_skin_combo_changed_callback), NULL);
gtk_container_add(GTK_CONTAINER(alignment), qw_skin_combo);
gtk_widget_show(qw_skin_combo);
@ -1857,7 +1857,7 @@ static GtkWidget *qw_skin_box_create (void) {
qw_top_color_button = gtk_button_new_with_label (" ");
gtk_widget_set_usize (qw_top_color_button, 40, -1);
g_signal_connect (GTK_OBJECT (qw_top_color_button), "event",
g_signal_connect (G_OBJECT (qw_top_color_button), "event",
G_CALLBACK (color_button_event_callback), NULL);
gtk_table_attach_defaults (GTK_TABLE (table), qw_top_color_button,
1, 2, 0, 1);
@ -1873,7 +1873,7 @@ static GtkWidget *qw_skin_box_create (void) {
qw_bottom_color_button = gtk_button_new_with_label (" ");
gtk_widget_set_usize (qw_bottom_color_button, 40, -1);
g_signal_connect (GTK_OBJECT (qw_bottom_color_button), "event", G_CALLBACK (color_button_event_callback), NULL);
g_signal_connect (G_OBJECT (qw_bottom_color_button), "event", G_CALLBACK (color_button_event_callback), NULL);
gtk_table_attach_defaults (GTK_TABLE (table), qw_bottom_color_button, 1, 2, 1, 2);
set_bg_color (qw_bottom_color_button, fix_qw_player_color (pref_qw_bottom_color));
gtk_widget_show (qw_bottom_color_button);
@ -1974,7 +1974,7 @@ static GtkWidget *q2_skin_box_create (void) {
gtk_widget_set_usize(GTK_COMBO(q2_skin_combo)->entry, 144, -1);
gtk_combo_set_use_arrows_always(GTK_COMBO(q2_skin_combo), TRUE);
gtk_combo_set_case_sensitive(GTK_COMBO(q2_skin_combo), TRUE);
g_signal_connect(GTK_OBJECT(GTK_COMBO(q2_skin_combo)->entry), "changed", G_CALLBACK(q2_skin_combo_changed_callback), NULL);
g_signal_connect(G_OBJECT(GTK_COMBO(q2_skin_combo)->entry), "changed", G_CALLBACK(q2_skin_combo_changed_callback), NULL);
gtk_container_add(GTK_CONTAINER(alignment), q2_skin_combo);
gtk_widget_show(q2_skin_combo);
@ -2316,7 +2316,7 @@ static GtkWidget *create_wb_switch_menu(void(*callback)(GtkWidget *, int)) {
for (i = 0; i < 9; i++) {
menu_item = gtk_menu_item_new_with_label(_(wb_switch_labels[i]));
g_signal_connect(GTK_OBJECT(menu_item), "activate", G_CALLBACK(callback), GINT_TO_POINTER(i));
g_signal_connect(G_OBJECT(menu_item), "activate", G_CALLBACK(callback), GINT_TO_POINTER(i));
gtk_menu_append(GTK_MENU(menu), menu_item);
gtk_widget_show(menu_item);
}
@ -2341,17 +2341,17 @@ static GtkWidget *create_noskins_menu (int qworq2) {
menu = gtk_menu_new();
menu_item = gtk_menu_item_new_with_label(_("Use skins"));
g_signal_connect(GTK_OBJECT(menu_item), "activate", G_CALLBACK(callback), (gpointer) 0);
g_signal_connect(G_OBJECT(menu_item), "activate", G_CALLBACK(callback), (gpointer) 0);
gtk_menu_append(GTK_MENU(menu), menu_item);
gtk_widget_show(menu_item);
menu_item = gtk_menu_item_new_with_label(_("Don\'t use skins"));
g_signal_connect(GTK_OBJECT(menu_item), "activate", G_CALLBACK(callback), (gpointer) 1);
g_signal_connect(G_OBJECT(menu_item), "activate", G_CALLBACK(callback), (gpointer) 1);
gtk_menu_append(GTK_MENU(menu), menu_item);
gtk_widget_show(menu_item);
menu_item = gtk_menu_item_new_with_label(_("Don\'t download new skins"));
g_signal_connect(GTK_OBJECT(menu_item), "activate", G_CALLBACK(callback), (gpointer) 2);
g_signal_connect(G_OBJECT(menu_item), "activate", G_CALLBACK(callback), (gpointer) 2);
gtk_menu_append(GTK_MENU(menu), menu_item);
gtk_widget_show(menu_item);
@ -2742,18 +2742,18 @@ static GtkWidget *generic_game_frame (enum server_type type) {
gtk_entry_set_text(GTK_ENTRY(genprefs[type].cmd_entry), games[type].cmd);
gtk_entry_set_position(GTK_ENTRY(genprefs[type].cmd_entry), 0);
}
g_signal_connect_swapped(GTK_OBJECT(genprefs[type].cmd_entry), "activate", G_CALLBACK(game_file_activate_callback), GINT_TO_POINTER(type));
g_signal_connect_swapped(G_OBJECT(genprefs[type].cmd_entry), "activate", G_CALLBACK(game_file_activate_callback), GINT_TO_POINTER(type));
gtk_box_pack_start(GTK_BOX(hbox),genprefs[type].cmd_entry , TRUE, TRUE, 0);
gtk_widget_show(genprefs[type].cmd_entry);
button = gtk_button_new_with_label("...");
g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(game_file_dialog), GINT_TO_POINTER(type));
g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK(game_file_dialog), GINT_TO_POINTER(type));
gtk_box_pack_start(GTK_BOX(hbox),button , FALSE, FALSE, 3);
gtk_widget_show(button);
// translator: button for command suggestion
button = gtk_button_new_with_label(_("Suggest"));
g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(pref_suggest_command), GINT_TO_POINTER(type));
g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK(pref_suggest_command), GINT_TO_POINTER(type));
gtk_widget_set_sensitive(button, pref_can_suggest(type));
gtk_box_pack_start(GTK_BOX(hbox),button , FALSE, FALSE, 0);
@ -2781,13 +2781,13 @@ static GtkWidget *generic_game_frame (enum server_type type) {
gtk_box_pack_start(GTK_BOX(hbox),genprefs[type].dir_entry , TRUE, TRUE, 0);
button = gtk_button_new_with_label("...");
g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(game_dir_dialog), (gpointer)type);
g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK(game_dir_dialog), (gpointer)type);
gtk_box_pack_start(GTK_BOX(hbox),button , FALSE, FALSE, 3);
gtk_widget_show(button);
// translator: button for directory guess
button = gtk_button_new_with_label(_("Suggest"));
g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(game_file_activate_callback), (gpointer)type);
g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK(game_file_activate_callback), (gpointer)type);
gtk_box_pack_start(GTK_BOX(hbox),button , FALSE, FALSE, 0);
gtk_tooltips_set_tip(tooltips, button, _("Tries to guess the working directory based on the command line"), NULL);
@ -2795,11 +2795,11 @@ static GtkWidget *generic_game_frame (enum server_type type) {
if (games[type].custom_cfgs) {
gtk_object_set_user_data(GTK_OBJECT(genprefs[type].dir_entry), (gpointer) type);
g_signal_connect(GTK_OBJECT(genprefs[type].dir_entry),
g_signal_connect(G_OBJECT(genprefs[type].dir_entry),
"activate",
G_CALLBACK(dir_entry_activate_callback),
NULL);
g_signal_connect(GTK_OBJECT(genprefs[type].dir_entry),
g_signal_connect(G_OBJECT(genprefs[type].dir_entry),
"focus_out_event",
G_CALLBACK(dir_entry_activate_callback),
NULL);
@ -2876,21 +2876,21 @@ static GtkWidget *custom_args_options_page (enum server_type type) {
hbox1 = gtk_hbox_new(FALSE, 0);
gtk_widget_ref(hbox1);
gtk_object_set_data_full(GTK_OBJECT(page_vbox), "hbox1", hbox1, (GtkDestroyNotify) gtk_widget_unref);
g_object_set_data_full(G_OBJECT(page_vbox), "hbox1", hbox1, (GDestroyNotify) gtk_widget_unref);
gtk_widget_show(hbox1);
gtk_container_add(GTK_CONTAINER(page_vbox), hbox1);
gtk_container_set_border_width(GTK_CONTAINER(hbox1), 3);
vbox1 = gtk_vbox_new(FALSE, 0);
gtk_widget_ref(vbox1);
gtk_object_set_data_full(GTK_OBJECT(page_vbox), "vbox1", vbox1, (GtkDestroyNotify) gtk_widget_unref);
g_object_set_data_full(G_OBJECT(page_vbox), "vbox1", vbox1, (GDestroyNotify) gtk_widget_unref);
gtk_widget_show(vbox1);
gtk_box_pack_start(GTK_BOX(hbox1), vbox1, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox1), 2);
scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_ref(scrolledwindow1);
gtk_object_set_data_full(GTK_OBJECT(page_vbox), "scrolledwindow1", scrolledwindow1, (GtkDestroyNotify) gtk_widget_unref);
g_object_set_data_full(G_OBJECT(page_vbox), "scrolledwindow1", scrolledwindow1, (GDestroyNotify) gtk_widget_unref);
gtk_widget_show(scrolledwindow1);
gtk_box_pack_start(GTK_BOX(vbox1), scrolledwindow1, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(scrolledwindow1), 2);
@ -2898,37 +2898,37 @@ static GtkWidget *custom_args_options_page (enum server_type type) {
arguments_clist = gtk_clist_new(2);
gtk_widget_ref(arguments_clist);
gtk_object_set_data_full(GTK_OBJECT(page_vbox), "arguments_clist", arguments_clist, (GtkDestroyNotify) gtk_widget_unref);
g_object_set_data_full(G_OBJECT(page_vbox), "arguments_clist", arguments_clist, (GDestroyNotify) gtk_widget_unref);
gtk_widget_show(arguments_clist);
gtk_container_add(GTK_CONTAINER(scrolledwindow1), arguments_clist);
gtk_clist_column_titles_show(GTK_CLIST(arguments_clist));
g_signal_connect(GTK_OBJECT(arguments_clist), "select_row", G_CALLBACK(custom_args_clist_select_row_callback), arguments_clist);
g_signal_connect(G_OBJECT(arguments_clist), "select_row", G_CALLBACK(custom_args_clist_select_row_callback), arguments_clist);
gtk_object_set_user_data(GTK_OBJECT(arguments_clist), (gpointer) type);
game_label = gtk_label_new(_("Game"));
gtk_widget_ref(game_label);
gtk_object_set_data_full(GTK_OBJECT(page_vbox), "game_label", game_label, (GtkDestroyNotify) gtk_widget_unref);
g_object_set_data_full(G_OBJECT(page_vbox), "game_label", game_label, (GDestroyNotify) gtk_widget_unref);
gtk_label_set_justify(GTK_LABEL(game_label), GTK_JUSTIFY_LEFT);
gtk_widget_show(game_label);
gtk_clist_set_column_widget(GTK_CLIST(arguments_clist), 0, game_label);
arguments_label = gtk_label_new(_("Arguments"));
gtk_widget_ref(arguments_label);
gtk_object_set_data_full(GTK_OBJECT(page_vbox), "arguments_label", arguments_label, (GtkDestroyNotify) gtk_widget_unref);
g_object_set_data_full(G_OBJECT(page_vbox), "arguments_label", arguments_label, (GDestroyNotify) gtk_widget_unref);
gtk_label_set_justify(GTK_LABEL(arguments_label), GTK_JUSTIFY_LEFT);
gtk_widget_show(arguments_label);
gtk_clist_set_column_widget(GTK_CLIST(arguments_clist), 1, arguments_label);
frame1 = gtk_frame_new(_("Game and Arguments"));
gtk_widget_ref(frame1);
gtk_object_set_data_full(GTK_OBJECT(page_vbox), "frame1", frame1, (GtkDestroyNotify) gtk_widget_unref);
g_object_set_data_full(G_OBJECT(page_vbox), "frame1", frame1, (GDestroyNotify) gtk_widget_unref);
gtk_widget_show(frame1);
gtk_box_pack_start(GTK_BOX(vbox1), frame1, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(frame1), 3);
hbox2 = gtk_hbox_new(FALSE, 0);
gtk_widget_ref(hbox2);
gtk_object_set_data_full(GTK_OBJECT(page_vbox), "hbox2", hbox2, (GtkDestroyNotify) gtk_widget_unref);
g_object_set_data_full(G_OBJECT(page_vbox), "hbox2", hbox2, (GDestroyNotify) gtk_widget_unref);
gtk_widget_show(hbox2);
gtk_container_add(GTK_CONTAINER(frame1), hbox2);
gtk_container_set_border_width(GTK_CONTAINER(hbox2), 4);
@ -2936,9 +2936,9 @@ static GtkWidget *custom_args_options_page (enum server_type type) {
custom_args_entry_game[type] = gtk_entry_new();
gtk_widget_ref(custom_args_entry_game[type]);
gtk_widget_set_usize(custom_args_entry_game[type], 90, -2);
gtk_object_set_data_full(GTK_OBJECT(page_vbox), "custom_args_entry_game[type]",
g_object_set_data_full(G_OBJECT(page_vbox), "custom_args_entry_game[type]",
custom_args_entry_game[type],
(GtkDestroyNotify) gtk_widget_unref);
(GDestroyNotify) gtk_widget_unref);
gtk_widget_show(custom_args_entry_game[type]);
gtk_box_pack_start(GTK_BOX(hbox2), custom_args_entry_game[type], FALSE, TRUE, 0);
gtk_tooltips_set_tip(tooltips, custom_args_entry_game[type], _("Enter the game name from the game column"), NULL);
@ -2946,9 +2946,9 @@ static GtkWidget *custom_args_options_page (enum server_type type) {
custom_args_entry_args[type] = gtk_entry_new();
gtk_widget_ref(custom_args_entry_args[type]);
gtk_object_set_data_full(GTK_OBJECT(page_vbox), "custom_args_entry_args[type]",
g_object_set_data_full(G_OBJECT(page_vbox), "custom_args_entry_args[type]",
custom_args_entry_args[type],
(GtkDestroyNotify) gtk_widget_unref);
(GDestroyNotify) gtk_widget_unref);
gtk_widget_show(custom_args_entry_args[type]);
gtk_box_pack_start(GTK_BOX(hbox2), custom_args_entry_args[type], TRUE, TRUE, 0);
gtk_tooltips_set_tip(tooltips, custom_args_entry_args[type], _("Enter the arguments separated by spaces"), NULL);
@ -2956,56 +2956,56 @@ static GtkWidget *custom_args_options_page (enum server_type type) {
vbuttonbox1 = gtk_vbox_new(FALSE, 0);
gtk_widget_ref(vbuttonbox1);
gtk_object_set_data_full(GTK_OBJECT(page_vbox), "vbuttonbox1", vbuttonbox1, (GtkDestroyNotify) gtk_widget_unref);
g_object_set_data_full(G_OBJECT(page_vbox), "vbuttonbox1", vbuttonbox1, (GDestroyNotify) gtk_widget_unref);
gtk_widget_show(vbuttonbox1);
gtk_box_pack_start(GTK_BOX(hbox1), vbuttonbox1, FALSE, TRUE, 0);
new_button = gtk_button_new_with_label(_("New"));
gtk_widget_ref(new_button);
gtk_object_set_data_full(GTK_OBJECT(page_vbox), "new_button", new_button, (GtkDestroyNotify) gtk_widget_unref);
g_object_set_data_full(G_OBJECT(page_vbox), "new_button", new_button, (GDestroyNotify) gtk_widget_unref);
gtk_widget_show(new_button);
gtk_box_pack_start(GTK_BOX(vbuttonbox1), new_button, FALSE, FALSE, 5);
GTK_WIDGET_SET_FLAGS(new_button, GTK_CAN_DEFAULT);
delete_button = gtk_button_new_with_label(_("Delete"));
gtk_widget_ref(delete_button);
gtk_object_set_data_full(GTK_OBJECT(page_vbox), "delete_button", delete_button, (GtkDestroyNotify) gtk_widget_unref);
g_object_set_data_full(G_OBJECT(page_vbox), "delete_button", delete_button, (GDestroyNotify) gtk_widget_unref);
gtk_widget_show(delete_button);
gtk_box_pack_start(GTK_BOX(vbuttonbox1), delete_button, FALSE, FALSE, 5);
GTK_WIDGET_SET_FLAGS(delete_button, GTK_CAN_DEFAULT);
defaults_button = gtk_button_new_with_label(_("Add Defaults"));
gtk_widget_ref(defaults_button);
gtk_object_set_data_full(GTK_OBJECT(page_vbox), "defaults_button", defaults_button, (GtkDestroyNotify) gtk_widget_unref);
g_object_set_data_full(G_OBJECT(page_vbox), "defaults_button", defaults_button, (GDestroyNotify) gtk_widget_unref);
gtk_widget_show(defaults_button);
gtk_box_pack_start(GTK_BOX(vbuttonbox1), defaults_button, FALSE, FALSE, 5);
GTK_WIDGET_SET_FLAGS(defaults_button, GTK_CAN_DEFAULT);
custom_args_add_button[type] = gtk_button_new_with_label(_("Add/Update"));
gtk_widget_ref(custom_args_add_button[type]);
gtk_object_set_data_full(GTK_OBJECT(page_vbox), "add_button", custom_args_add_button[type], (GtkDestroyNotify) gtk_widget_unref);
g_object_set_data_full(G_OBJECT(page_vbox), "add_button", custom_args_add_button[type], (GDestroyNotify) gtk_widget_unref);
gtk_widget_show(custom_args_add_button[type]);
gtk_box_pack_end(GTK_BOX(vbuttonbox1), custom_args_add_button[type], FALSE, FALSE, 7);
gtk_widget_set_sensitive(custom_args_add_button[type], FALSE);
GTK_WIDGET_SET_FLAGS(custom_args_add_button[type], GTK_CAN_DEFAULT);
gtk_object_set_user_data(GTK_OBJECT(new_button), (gpointer) type);
g_signal_connect(GTK_OBJECT(new_button), "clicked",
g_signal_connect(G_OBJECT(new_button), "clicked",
G_CALLBACK(new_custom_args_callback),
(gpointer) arguments_clist);
gtk_object_set_user_data(GTK_OBJECT(delete_button), (gpointer) type);
g_signal_connect(GTK_OBJECT(delete_button), "clicked",
g_signal_connect(G_OBJECT(delete_button), "clicked",
G_CALLBACK(delete_custom_args_callback),
(gpointer) arguments_clist);
gtk_object_set_user_data(GTK_OBJECT(defaults_button), (gpointer) type);
g_signal_connect(GTK_OBJECT(defaults_button), "clicked",
g_signal_connect(G_OBJECT(defaults_button), "clicked",
G_CALLBACK(add_custom_args_defaults),
(gpointer) arguments_clist);
gtk_object_set_user_data(GTK_OBJECT(custom_args_add_button[type]), (gpointer) type);
g_signal_connect(GTK_OBJECT(custom_args_add_button[type]), "clicked",
g_signal_connect(G_OBJECT(custom_args_add_button[type]), "clicked",
G_CALLBACK(add_custom_args_callback),
(gpointer) arguments_clist);
@ -3083,7 +3083,7 @@ static GtkWidget *games_config_page (int defgame) {
gtk_container_add (GTK_CONTAINER (genprefs[i].game_button), game_pixmap_with_label (i));
g_signal_connect (GTK_OBJECT (genprefs[i].game_button), "select",
g_signal_connect (G_OBJECT (genprefs[i].game_button), "select",
G_CALLBACK (game_listitem_selected_callback), GINT_TO_POINTER(i));
gtk_widget_show(genprefs[i].game_button);
@ -3417,17 +3417,17 @@ static GtkWidget *q3_mem_options_page (void) {
button = gtk_button_new_with_label(_("Default"));
gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
g_signal_connect (GTK_OBJECT (button), "clicked", G_CALLBACK (q3_set_memory_callback), (gpointer) 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (q3_set_memory_callback), (gpointer) 0);
gtk_widget_show (button);
button = gtk_button_new_with_label(_("128MB"));
gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
g_signal_connect (GTK_OBJECT (button), "clicked", G_CALLBACK (q3_set_memory_callback), (gpointer) 1);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (q3_set_memory_callback), (gpointer) 1);
gtk_widget_show (button);
button = gtk_button_new_with_label(_(">256MB"));
gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
g_signal_connect (GTK_OBJECT (button), "clicked", G_CALLBACK (q3_set_memory_callback), (gpointer) 2);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (q3_set_memory_callback), (gpointer) 2);
gtk_widget_show (button);
gtk_widget_show (hbox2);
@ -3924,7 +3924,7 @@ static GtkWidget *general_options_page (void) {
GtkWidget* button = gtk_button_new_with_label(_("scan now"));
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_misc_set_padding(GTK_MISC(GTK_BIN(button)->child),4,0);
g_signal_connect (GTK_OBJECT (button), "clicked", G_CALLBACK (scan_maps_callback), NULL);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (scan_maps_callback), NULL);
gtk_widget_show (button);
}
@ -3949,7 +3949,7 @@ static GtkWidget *general_options_page (void) {
terminate_check_button = gtk_check_button_new_with_label (_("Terminate XQF"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (terminate_check_button), default_terminate);
g_signal_connect (GTK_OBJECT (terminate_check_button), "toggled", G_CALLBACK (terminate_toggled_callback), NULL);
g_signal_connect (G_OBJECT (terminate_check_button), "toggled", G_CALLBACK (terminate_toggled_callback), NULL);
gtk_box_pack_start (GTK_BOX (hbox), terminate_check_button, FALSE, FALSE, 0);
gtk_widget_show (terminate_check_button);
@ -3962,7 +3962,7 @@ static GtkWidget *general_options_page (void) {
launchinfo_check_button = gtk_check_button_new_with_label (_("Create LaunchInfo.txt"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (launchinfo_check_button), default_launchinfo);
g_signal_connect (GTK_OBJECT (launchinfo_check_button), "toggled", G_CALLBACK (launchinfo_toggled_callback), NULL);
g_signal_connect (G_OBJECT (launchinfo_check_button), "toggled", G_CALLBACK (launchinfo_toggled_callback), NULL);
gtk_box_pack_start (GTK_BOX (hbox), launchinfo_check_button, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, launchinfo_check_button, _("Creates the file ~/.config/xqf/LaunchInfo.txt with: ping ip:port name map curplayers maxplayers"), NULL);
gtk_widget_show (launchinfo_check_button);
@ -3976,7 +3976,7 @@ static GtkWidget *general_options_page (void) {
prelaunchexec_check_button = gtk_check_button_new_with_label (_("Execute prelaunch"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prelaunchexec_check_button), default_prelaunchexec);
g_signal_connect (GTK_OBJECT (prelaunchexec_check_button), "toggled", G_CALLBACK (prelaunchexec_toggled_callback), NULL);
g_signal_connect (G_OBJECT (prelaunchexec_check_button), "toggled", G_CALLBACK (prelaunchexec_toggled_callback), NULL);
gtk_box_pack_start (GTK_BOX (hbox), prelaunchexec_check_button, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, prelaunchexec_check_button, _("Executes ~/.config/xqf/PreLaunch (if it exists) before launching the game"), NULL);
gtk_widget_show (prelaunchexec_check_button);
@ -4015,7 +4015,7 @@ static GtkWidget *general_options_page (void) {
save_srvinfo_check_button = gtk_check_button_new_with_label (_("Save server information"));
gtk_box_pack_start (GTK_BOX (hbox), save_srvinfo_check_button, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (save_srvinfo_check_button), default_save_srvinfo);
g_signal_connect (GTK_OBJECT (save_srvinfo_check_button), "toggled", G_CALLBACK (save_srvinfo_toggled_callback), NULL);
g_signal_connect (G_OBJECT (save_srvinfo_check_button), "toggled", G_CALLBACK (save_srvinfo_toggled_callback), NULL);
gtk_widget_show (save_srvinfo_check_button);
gtk_widget_show (hbox);
@ -4516,14 +4516,14 @@ void preferences_dialog (int page_num) {
button = gtk_button_new_with_label (_("Cancel"));
gtk_widget_set_usize (button, 80, -1);
g_signal_connect_swapped (GTK_OBJECT (button), "clicked", G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (window));
g_signal_connect_swapped (G_OBJECT (button), "clicked", G_CALLBACK (gtk_widget_destroy), G_OBJECT (window));
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_widget_show (button);
button = gtk_button_new_with_label (_("OK"));
gtk_widget_set_usize (button, 80, -1);
g_signal_connect (GTK_OBJECT (button), "clicked", G_CALLBACK (ok_callback), GTK_OBJECT(window));
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (ok_callback), G_OBJECT(window));
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_widget_grab_default (button);

18
src/psearch.c
View File

@ -198,10 +198,10 @@ int find_player_dialog (void) {
gtk_entry_select_region (GTK_ENTRY (GTK_COMBO (psearch_combo)->entry), 0,
strlen ((char *) psearch_history->items->data));
}
g_signal_connect (GTK_OBJECT (GTK_COMBO (psearch_combo)->entry),
g_signal_connect (G_OBJECT (GTK_COMBO (psearch_combo)->entry),
"activate", G_CALLBACK (psearch_combo_activate_callback), NULL);
g_signal_connect_swapped (GTK_OBJECT (GTK_COMBO (psearch_combo)->entry),
"activate", G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (window));
g_signal_connect_swapped (G_OBJECT (GTK_COMBO (psearch_combo)->entry),
"activate", G_CALLBACK (gtk_widget_destroy), G_OBJECT (window));
gtk_box_pack_start (GTK_BOX (hbox), psearch_combo, TRUE, TRUE, 0);
gtk_widget_grab_focus (GTK_COMBO (psearch_combo)->entry);
gtk_widget_show (psearch_combo);
@ -209,19 +209,19 @@ int find_player_dialog (void) {
/* OK Button */
button = gtk_button_new_with_label (_("OK"));
g_signal_connect_swapped (GTK_OBJECT (button), "clicked",
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (psearch_combo_activate_callback),
GTK_OBJECT (psearch_combo));
g_signal_connect_swapped (GTK_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (window));
G_OBJECT (psearch_combo));
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), G_OBJECT (window));
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
/* Cancel Button */
button = gtk_button_new_with_label (_("Cancel"));
g_signal_connect_swapped (GTK_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (window));
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), G_OBJECT (window));
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);

12
src/rcon.c
View File

@ -593,7 +593,7 @@ void rcon_dialog (const struct server *s, const char *passwd) {
gtk_combo_set_case_sensitive (GTK_COMBO (rcon_combo), TRUE);
gtk_combo_set_use_arrows_always (GTK_COMBO (rcon_combo), TRUE);
gtk_combo_disable_activate (GTK_COMBO (rcon_combo));
g_signal_connect (GTK_OBJECT (GTK_COMBO (rcon_combo)->entry), "activate",
g_signal_connect (G_OBJECT (GTK_COMBO (rcon_combo)->entry), "activate",
G_CALLBACK (rcon_combo_activate_callback), NULL);
GTK_WIDGET_SET_FLAGS (GTK_COMBO (rcon_combo)->entry, GTK_CAN_FOCUS);
GTK_WIDGET_UNSET_FLAGS (GTK_COMBO (rcon_combo)->button, GTK_CAN_FOCUS);
@ -610,7 +610,7 @@ void rcon_dialog (const struct server *s, const char *passwd) {
/* Send Button */
button = gtk_button_new_with_label (_("Send"));
g_signal_connect (GTK_OBJECT (button), "clicked",
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (rcon_combo_activate_callback), NULL);
GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
@ -619,7 +619,7 @@ void rcon_dialog (const struct server *s, const char *passwd) {
/* Status Button */
button = gtk_button_new_with_label (_("Status"));
g_signal_connect (GTK_OBJECT (button), "clicked",
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (rcon_status_button_clicked_callback), NULL);
GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
@ -628,7 +628,7 @@ void rcon_dialog (const struct server *s, const char *passwd) {
/* Clear Button */
button = gtk_button_new_with_label (_("Clear"));
g_signal_connect (GTK_OBJECT (button), "clicked",
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (rcon_clear_button_clicked_callback), NULL);
GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
@ -652,8 +652,8 @@ void rcon_dialog (const struct server *s, const char *passwd) {
button = gtk_button_new_with_label (_("Close"));
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_set_usize (button, 80, -1);
g_signal_connect_swapped (GTK_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (window));
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), G_OBJECT (window));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_widget_grab_default (button);
gtk_widget_show (button);

24
src/redial.c
View File

@ -66,7 +66,7 @@ static void on_cancelbutton_clicked (GtkButton *button, gpointer user_data) {
* is reached, starts a new stat_process then
*/
static gboolean redial_countdown (struct server* s) {
void* blub = gtk_object_get_data(GTK_OBJECT(redial_window),"secondsprogress");
void* blub = g_object_get_data(G_OBJECT(redial_window),"secondsprogress");
struct condef* con;
countdown++;
if (countdown>default_redial_wait) {
@ -110,7 +110,7 @@ static void stat_redial_server_handler (struct stat_job *job, struct server *s)
/** set server name for redial dialog */
static void set_redial_label(const char* name, gboolean waiting) {
GtkWidget* label = gtk_object_get_data(GTK_OBJECT(redial_window),"label");
GtkWidget* label = g_object_get_data(G_OBJECT(redial_window),"label");
char* text;
if (waiting)
text = g_strdup_printf(_("Waiting for free slots on\n%s"),name);
@ -167,54 +167,54 @@ static GtkWidget* create_redialwindow (void) {
#if 0
redialwindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_object_set_data (GTK_OBJECT (redialwindow), "redialwindow", redialwindow);
g_object_set_data (G_OBJECT (redialwindow), "redialwindow", redialwindow);
gtk_window_set_title (GTK_WINDOW (redialwindow), _("XQF: Redialing"));
gtk_window_set_modal (GTK_WINDOW (redialwindow), TRUE);
#endif
vbox1 = gtk_vbox_new (FALSE, 5);
gtk_widget_ref (vbox1);
gtk_object_set_data_full (GTK_OBJECT (redialwindow), "vbox1", vbox1, (GtkDestroyNotify) gtk_widget_unref);
g_object_set_data_full (G_OBJECT (redialwindow), "vbox1", vbox1, (GDestroyNotify) gtk_widget_unref);
gtk_widget_show (vbox1);
gtk_container_add (GTK_CONTAINER (redialwindow), vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), 14);
label = gtk_label_new (_("***\n***"));
gtk_widget_ref (label);
gtk_object_set_data_full (GTK_OBJECT (redialwindow), "label", label, (GtkDestroyNotify) gtk_widget_unref);
g_object_set_data_full (G_OBJECT (redialwindow), "label", label, (GDestroyNotify) gtk_widget_unref);
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (vbox1), label, FALSE, FALSE, 0);
secondsprogress = gtk_progress_bar_new ();
gtk_widget_ref (secondsprogress);
gtk_object_set_data_full (GTK_OBJECT (redialwindow), "secondsprogress", secondsprogress, (GtkDestroyNotify) gtk_widget_unref);
g_object_set_data_full (G_OBJECT (redialwindow), "secondsprogress", secondsprogress, (GDestroyNotify) gtk_widget_unref);
gtk_widget_show (secondsprogress);
gtk_box_pack_start (GTK_BOX (vbox1), secondsprogress, FALSE, FALSE, 10);
gtk_progress_configure (GTK_PROGRESS (secondsprogress), 4, 0, 10);
hbuttonbox1 = gtk_hbutton_box_new ();
gtk_widget_ref (hbuttonbox1);
gtk_object_set_data_full (GTK_OBJECT (redialwindow), "hbuttonbox1", hbuttonbox1, (GtkDestroyNotify) gtk_widget_unref);
g_object_set_data_full (G_OBJECT (redialwindow), "hbuttonbox1", hbuttonbox1, (GDestroyNotify) gtk_widget_unref);
gtk_widget_show (hbuttonbox1);
gtk_box_pack_start (GTK_BOX (vbox1), hbuttonbox1, TRUE, FALSE, 0);
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox1), GTK_BUTTONBOX_SPREAD);
launchbutton = gtk_button_new_with_label (_("Launch now"));
gtk_widget_ref (launchbutton);
gtk_object_set_data_full (GTK_OBJECT (redialwindow), "launchbutton", launchbutton, (GtkDestroyNotify) gtk_widget_unref);
g_object_set_data_full (G_OBJECT (redialwindow), "launchbutton", launchbutton, (GDestroyNotify) gtk_widget_unref);
gtk_widget_show (launchbutton);
gtk_container_add (GTK_CONTAINER (hbuttonbox1), launchbutton);
GTK_WIDGET_SET_FLAGS (launchbutton, GTK_CAN_DEFAULT);
cancelbutton = gtk_button_new_with_label (_("Cancel"));
gtk_widget_ref (cancelbutton);
gtk_object_set_data_full (GTK_OBJECT (redialwindow), "cancelbutton", cancelbutton, (GtkDestroyNotify) gtk_widget_unref);
g_object_set_data_full (G_OBJECT (redialwindow), "cancelbutton", cancelbutton, (GDestroyNotify) gtk_widget_unref);
gtk_widget_show (cancelbutton);
gtk_container_add (GTK_CONTAINER (hbuttonbox1), cancelbutton);
GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT);
g_signal_connect (GTK_OBJECT (launchbutton), "clicked", G_CALLBACK (on_launchbutton_clicked), NULL);
g_signal_connect (GTK_OBJECT (cancelbutton), "clicked", G_CALLBACK (on_cancelbutton_clicked), NULL);
g_signal_connect (G_OBJECT (launchbutton), "clicked", G_CALLBACK (on_launchbutton_clicked), NULL);
g_signal_connect (G_OBJECT (cancelbutton), "clicked", G_CALLBACK (on_cancelbutton_clicked), NULL);
gtk_widget_grab_focus (cancelbutton);
gtk_widget_grab_default (cancelbutton);
@ -238,7 +238,7 @@ gboolean redial_dialog (struct server* s, struct server_props* props) {
srv_props = props;
redial_window = create_redialwindow();
progress = gtk_object_get_data(GTK_OBJECT(redial_window), "secondsprogress");
progress = g_object_get_data(G_OBJECT(redial_window), "secondsprogress");
gtk_progress_configure (GTK_PROGRESS (progress), 0, 0, default_redial_wait);
set_redial_label(s->name, TRUE);

10
src/scripts.c
View File

@ -606,7 +606,7 @@ GtkWidget *scripts_config_page () {
button = gtk_button_new_with_label(_("Install..."));
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
g_signal_connect (GTK_OBJECT (button),
g_signal_connect (G_OBJECT (button),
"clicked", G_CALLBACK(install_button_callback), NULL);
#if have_time_to_implement_that
@ -637,7 +637,7 @@ GtkWidget *scripts_config_page () {
gtk_container_add (GTK_CONTAINER (item), gtk_label_new(filename));
g_signal_connect (GTK_OBJECT (item), "select",
g_signal_connect (G_OBJECT (item), "select",
G_CALLBACK(scripts_page_select_callback), GINT_TO_POINTER(i));
gtk_widget_show_all(item);
@ -648,8 +648,8 @@ GtkWidget *scripts_config_page () {
if (script) {
page = generic_script_frame(filename, script);
gtk_object_set_data_full (GTK_OBJECT (notebook), filename, script,
(GtkDestroyNotify) unref_option_widgets);
g_object_set_data_full (G_OBJECT (notebook), filename, script,
(GDestroyNotify) unref_option_widgets);
}
else {
page = gtk_label_new(_("Invalid script"));
@ -716,7 +716,7 @@ void save_script_prefs() {
}
break;
case SCRIPT_OPTION_TYPE_BOOL:
enable = GTK_TOGGLE_BUTTON(opt->widget)->active;
enable = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(opt->widget));
if (enable != opt->enable) {
config_set_bool(opt->section, enable);
debug(4, "set %s/%s=%d", s->data, opt->section, enable);

4
src/srv-list.c
View File

@ -457,7 +457,7 @@ int server_clist_refresh_server (struct server *s) {
debug (6, "server_clist_refresh_server() -- Server %lx needs to be added.");
row = server_clist_refresh_row (s, -1);
gtk_clist_set_row_data_full (server_clist, row, s,
(GtkDestroyNotify) server_unref);
(GDestroyNotify) server_unref);
server_ref (s);
return TRUE;
}
@ -621,7 +621,7 @@ void server_clist_set_list (GSList *servers) {
server = (struct server *) list->data;
row = server_clist_refresh_row (server, -1);
gtk_clist_set_row_data_full (server_clist, row, server,
(GtkDestroyNotify) server_unref);
(GDestroyNotify) server_unref);
/*
Because the a destroy event on the server_clist will
call server_unref, we want to add a reference to

10
src/srv-prop.c
View File

@ -830,18 +830,18 @@ void properties_dialog (struct server *s) {
button = gtk_button_new_with_label (_("Cancel"));
gtk_widget_set_usize (button, 80, -1);
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
g_signal_connect_swapped (GTK_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (window));
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), G_OBJECT (window));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_widget_show (button);
button = gtk_button_new_with_label (_("OK"));
gtk_widget_set_usize (button, 80, -1);
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
g_signal_connect (GTK_OBJECT (button), "clicked",
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (set_new_properties), (gpointer) s);
g_signal_connect_swapped (GTK_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (window));
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK (gtk_widget_destroy), G_OBJECT (window));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_widget_grab_default (button);
gtk_widget_show (button);

4
src/xqf-ui.c
View File

@ -737,7 +737,7 @@ GtkWidget* lookup_widget (GtkWidget* widget, const gchar* widget_name) {
widget = parent;
}
found_widget = (GtkWidget*) gtk_object_get_data (GTK_OBJECT (widget), widget_name);
found_widget = (GtkWidget*) g_object_get_data (G_OBJECT (widget), widget_name);
if (!found_widget)
g_warning ("Widget not found: %s", widget_name);
return found_widget;
@ -782,7 +782,7 @@ GtkWidget *create_server_type_menu (int active_type, gboolean (*filterfunc)(enum
gtk_container_add (GTK_CONTAINER (menu_item), game_pixmap_with_label (i));
if (callback)
g_signal_connect (GTK_OBJECT (menu_item), "activate", G_CALLBACK (callback), GINT_TO_POINTER (i));
g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (callback), GINT_TO_POINTER (i));
gtk_widget_show (menu_item);