diff --git a/ChangeLog b/ChangeLog index 8bfec8fe2..d4ee8e49e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2008-06-23 Christian Persch + + * vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.c: + * vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.h: + * vpn-daemons/pptp/auth-dialog-general/anonymous-auth-module.c: + (impl_get_object): + * vpn-daemons/pptp/auth-dialog-general/chap-auth-module.c: + (impl_get_object): + * vpn-daemons/pptp/auth-dialog-general/gnome-generic-auth-dialog.c: + * vpn-daemons/pptp/auth-dialog-general/gnome-generic-auth-dialog.h: + * vpn-daemons/pptp/auth-dialog-general/mschapv2-auth-module.c: + (impl_get_object): + * vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.c: + * vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.h: + * vpn-daemons/pptp/properties/nm-ppp-properties.c: (impl_setup): + * vpn-daemons/pptp/properties/vpnui_impl.c: (impl_get_object): + * vpn-daemons/pptp/properties/vpnui_opt.c: + (vpnui_opt_connect_signals): + * vpn-daemons/pptp/properties/vpnui_opt.h: + * vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c: + * vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.h: Don't use + deprecated gtk type macros. Bug #539325. + 2008-06-20 Dan Williams * libnm-glib/nm-vpn-plugin-ui-interface.c diff --git a/vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.c b/vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.c index da7c29a13..b3f3b0ef3 100644 --- a/vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.c +++ b/vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.c @@ -100,7 +100,7 @@ static void dialog_close_callback (GtkWidget *widget static gpointer parent_class; -GtkType +GType gnome_two_password_dialog_get_type (void) { static GType type = 0; diff --git a/vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.h b/vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.h index a0c4d1065..58235da54 100644 --- a/vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.h +++ b/vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.h @@ -33,10 +33,10 @@ G_BEGIN_DECLS #define GNOME_TYPE_TWO_PASSWORD_DIALOG (gnome_two_password_dialog_get_type ()) -#define GNOME_TWO_PASSWORD_DIALOG(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_TWO_PASSWORD_DIALOG, GnomeTwoPasswordDialog)) -#define GNOME_TWO_PASSWORD_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_TWO_PASSWORD_DIALOG, GnomeTwoPasswordDialogClass)) -#define GNOME_IS_TWO_PASSWORD_DIALOG(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_TWO_PASSWORD_DIALOG)) -#define GNOME_IS_TWO_PASSWORD_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_TWO_PASSWORD_DIALOG)) +#define GNOME_TWO_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_TWO_PASSWORD_DIALOG, GnomeTwoPasswordDialog)) +#define GNOME_TWO_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_TWO_PASSWORD_DIALOG, GnomeTwoPasswordDialogClass)) +#define GNOME_IS_TWO_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_TWO_PASSWORD_DIALOG)) +#define GNOME_IS_TWO_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_TWO_PASSWORD_DIALOG)) typedef struct GnomeTwoPasswordDialog GnomeTwoPasswordDialog; typedef struct GnomeTwoPasswordDialogClass GnomeTwoPasswordDialogClass; @@ -61,7 +61,7 @@ typedef enum { } GnomeTwoPasswordDialogRemember; -GtkType gnome_two_password_dialog_get_type (void); +GType gnome_two_password_dialog_get_type (void); GtkWidget* gnome_two_password_dialog_new (const char *dialog_title, const char *message, const char *username, diff --git a/vpn-daemons/pptp/auth-dialog-general/anonymous-auth-module.c b/vpn-daemons/pptp/auth-dialog-general/anonymous-auth-module.c index 9c856f61b..a8b046913 100644 --- a/vpn-daemons/pptp/auth-dialog-general/anonymous-auth-module.c +++ b/vpn-daemons/pptp/auth-dialog-general/anonymous-auth-module.c @@ -112,13 +112,13 @@ impl_get_object (void) // impl->callback = NULL; // if (impl->w_import_button!=NULL) { -// gtk_signal_connect (GTK_OBJECT (impl->w_import_button), -// "clicked", GTK_SIGNAL_FUNC (import_button_clicked), impl); +// g_signal_connect (GTK_OBJECT (impl->w_import_button), +// "clicked", G_CALLBACK (import_button_clicked), impl); // } // // /* make the widget reusable */ -// gtk_signal_connect (GTK_OBJECT (impl->widget), "delete-event", -// GTK_SIGNAL_FUNC (gtk_widget_hide_on_delete), NULL); +// g_signal_connect (GTK_OBJECT (impl->widget), "delete-event", +// G_CALLBACK (gtk_widget_hide_on_delete), NULL); // impl_clear_widget (impl); diff --git a/vpn-daemons/pptp/auth-dialog-general/chap-auth-module.c b/vpn-daemons/pptp/auth-dialog-general/chap-auth-module.c index 9512d71f8..02d74f251 100644 --- a/vpn-daemons/pptp/auth-dialog-general/chap-auth-module.c +++ b/vpn-daemons/pptp/auth-dialog-general/chap-auth-module.c @@ -161,8 +161,8 @@ g_warning("get widget"); impl->widget = glade_xml_get_widget(impl->xml, GLADE_WIDGET); /* make the widget reusable */ - gtk_signal_connect (GTK_OBJECT (impl->widget), "delete-event", - GTK_SIGNAL_FUNC (gtk_widget_hide_on_delete), NULL); + g_signal_connect (GTK_OBJECT (impl->widget), "delete-event", + G_CALLBACK (gtk_widget_hide_on_delete), NULL); impl->w_username = GTK_ENTRY(glade_xml_get_widget(impl->xml,"username")); impl->w_password = GTK_ENTRY(glade_xml_get_widget(impl->xml,"password")); diff --git a/vpn-daemons/pptp/auth-dialog-general/gnome-generic-auth-dialog.c b/vpn-daemons/pptp/auth-dialog-general/gnome-generic-auth-dialog.c index 6116666e3..fa8efb7ac 100644 --- a/vpn-daemons/pptp/auth-dialog-general/gnome-generic-auth-dialog.c +++ b/vpn-daemons/pptp/auth-dialog-general/gnome-generic-auth-dialog.c @@ -104,7 +104,7 @@ static void dialog_close_callback (GtkWidget *widget static gpointer parent_class; -GtkType +GType gnome_generic_auth_dialog_get_type (void) { static GType type = 0; diff --git a/vpn-daemons/pptp/auth-dialog-general/gnome-generic-auth-dialog.h b/vpn-daemons/pptp/auth-dialog-general/gnome-generic-auth-dialog.h index 1b8b6d722..096a30344 100644 --- a/vpn-daemons/pptp/auth-dialog-general/gnome-generic-auth-dialog.h +++ b/vpn-daemons/pptp/auth-dialog-general/gnome-generic-auth-dialog.h @@ -34,10 +34,10 @@ G_BEGIN_DECLS #define GNOME_TYPE_GENERIC_AUTH_DIALOG (gnome_generic_auth_dialog_get_type ()) -#define GNOME_GENERIC_AUTH_DIALOG(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_GENERIC_AUTH_DIALOG, GnomeGenericAuthDialog)) -#define GNOME_GENERIC_AUTH_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_GENERIC_AUTH_DIALOG, GnomeGenericAuthDialogClass)) -#define GNOME_IS_GENERIC_AUTH_DIALOG(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_GENERIC_AUTH_DIALOG)) -#define GNOME_IS_GENERIC_AUTH_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_GENERIC_AUTH_DIALOG)) +#define GNOME_GENERIC_AUTH_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_GENERIC_AUTH_DIALOG, GnomeGenericAuthDialog)) +#define GNOME_GENERIC_AUTH_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_GENERIC_AUTH_DIALOG, GnomeGenericAuthDialogClass)) +#define GNOME_IS_GENERIC_AUTH_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_GENERIC_AUTH_DIALOG)) +#define GNOME_IS_GENERIC_AUTH_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_GENERIC_AUTH_DIALOG)) typedef struct GnomeGenericAuthDialog GnomeGenericAuthDialog; typedef struct GnomeGenericAuthDialogClass GnomeGenericAuthDialogClass; @@ -62,7 +62,7 @@ typedef enum { } GnomeGenericAuthDialogRemember; -GtkType gnome_generic_auth_dialog_get_type (void); +GType gnome_generic_auth_dialog_get_type (void); GtkWidget *gnome_generic_auth_dialog_new (const char *dialog_title, const char *message, const char *user, diff --git a/vpn-daemons/pptp/auth-dialog-general/mschapv2-auth-module.c b/vpn-daemons/pptp/auth-dialog-general/mschapv2-auth-module.c index cd57da4cf..428a59fbc 100644 --- a/vpn-daemons/pptp/auth-dialog-general/mschapv2-auth-module.c +++ b/vpn-daemons/pptp/auth-dialog-general/mschapv2-auth-module.c @@ -144,8 +144,8 @@ impl_get_object (void) impl->widget = glade_xml_get_widget(impl->xml, GLADE_WIDGET); /* make the widget reusable */ - gtk_signal_connect (GTK_OBJECT (impl->widget), "delete-event", - GTK_SIGNAL_FUNC (gtk_widget_hide_on_delete), NULL); + g_signal_connect (GTK_OBJECT (impl->widget), "delete-event", + G_CALLBACK (gtk_widget_hide_on_delete), NULL); impl->w_remotename = GTK_ENTRY(glade_xml_get_widget(impl->xml,"remotename")); impl->w_username = GTK_ENTRY(glade_xml_get_widget(impl->xml,"username")); diff --git a/vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.c b/vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.c index 0298fd2ea..b15d8d3ba 100644 --- a/vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.c +++ b/vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.c @@ -99,7 +99,7 @@ static void dialog_close_callback (GtkWidget *widget static gpointer parent_class; -GtkType +GType gnome_two_password_dialog_get_type (void) { static GType type = 0; diff --git a/vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.h b/vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.h index ecd6c2aa9..4a38e8e1c 100644 --- a/vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.h +++ b/vpn-daemons/pptp/auth-dialog/gnome-two-password-dialog.h @@ -33,10 +33,10 @@ G_BEGIN_DECLS #define GNOME_TYPE_TWO_PASSWORD_DIALOG (gnome_two_password_dialog_get_type ()) -#define GNOME_TWO_PASSWORD_DIALOG(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_TWO_PASSWORD_DIALOG, GnomeTwoPasswordDialog)) -#define GNOME_TWO_PASSWORD_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_TWO_PASSWORD_DIALOG, GnomeTwoPasswordDialogClass)) -#define GNOME_IS_TWO_PASSWORD_DIALOG(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_TWO_PASSWORD_DIALOG)) -#define GNOME_IS_TWO_PASSWORD_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_TWO_PASSWORD_DIALOG)) +#define GNOME_TWO_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_TWO_PASSWORD_DIALOG, GnomeTwoPasswordDialog)) +#define GNOME_TWO_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_TWO_PASSWORD_DIALOG, GnomeTwoPasswordDialogClass)) +#define GNOME_IS_TWO_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_TWO_PASSWORD_DIALOG)) +#define GNOME_IS_TWO_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_TWO_PASSWORD_DIALOG)) typedef struct GnomeTwoPasswordDialog GnomeTwoPasswordDialog; typedef struct GnomeTwoPasswordDialogClass GnomeTwoPasswordDialogClass; @@ -61,7 +61,7 @@ typedef enum { } GnomeTwoPasswordDialogRemember; -GtkType gnome_two_password_dialog_get_type (void); +GType gnome_two_password_dialog_get_type (void); GtkWidget* gnome_two_password_dialog_new (const char *dialog_title, const char *message, const char *username, diff --git a/vpn-daemons/pptp/properties/nm-ppp-properties.c b/vpn-daemons/pptp/properties/nm-ppp-properties.c index 87cdc4043..06f99af80 100644 --- a/vpn-daemons/pptp/properties/nm-ppp-properties.c +++ b/vpn-daemons/pptp/properties/nm-ppp-properties.c @@ -132,69 +132,69 @@ impl_setup (NetworkManagerVpnUIImpl *impl) opt = vpnui_opt_new( "connection-name", VPN_UI_OPTTYPE_STRING, NULL, "Description", _("Name"), - GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); + G_CALLBACK(&editable_changed), &vld_non_empty, impl ); impl->connection_name_opt = opt; opt = vpnui_opt_new( "ppp-connection-type", VPN_UI_OPTTYPE_COMBO, "ppp-connection-type", "Connection-Type", NULL, - GTK_SIGNAL_FUNC(&variant_changed), NULL, impl ); + G_CALLBACK(&variant_changed), NULL, impl ); impl->variant_combo = GTK_COMBO_BOX(opt->widget); opt = vpnui_opt_new( "pptp-remote", VPN_UI_OPTTYPE_STRING, "pptp-remote", "PPTP-Server", _("PPTP Server"), - GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); + G_CALLBACK(&editable_changed), &vld_non_empty, impl ); opt = vpnui_opt_new( "phone-number", VPN_UI_OPTTYPE_STRING, "phone-number", "Telephone-Number", _("Telephone Number"), - GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); + G_CALLBACK(&editable_changed), &vld_non_empty, impl ); opt = vpnui_opt_new( "bt-bdaddr", VPN_UI_OPTTYPE_STRING, "bt-bdaddr", "Bluetooth-Address", _("Bluetooth Address"), - GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); + G_CALLBACK(&editable_changed), &vld_non_empty, impl ); opt = vpnui_opt_new( "bt-channel", VPN_UI_OPTTYPE_STRING, "bt-channel", "Bluetooth-Channel", _("Bluetooth Channel"), - GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); + G_CALLBACK(&editable_changed), &vld_non_empty, impl ); opt = vpnui_opt_new( "gprs-apn", VPN_UI_OPTTYPE_STRING, "gprs-apn", "GPRS-Access-Point-Name", _("GPRS APN"), - GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); + G_CALLBACK(&editable_changed), &vld_non_empty, impl ); opt = vpnui_opt_new( "gprs-ip-address", VPN_UI_OPTTYPE_STRING, "gprs-ip-address", "GPRS-IP-Address", _("GPRS IP"), - GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); + G_CALLBACK(&editable_changed), &vld_non_empty, impl ); opt = vpnui_opt_new( "gprs-context-num", VPN_UI_OPTTYPE_STRING, "gprs-context-num", "GPRS-Context-Number", _("GPRS Context No."), - GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); + G_CALLBACK(&editable_changed), &vld_non_empty, impl ); opt = vpnui_opt_new( "gprs-packet-type", VPN_UI_OPTTYPE_STRING, "gprs-packet-type", "GPRS-Packet-Type", _("GPRS Packet Type"), - GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); + G_CALLBACK(&editable_changed), &vld_non_empty, impl ); opt = vpnui_opt_new( "ppp-crtscts", VPN_UI_OPTTYPE_YESNO, "ppp-crtscts", "PPP-Hardware-CTSRTS", _("Use CTS/RTS flow control"), - GTK_SIGNAL_FUNC(&editable_changed), NULL, impl ); + G_CALLBACK(&editable_changed), NULL, impl ); opt = vpnui_opt_new( "ppp-modem", VPN_UI_OPTTYPE_YESNO, "ppp-modem", "PPP-Modem", _("Connect via a modem"), - GTK_SIGNAL_FUNC(&editable_changed), NULL, impl ); + G_CALLBACK(&editable_changed), NULL, impl ); opt = vpnui_opt_new( "ppp-noipdefault", VPN_UI_OPTTYPE_YESNO, "ppp-noipdefault", "PPP-No-IP-Default", _("Require IP to be provided"), - GTK_SIGNAL_FUNC(&editable_changed), NULL, impl ); + G_CALLBACK(&editable_changed), NULL, impl ); opt = vpnui_opt_new( "usepeerdns" , VPN_UI_OPTTYPE_YESNO , @@ -284,7 +284,7 @@ impl_setup (NetworkManagerVpnUIImpl *impl) opt = vpnui_opt_new( "ppp-extra", VPN_UI_OPTTYPE_STRING, "ppp-extra", "PPP-Custom-Options", _("Custom PPP options"), - GTK_SIGNAL_FUNC(&editable_changed), NULL, impl ); + G_CALLBACK(&editable_changed), NULL, impl ); opt = vpnui_opt_new( "ppp-debug" , VPN_UI_OPTTYPE_YESNO , @@ -300,13 +300,13 @@ impl_setup (NetworkManagerVpnUIImpl *impl) opt = vpnui_opt_new( "routes" , VPN_UI_OPTTYPE_STRING , "routes", "X-NM-Routes", _("Specific networks available"), - GTK_SIGNAL_FUNC(&editable_changed), &vld_routes_if_sens, impl ); + G_CALLBACK(&editable_changed), &vld_routes_if_sens, impl ); impl->routes_opt = opt; opt = vpnui_opt_new( "use-routes" , VPN_UI_OPTTYPE_YESNO , "use-routes", "Use-Routes", _("Limit to specific networks"), - GTK_SIGNAL_FUNC(&use_routes_toggled), NULL, impl ); + G_CALLBACK(&use_routes_toggled), NULL, impl ); impl->routes_toggle_opt = opt; variant = vpnui_variant_new( "pptp","Windows VPN (PPTP)", diff --git a/vpn-daemons/pptp/properties/vpnui_impl.c b/vpn-daemons/pptp/properties/vpnui_impl.c index 66eb7e600..9eebdc576 100644 --- a/vpn-daemons/pptp/properties/vpnui_impl.c +++ b/vpn-daemons/pptp/properties/vpnui_impl.c @@ -526,16 +526,16 @@ impl_get_object (void) impl->callback = NULL; if (impl->w_import_button!=NULL) { - gtk_signal_connect (GTK_OBJECT (impl->w_import_button), - "clicked", GTK_SIGNAL_FUNC (import_button_clicked), impl); + g_signal_connect (GTK_OBJECT (impl->w_import_button), + "clicked", G_CALLBACK (import_button_clicked), impl); } - gtk_signal_connect (GTK_OBJECT (impl->widget), - "show", GTK_SIGNAL_FUNC (show_widget), impl); + g_signal_connect (GTK_OBJECT (impl->widget), + "show", G_CALLBACK (show_widget), impl); /* make the widget reusable */ - gtk_signal_connect (GTK_OBJECT (impl->widget), "delete-event", - GTK_SIGNAL_FUNC (gtk_widget_hide_on_delete), NULL); + g_signal_connect (GTK_OBJECT (impl->widget), "delete-event", + G_CALLBACK (gtk_widget_hide_on_delete), NULL); impl_clear_widget (impl); diff --git a/vpn-daemons/pptp/properties/vpnui_opt.c b/vpn-daemons/pptp/properties/vpnui_opt.c index 3a53a66a3..59b5e1a1e 100644 --- a/vpn-daemons/pptp/properties/vpnui_opt.c +++ b/vpn-daemons/pptp/properties/vpnui_opt.c @@ -74,20 +74,20 @@ void vpnui_opt_connect_signals(VpnUIConfigOption *opt) switch (opt->option_type) { case VPN_UI_OPTTYPE_YESNO: - gtk_signal_connect (GTK_OBJECT (opt->widget), - "toggled", GTK_SIGNAL_FUNC (opt->change_handler), opt->impl); + g_signal_connect (GTK_OBJECT (opt->widget), + "toggled", G_CALLBACK (opt->change_handler), opt->impl); break; case VPN_UI_OPTTYPE_STRING: - gtk_signal_connect (GTK_OBJECT (opt->widget), - "changed", GTK_SIGNAL_FUNC (opt->change_handler), opt->impl); + g_signal_connect (GTK_OBJECT (opt->widget), + "changed", G_CALLBACK (opt->change_handler), opt->impl); break; case VPN_UI_OPTTYPE_SPINNER: - gtk_signal_connect (GTK_OBJECT (opt->widget), - "changed", GTK_SIGNAL_FUNC (opt->change_handler), opt->impl); + g_signal_connect (GTK_OBJECT (opt->widget), + "changed", G_CALLBACK (opt->change_handler), opt->impl); break; case VPN_UI_OPTTYPE_COMBO: - gtk_signal_connect (GTK_OBJECT (opt->widget), - "changed", GTK_SIGNAL_FUNC (opt->change_handler), opt->impl); + g_signal_connect (GTK_OBJECT (opt->widget), + "changed", G_CALLBACK (opt->change_handler), opt->impl); break; } } diff --git a/vpn-daemons/pptp/properties/vpnui_opt.h b/vpn-daemons/pptp/properties/vpnui_opt.h index 9b0766f81..c955a16bb 100644 --- a/vpn-daemons/pptp/properties/vpnui_opt.h +++ b/vpn-daemons/pptp/properties/vpnui_opt.h @@ -25,7 +25,7 @@ struct _VpnUIConfigOption char *export_name; char *description; gboolean active; - GtkSignalFunc change_handler; + GCallback change_handler; gboolean (*validator)(VpnUIConfigOption *opt); GtkWidget *widget; NetworkManagerVpnUIImpl *impl; diff --git a/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c b/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c index f4b772d14..f00037922 100644 --- a/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c +++ b/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c @@ -99,7 +99,7 @@ static void dialog_close_callback (GtkWidget *widget static gpointer parent_class; -GtkType +GType gnome_two_password_dialog_get_type (void) { static GType type = 0; diff --git a/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.h b/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.h index ecd6c2aa9..4a38e8e1c 100644 --- a/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.h +++ b/vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.h @@ -33,10 +33,10 @@ G_BEGIN_DECLS #define GNOME_TYPE_TWO_PASSWORD_DIALOG (gnome_two_password_dialog_get_type ()) -#define GNOME_TWO_PASSWORD_DIALOG(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_TWO_PASSWORD_DIALOG, GnomeTwoPasswordDialog)) -#define GNOME_TWO_PASSWORD_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_TWO_PASSWORD_DIALOG, GnomeTwoPasswordDialogClass)) -#define GNOME_IS_TWO_PASSWORD_DIALOG(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_TWO_PASSWORD_DIALOG)) -#define GNOME_IS_TWO_PASSWORD_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_TWO_PASSWORD_DIALOG)) +#define GNOME_TWO_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_TWO_PASSWORD_DIALOG, GnomeTwoPasswordDialog)) +#define GNOME_TWO_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_TWO_PASSWORD_DIALOG, GnomeTwoPasswordDialogClass)) +#define GNOME_IS_TWO_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_TWO_PASSWORD_DIALOG)) +#define GNOME_IS_TWO_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_TWO_PASSWORD_DIALOG)) typedef struct GnomeTwoPasswordDialog GnomeTwoPasswordDialog; typedef struct GnomeTwoPasswordDialogClass GnomeTwoPasswordDialogClass; @@ -61,7 +61,7 @@ typedef enum { } GnomeTwoPasswordDialogRemember; -GtkType gnome_two_password_dialog_get_type (void); +GType gnome_two_password_dialog_get_type (void); GtkWidget* gnome_two_password_dialog_new (const char *dialog_title, const char *message, const char *username,