diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2007-04-20 02:53:33 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-04-20 02:53:33 +0800 |
| commit | 64977cb1bcc55bf4c7c0fc38cd3d047b1e6a25c6 (patch) | |
| tree | 4ebe95239bef43cb97c0e46aa8194d44e6c88be6 /addressbook/conduit | |
| parent | bb05f6e6d0541bf29c8dde4e264cc7c23ba52fbb (diff) | |
| download | gsoc2013-evolution-64977cb1bcc55bf4c7c0fc38cd3d047b1e6a25c6.tar.gz gsoc2013-evolution-64977cb1bcc55bf4c7c0fc38cd3d047b1e6a25c6.tar.zst gsoc2013-evolution-64977cb1bcc55bf4c7c0fc38cd3d047b1e6a25c6.zip | |
Massive code cleanup (bug #429422)
svn path=/trunk/; revision=33432
Diffstat (limited to 'addressbook/conduit')
| -rw-r--r-- | addressbook/conduit/address-conduit.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index 293df8c79d..b2a5e3730c 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -168,11 +168,9 @@ addrconduit_load_configuration (guint32 pilot_id) c->pilot_id = pilot_id; management = gnome_pilot_conduit_management_new ("e_address_conduit", GNOME_PILOT_CONDUIT_MGMT_ID); - gtk_object_ref (GTK_OBJECT (management)); - gtk_object_sink (GTK_OBJECT (management)); + g_object_ref_sink (management); config = gnome_pilot_conduit_config_new (management, pilot_id); - gtk_object_ref (GTK_OBJECT (config)); - gtk_object_sink (GTK_OBJECT (config)); + g_object_ref_sink (config); if (!gnome_pilot_conduit_config_is_enabled (config, &c->sync_type)) c->sync_type = GnomePilotConduitSyncTypeNotSet; gtk_object_unref (GTK_OBJECT (config)); @@ -307,7 +305,7 @@ e_addr_gui_new (EPilotSettings *ps) item = gtk_menu_item_new_with_label (items[i]); gtk_widget_show (item); - gtk_menu_append (GTK_MENU (menu), item); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); } gtk_widget_show (menu); gtk_option_menu_set_menu (GTK_OPTION_MENU (gui->default_address), menu); |