diff options
-rw-r--r-- | plugins/exchange-operations/ChangeLog | 5 | ||||
-rw-r--r-- | plugins/exchange-operations/exchange-account-setup.c | 10 | ||||
-rw-r--r-- | plugins/exchange-operations/exchange-config-listener.c | 8 |
3 files changed, 14 insertions, 9 deletions
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index ac0c8a56dc..c54804ec9c 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,8 @@ +2005-06-14 Sarfaaz Ahmed <asarfraaz@novell.com> + + * exchange-account-setup.c : Fixed some warnings + * exchange-config-listener.c : Similar + 2005-06-12 Sarfraaz Ahmed <asarfraaz@novell.com> * Initial commit to rename Exchange-account-setup as Exchange diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index 83186d528e..0aadf230a9 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -285,7 +285,7 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data) } gtk_misc_set_alignment (GTK_MISC (radio_iof), 0, 0.5); gtk_misc_set_alignment (GTK_MISC (radio_oof), 0, 0.5); - gtk_signal_connect (GTK_WIDGET (radio_oof), "toggled", G_CALLBACK (toggled_state), NULL); + gtk_signal_connect (GTK_OBJECT (radio_oof), "toggled", G_CALLBACK (toggled_state), NULL); gtk_table_attach (tbl_oof_status, GTK_WIDGET (lbl_status), 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0); @@ -314,7 +314,7 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data) gtk_text_buffer_set_modified (buffer, FALSE); if (!oof_data->state) gtk_widget_set_sensitive (GTK_WIDGET (txtview_oof), FALSE); - oof_data->text_view = txtview_oof; + oof_data->text_view = GTK_WIDGET (txtview_oof); g_signal_connect (buffer, "changed", G_CALLBACK (update_state), NULL); gtk_container_add (GTK_CONTAINER (scrwnd_oof), GTK_WIDGET (txtview_oof)); @@ -333,8 +333,8 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data) lbl_dass = (GtkLabel*) gtk_object_new (GTK_TYPE_LABEL, "label", _("Manage the delegate settings for Exchange account"), NULL); gtk_misc_set_alignment (GTK_MISC (lbl_dass), 0, 0.5); btn_dass = (GtkButton*) gtk_object_new (GTK_TYPE_BUTTON, "label", _("Delegation Assitant")); - gtk_signal_connect (GTK_WIDGET (btn_chpass), "clicked", G_CALLBACK (btn_chpass_clicked), NULL); - gtk_signal_connect (GTK_WIDGET (btn_dass), "clicked", G_CALLBACK (btn_dass_clicked), NULL); + gtk_signal_connect (GTK_OBJECT (btn_chpass), "clicked", G_CALLBACK (btn_chpass_clicked), NULL); + gtk_signal_connect (GTK_OBJECT (btn_dass), "clicked", G_CALLBACK (btn_dass_clicked), NULL); gtk_table_attach_defaults (tbl_auth, GTK_WIDGET (lbl_chpass), 0, 1, 0, 1); gtk_table_attach (tbl_auth, GTK_WIDGET (btn_chpass), 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0); gtk_table_attach_defaults (tbl_auth, GTK_WIDGET (lbl_dass), 0, 1, 1, 2); @@ -353,7 +353,7 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data) lbl_fsize = (GtkLabel*) gtk_object_new (GTK_TYPE_LABEL, "label", _("View the size of all Exchange folders"), NULL); gtk_misc_set_alignment (GTK_MISC (lbl_fsize), 0, 0.5); btn_fsize = (GtkButton*) gtk_object_new (GTK_TYPE_BUTTON, "label", _("Folders Size"), NULL); - gtk_signal_connect (GTK_WIDGET (btn_fsize), "clicked", G_CALLBACK (btn_fsize_clicked), NULL); + gtk_signal_connect (GTK_OBJECT (btn_fsize), "clicked", G_CALLBACK (btn_fsize_clicked), NULL); gtk_table_attach_defaults (tbl_misc, GTK_WIDGET (lbl_fsize), 0, 1, 0, 1); gtk_table_attach (tbl_misc, GTK_WIDGET (btn_fsize), 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0); gtk_box_pack_start (GTK_BOX (vbox_misc), GTK_WIDGET (tbl_misc), FALSE, FALSE, 0); diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c index d41384d79d..1a114b6baf 100644 --- a/plugins/exchange-operations/exchange-config-listener.c +++ b/plugins/exchange-operations/exchange-config-listener.c @@ -368,7 +368,7 @@ add_folder_esource (ExchangeAccount *account, gboolean is_contacts_folder = TRUE, group_new = FALSE, source_new = FALSE; const char *offline = NULL; int mode; - ESourceList *source_list; + ESourceList *source_list = NULL; client = gconf_client_get_default (); @@ -555,7 +555,7 @@ remove_account_esource (ExchangeAccount *account, gboolean found_group; const char *source_uid; GConfClient *client; - ESourceList *source_list; + ESourceList *source_list = NULL; /* Remove the ESource group, to remove all the folders in a component */ @@ -655,7 +655,7 @@ remove_folder_esource (ExchangeAccount *account, const char *source_uid; GSList *ids, *temp_ids, *node_to_be_deleted; GConfClient *client; - ESourceList *source_list; + ESourceList *source_list = NULL; client = gconf_client_get_default (); @@ -817,8 +817,8 @@ account_added (EAccountList *account_list, EAccount *account) g_signal_emit (config_listener, signals[EXCHANGE_ACCOUNT_CREATED], 0, exchange_account); - add_sources (exchange_account); exchange_account_connect (exchange_account); + add_sources (exchange_account); } struct account_update_data { |