diff options
| -rw-r--r-- | source4/gtk/common/gtk-smb.c | 2 | ||||
| -rw-r--r-- | source4/gtk/common/select.c | 4 | ||||
| -rw-r--r-- | source4/gtk/common/select.h | 2 | ||||
| -rw-r--r-- | source4/gtk/tools/gepdump.c | 2 | ||||
| -rw-r--r-- | source4/gtk/tools/gregedit.c | 18 | ||||
| -rw-r--r-- | source4/gtk/tools/gwcrontab.c | 6 | ||||
| -rw-r--r-- | source4/gtk/tools/gwsam_user.c | 2 |
7 files changed, 19 insertions, 17 deletions
diff --git a/source4/gtk/common/gtk-smb.c b/source4/gtk/common/gtk-smb.c index ed1d8125e6..639aa68bac 100644 --- a/source4/gtk/common/gtk-smb.c +++ b/source4/gtk/common/gtk-smb.c @@ -289,7 +289,7 @@ GType gtk_rpc_binding_dialog_get_type (void) GtkWidget *gtk_rpc_binding_dialog_new (BOOL nocredentials, struct sam_pipe *sam_pipe) { - GtkRpcBindingDialog *d = GTK_RPC_BINDING_DIALOG ( gtk_type_new (gtk_rpc_binding_dialog_get_type ())); + GtkRpcBindingDialog *d = GTK_RPC_BINDING_DIALOG ( g_object_new (gtk_rpc_binding_dialog_get_type (), NULL)); if (nocredentials) { gtk_widget_hide_all(d->frame_credentials); } diff --git a/source4/gtk/common/select.c b/source4/gtk/common/select.c index dac32e8807..1409a625d0 100644 --- a/source4/gtk/common/select.c +++ b/source4/gtk/common/select.c @@ -123,7 +123,7 @@ GType gtk_select_domain_dialog_get_type (void) GtkWidget *gtk_select_domain_dialog_new (struct dcerpc_pipe *sam_pipe) { - GtkSelectDomainDialog *d = gtk_type_new (gtk_select_domain_dialog_get_type ()); + GtkSelectDomainDialog *d = g_object_new(gtk_select_domain_dialog_get_type (), NULL); NTSTATUS status; struct samr_EnumDomains r; struct samr_Connect cr; @@ -258,5 +258,5 @@ GType gtk_select_host_dialog_get_type (void) GtkWidget *gtk_select_host_dialog_new (struct sam_pipe *sam_pipe, BOOL nocredentials) { - return GTK_WIDGET ( gtk_type_new (gtk_select_host_dialog_get_type ())); + return GTK_WIDGET ( g_object_new (gtk_select_host_dialog_get_type (), NULL )); } diff --git a/source4/gtk/common/select.h b/source4/gtk/common/select.h index 3b3d09a99b..336359c322 100644 --- a/source4/gtk/common/select.h +++ b/source4/gtk/common/select.h @@ -24,6 +24,8 @@ #ifdef HAVE_GTK +#define GTK_DISABLE_DEPRECATED + #include <gtk/gtk.h> typedef struct _GtkSelectDomainDialog GtkSelectDomainDialog; diff --git a/source4/gtk/tools/gepdump.c b/source4/gtk/tools/gepdump.c index 07eea756c1..ce606a6a6e 100644 --- a/source4/gtk/tools/gepdump.c +++ b/source4/gtk/tools/gepdump.c @@ -359,7 +359,7 @@ static GtkWidget* create_mainwindow (void) gtk_tree_view_append_column(GTK_TREE_VIEW(tree_eps), curcol); - store_eps = gtk_tree_store_new(3, GTK_TYPE_STRING, GTK_TYPE_STRING, GTK_TYPE_POINTER); + store_eps = gtk_tree_store_new(3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER); gtk_tree_view_set_model(GTK_TREE_VIEW(tree_eps), GTK_TREE_MODEL(store_eps)); g_object_unref(store_eps); diff --git a/source4/gtk/tools/gregedit.c b/source4/gtk/tools/gregedit.c index 78114d9149..b50d81a778 100644 --- a/source4/gtk/tools/gregedit.c +++ b/source4/gtk/tools/gregedit.c @@ -580,18 +580,18 @@ static GtkWidget* create_mainwin (void) open_nt4 = gtk_image_menu_item_new_with_mnemonic("Open _NT4 file"); gtk_container_add (GTK_CONTAINER (menu_file_menu), open_nt4); - g_signal_connect ((gpointer) open_nt4, "activate", - G_CALLBACK (on_open_file_activate), - (gpointer)"nt4"); + g_signal_connect(open_nt4, "activate", + G_CALLBACK (on_open_file_activate), + discard_const_p(char, "nt4")); } if(reg_has_backend("w95")) { open_w95 = gtk_image_menu_item_new_with_mnemonic("Open Win_9x file"); gtk_container_add (GTK_CONTAINER (menu_file_menu), open_w95); - g_signal_connect ((gpointer) open_w95, "activate", - G_CALLBACK (on_open_file_activate), - (gpointer)"w95"); + g_signal_connect (open_w95, "activate", + G_CALLBACK (on_open_file_activate), + discard_const_p(char, "w95")); } if(reg_has_backend("gconf")) { @@ -616,9 +616,9 @@ static GtkWidget* create_mainwin (void) open_ldb = gtk_image_menu_item_new_with_mnemonic("Open _LDB file"); gtk_container_add (GTK_CONTAINER (menu_file_menu), open_ldb); - g_signal_connect ((gpointer) open_ldb, "activate", - G_CALLBACK (on_open_file_activate), - (gpointer)"ldb"); + g_signal_connect(open_ldb, "activate", + G_CALLBACK (on_open_file_activate), + discard_const_p(char, "ldb")); } save = gtk_image_menu_item_new_from_stock ("gtk-save", accel_group); diff --git a/source4/gtk/tools/gwcrontab.c b/source4/gtk/tools/gwcrontab.c index fbf9c5ea95..b41c0ffdcb 100644 --- a/source4/gtk/tools/gwcrontab.c +++ b/source4/gtk/tools/gwcrontab.c @@ -420,9 +420,9 @@ static GtkWidget*create_new_job_dialog (void) gtk_table_attach (GTK_TABLE (table1), cal_day, 1, 2, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); - gtk_calendar_display_options (GTK_CALENDAR (cal_day), - GTK_CALENDAR_SHOW_HEADING - | GTK_CALENDAR_SHOW_DAY_NAMES); + gtk_calendar_set_display_options (GTK_CALENDAR (cal_day), + GTK_CALENDAR_SHOW_HEADING + | GTK_CALENDAR_SHOW_DAY_NAMES); label3 = gtk_label_new ("Date"); gtk_table_attach (GTK_TABLE (table1), label3, 0, 1, 0, 1, diff --git a/source4/gtk/tools/gwsam_user.c b/source4/gtk/tools/gwsam_user.c index 394324280e..fa29e63a03 100644 --- a/source4/gtk/tools/gwsam_user.c +++ b/source4/gtk/tools/gwsam_user.c @@ -256,7 +256,7 @@ create_user_edit_dialog (void) (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - combo_homedrive = gtk_combo_new(); + combo_homedrive = gtk_combo_box_new(); gtk_table_attach (GTK_TABLE (table3), combo_homedrive, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); |