diff options
48 files changed, 176 insertions, 108 deletions
diff --git a/plugins/addressbook-file/.cvsignore b/plugins/addressbook-file/.cvsignore new file mode 100644 index 0000000000..22a4e7292f --- /dev/null +++ b/plugins/addressbook-file/.cvsignore @@ -0,0 +1,3 @@ +Makefile +Makefile.in + diff --git a/plugins/audio-inline/ChangeLog b/plugins/audio-inline/ChangeLog index c1d5f927f7..98a3dbbc8f 100644 --- a/plugins/audio-inline/ChangeLog +++ b/plugins/audio-inline/ChangeLog @@ -1,3 +1,8 @@ +2006-01-09 Kjartan Maraas <kmaraas@gnome.org> + + * audio-inline.c: (org_gnome_audio_inline_add_button): + s/volatile static/static volatile/g. Remove unused var. + 2005-12-18 Tor Lillqvist <tml@novell.com> * audio-inline.c: Use g_ascii_strcasecmp() instead of @@ -50,4 +55,4 @@ 2004-10-25 Radek Doulik <rodo@ximian.com> - * audio-inline.c: imported audio inline plugin
\ No newline at end of file + * audio-inline.c: imported audio inline plugin diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c index cbe8b03cc3..dd9621ce6b 100644 --- a/plugins/audio-inline/audio-inline.c +++ b/plugins/audio-inline/audio-inline.c @@ -31,7 +31,7 @@ void org_gnome_audio_inline_format (void *ep, EMFormatHookTarget *t); -volatile static int org_gnome_audio_class_id_counter = 0; +static volatile int org_gnome_audio_class_id_counter = 0; struct _org_gnome_audio_inline_pobject { EMFormatHTMLPObject object; @@ -252,7 +252,6 @@ static void org_gnome_audio_inline_add_button (GtkWidget *box, char *icon_name, GCallback cb, gpointer data) { GtkWidget *icon, *button; - GdkPixbuf *pixbuf; icon = e_icon_factory_get_image (icon_name, E_ICON_SIZE_LARGE_TOOLBAR); gtk_widget_show (icon); diff --git a/plugins/caldav/.cvsignore b/plugins/caldav/.cvsignore new file mode 100644 index 0000000000..2a782dc66a --- /dev/null +++ b/plugins/caldav/.cvsignore @@ -0,0 +1,3 @@ +Makefile.in +Makefile +*.eplug diff --git a/plugins/default-mailer/.cvsignore b/plugins/default-mailer/.cvsignore new file mode 100644 index 0000000000..6094e72eaf --- /dev/null +++ b/plugins/default-mailer/.cvsignore @@ -0,0 +1,3 @@ +Makefile.in +Makefile +*.schemas diff --git a/plugins/default-source/.cvsignore b/plugins/default-source/.cvsignore new file mode 100644 index 0000000000..22a4e7292f --- /dev/null +++ b/plugins/default-source/.cvsignore @@ -0,0 +1,3 @@ +Makefile +Makefile.in + diff --git a/plugins/exchange-operations/.cvsignore b/plugins/exchange-operations/.cvsignore new file mode 100644 index 0000000000..d436efd0f7 --- /dev/null +++ b/plugins/exchange-operations/.cvsignore @@ -0,0 +1,3 @@ +Makefile.in +Makefile + diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index c61174fd42..edb73c87ab 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -192,8 +192,10 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data) GtkFrame *frm_auth; GtkVBox *vbox_auth; GtkTable *tbl_auth; +#ifdef HAVE_KRB5 GtkLabel *lbl_chpass; GtkButton *btn_chpass; +#endif GtkLabel *lbl_dass; GtkButton *btn_dass; @@ -371,27 +373,15 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data) static void print_error (const char *owa_url, E2kAutoconfigResult result) { - char *old, *new; - switch (result) { case E2K_AUTOCONFIG_CANT_CONNECT: - if (!strncmp (owa_url, "http:", 5)) { - old = "http"; - new = "https"; - } else { - old = "https"; - new = "http"; - } - e_error_run (NULL, ERROR_DOMAIN ":account-connect-error", "", NULL); - break; case E2K_AUTOCONFIG_CANT_RESOLVE: - e_error_run (NULL, ERROR_DOMAIN ":account-resolve-error", "", NULL); - break; + break; case E2K_AUTOCONFIG_AUTH_ERROR: case E2K_AUTOCONFIG_AUTH_ERROR_TRY_NTLM: diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c index 0570ea6704..875a0d13ee 100644 --- a/plugins/exchange-operations/exchange-config-listener.c +++ b/plugins/exchange-operations/exchange-config-listener.c @@ -661,7 +661,10 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener, { ExchangeConfigListenerPrivate *priv; ExchangeAccountResult result; - char *key, *password, *title, *new_password, *url_string; + char *key, *password, *title, *url_string; +#ifdef HAVE_KRB5 + char *new_password; +#endif gboolean oldremember, remember = FALSE; CamelURL *camel_url; const char *remember_password; @@ -717,7 +720,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener, result == EXCHANGE_ACCOUNT_QUOTA_SEND_ERROR || result == EXCHANGE_ACCOUNT_QUOTA_WARN) { gchar *current_quota_usage = NULL; - const char *error_code; + const char *error_code = NULL; GtkWidget *widget; switch (result) { diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c index be143ff853..fc1de553db 100644 --- a/plugins/exchange-operations/exchange-delegates.c +++ b/plugins/exchange-operations/exchange-delegates.c @@ -645,7 +645,8 @@ delegates_apply (ExchangeDelegates *delegates) GByteArray *entryid_dup; char *error = NULL; E2kProperties *props; - int i, status; + int i; + E2kGlobalCatalogStatus status; if (!delegates->loaded_folders) return; @@ -681,11 +682,8 @@ delegates_apply (ExchangeDelegates *delegates) } if ((delegates->removed_users || delegates->added_users) && !delegates->self_dn) { - E2kGlobalCatalog *gc; - E2kGlobalCatalogStatus status; E2kGlobalCatalogEntry *entry; - gc = exchange_account_get_global_catalog (delegates->account); status = e2k_global_catalog_lookup ( gc, NULL, /* FIXME: cancellable */ E2K_GLOBAL_CATALOG_LOOKUP_BY_LEGACY_EXCHANGE_DN, diff --git a/plugins/exchange-operations/exchange-folder-size-display.c b/plugins/exchange-operations/exchange-folder-size-display.c index 494fe5ef7c..53927176a2 100644 --- a/plugins/exchange-operations/exchange-folder-size-display.c +++ b/plugins/exchange-operations/exchange-folder-size-display.c @@ -114,7 +114,6 @@ exchange_folder_size_display (GtkListStore *model, GtkWidget *parent) GtkWidget *dialog, *table; GList *l; char *col_name; - int response; printf ("exchange_folder_size_display called\n"); g_return_if_fail (GTK_IS_WIDGET (parent)); @@ -151,6 +150,6 @@ exchange_folder_size_display (GtkListStore *model, GtkWidget *parent) column); gtk_tree_view_set_model (GTK_TREE_VIEW (table), GTK_TREE_MODEL (model)); - response = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c index 4a22ffd043..e0d5a1d459 100644 --- a/plugins/exchange-operations/exchange-folder.c +++ b/plugins/exchange-operations/exchange-folder.c @@ -335,13 +335,10 @@ unsubscribe_dialog_ab_response (GtkDialog *dialog, int response, gpointer data) gchar *path = NULL; gchar *uri = NULL; const char *source_uid = NULL; - GConfClient *client; ESourceGroup *source_group = NULL; ESource *source = NULL; EABPopupTargetSource *target = data; - client = gconf_client_get_default (); - account = exchange_operations_get_exchange_account (); if (!account) diff --git a/plugins/groupwise-account-setup/.cvsignore b/plugins/groupwise-account-setup/.cvsignore new file mode 100644 index 0000000000..2a782dc66a --- /dev/null +++ b/plugins/groupwise-account-setup/.cvsignore @@ -0,0 +1,3 @@ +Makefile.in +Makefile +*.eplug diff --git a/plugins/groupwise-features/.cvsignore b/plugins/groupwise-features/.cvsignore new file mode 100644 index 0000000000..2a782dc66a --- /dev/null +++ b/plugins/groupwise-features/.cvsignore @@ -0,0 +1,3 @@ +Makefile.in +Makefile +*.eplug diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c index 40ae0a26d5..0c944458a5 100644 --- a/plugins/groupwise-features/install-shared.c +++ b/plugins/groupwise-features/install-shared.c @@ -154,7 +154,7 @@ accept_clicked(GnomeDruidPage *page, GtkWidget *druid, CamelMimeMessage *msg) { EMFolderTreeModel *model; EMFolderTree *folder_tree; - GtkWidget *dialog ; + GtkWidget *dialog; struct AcceptData *accept_data; char *uri; @@ -186,18 +186,15 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target) GtkWidget *window; GnomeDruid *wizard; GnomeDruidPageEdge *title_page; - CamelMimeMessage *msg = (CamelMimeMessage *) target->message ; - CamelStreamMem *content ; + CamelMimeMessage *msg = (CamelMimeMessage *) target->message; + CamelStreamMem *content; CamelDataWrapper *dw; - CamelMimePart *mime_part ; - char *notification; char *start_message; if (!msg) - return ; + return; - mime_part = CAMEL_MIME_PART(msg) ; - if ((notification = (char *)camel_medium_get_header (CAMEL_MEDIUM(msg),"X-notification")) == NULL + if (((char *)camel_medium_get_header (CAMEL_MEDIUM(msg),"X-notification")) == NULL || (from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message)) == NULL || !camel_internet_address_get(from_addr, 0, &name, &email) || (dw = camel_medium_get_content_object (CAMEL_MEDIUM (msg))) == NULL) { @@ -210,7 +207,7 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target) } content = (CamelStreamMem *)camel_stream_mem_new(); - camel_data_wrapper_write_to_stream(dw, (CamelStream *)content) ; + camel_data_wrapper_write_to_stream(dw, (CamelStream *)content); camel_stream_write((CamelStream *)content, "", 1); from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message); diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c index 90ea657cf2..2575addc72 100644 --- a/plugins/groupwise-features/junk-settings.c +++ b/plugins/groupwise-features/junk-settings.c @@ -375,7 +375,6 @@ static void junk_settings_construct (JunkSettings *js) { GladeXML *xml; - GtkWidget *box; char *gladefile; gladefile = g_build_filename (EVOLUTION_GLADEDIR, @@ -408,7 +407,6 @@ junk_settings_construct (JunkSettings *js) js->entry = GTK_ENTRY (glade_xml_get_widget (js->xml, "entry4")); /*TODO:connect entry and label*/ - box = GTK_WIDGET (glade_xml_get_widget (js->xml, "hbox227")); gtk_widget_show ((GtkWidget *) js->entry); js->scrolled_window = GTK_WIDGET (glade_xml_get_widget (js->xml,"scrolledwindow4")); diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index 8522a550e8..22d656b2f2 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -76,7 +76,7 @@ static GObjectClass *parent_class = NULL; -static int proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EAccount *account); +static gboolean proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EAccount *account); struct _proxyDialogPrivate { /* Glade XML data for the Add/Edit Proxy dialog*/ @@ -707,7 +707,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data) gtk_notebook_append_page ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog, gtk_label_new("Proxy")); g_signal_connect ((GtkNotebook *)(data->parent), "switch-page", G_CALLBACK (proxy_page_changed_cb), account); pag_num = gtk_notebook_page_num ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog); - g_object_set_data ((GObject *) account, "proxy_tab_num", pag_num); + g_object_set_data ((GObject *) account, "proxy_tab_num", GINT_TO_POINTER (pag_num)); gtk_widget_show_all (priv->tab_dialog); } else if (!g_strrstr (e_account_get_string(account, E_ACCOUNT_SOURCE_URL), "groupwise://")) { prd = g_object_get_data ((GObject *) account, "prd"); @@ -727,7 +727,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data) return NULL; } -static int +static gboolean proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EAccount *account) { proxyDialog *prd; @@ -736,16 +736,16 @@ proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EA prd = g_object_get_data ((GObject *) account, "prd"); if (!prd || !prd->priv) - return; + return TRUE; priv = prd->priv; - if (num == g_object_get_data ((GObject *) account, "proxy_tab_num") && account->enabled) { + if (g_object_get_data ((GObject *) account, "proxy_tab_num") && account->enabled) { if (e_gw_connection_get_proxy_access_list(prd->cnc, &priv->proxy_list)!= E_GW_CONNECTION_STATUS_OK) - return NULL; + return FALSE; proxy_update_tree_view (account); } - return TRUE; + return FALSE; } static void diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c index 3eb9dec8bf..527311a0c2 100644 --- a/plugins/groupwise-features/send-options.c +++ b/plugins/groupwise-features/send-options.c @@ -250,10 +250,6 @@ send_options_finalize () static void e_send_options_copy_general_opts (ESendOptionsGeneral *gopts, EGwSendOptionsGeneral *ggopts) { - time_t temp; - - temp = time (NULL); - ggopts->priority = gopts->priority; ggopts->reply_enabled = gopts->reply_enabled; @@ -498,7 +494,7 @@ add_send_options_to_source (EGwSendOptions *n_opts) ESource *csource, *tsource; ESourceList *list; EGwSendOptionsGeneral *gopts; - EGwSendOptionsStatusTracking *topts, *mopts, *copts; + EGwSendOptionsStatusTracking *topts, *copts; list = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources"); csource = get_source (list); @@ -507,7 +503,6 @@ add_send_options_to_source (EGwSendOptions *n_opts) tsource = get_source (list); gopts = e_gw_sendoptions_get_general_options (n_opts); - mopts = e_gw_sendoptions_get_status_tracking_options (n_opts, "mail"); copts = e_gw_sendoptions_get_status_tracking_options (n_opts, "calendar"); topts = e_gw_sendoptions_get_status_tracking_options (n_opts, "task"); diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c index 0db7f629b6..1a9ef868d3 100644 --- a/plugins/groupwise-features/status-track.c +++ b/plugins/groupwise-features/status-track.c @@ -63,7 +63,7 @@ add_detail (GtkTable *table, char *label, char *value, int row) time = e_gw_connection_get_date_from_string (value); actual_time = camel_header_decode_date (ctime(&time), NULL); - *str = ctime (&actual_time); + str = ctime (&actual_time); str [strlen(str)-1] = '\0'; diff --git a/plugins/hula-account-setup/.cvsignore b/plugins/hula-account-setup/.cvsignore new file mode 100644 index 0000000000..2a782dc66a --- /dev/null +++ b/plugins/hula-account-setup/.cvsignore @@ -0,0 +1,3 @@ +Makefile.in +Makefile +*.eplug diff --git a/plugins/hula-account-setup/ChangeLog b/plugins/hula-account-setup/ChangeLog index 9140132c75..2b51719294 100644 --- a/plugins/hula-account-setup/ChangeLog +++ b/plugins/hula-account-setup/ChangeLog @@ -1,3 +1,10 @@ +2006-01-09 Kjartan Maraas <kmaraas@gnome.org> + + * camel-hula-listener.c: (is_hula_caldav_account), (add_esource), + (modify_esource), (account_added), (account_removed), + (account_changed): Try to fix caldav and normal account setup. This + definitely needs review. + 2006-01-06 Simon Zheng <simon.zheng@sun.com> * camel-hula-listener.c: diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c index c51c7b46c9..b3e4a933bf 100644 --- a/plugins/hula-account-setup/camel-hula-listener.c +++ b/plugins/hula-account-setup/camel-hula-listener.c @@ -50,7 +50,7 @@ struct _HulaAccountInfo { typedef struct _HulaAccountInfo HulaAccountInfo; #define HULA_CALDAV_URI_PREFIX "caldav://" -#define HULA_PREFIX_LENGTH 9 +#define HULA_CALDAV_PREFIX_LENGTH 9 #define HULA_URI_PREFIX "hula://" #define HULA_PREFIX_LENGTH 7 #define PARENT_TYPE G_TYPE_OBJECT @@ -130,6 +130,16 @@ is_hula_account (EAccount *account) } } +static gboolean +is_hula_caldav_account (EAccount *account) +{ + if (account->source->url != NULL) { + return (strncmp (account->source->url, HULA_CALDAV_URI_PREFIX, HULA_CALDAV_PREFIX_LENGTH ) == 0); + } else { + return FALSE; + } +} + /* looks up for an existing hula account info in the hula_accounts list based on uid */ static HulaAccountInfo* @@ -170,7 +180,7 @@ add_esource (const char *conf_key, const char *group_name, const char *source_n char *source_selection_key; char *relative_uri; const char *cal_port = "8081"; - const char *use_ssl = ""; + /* const char *use_ssl = ""; */ /* offline_sync to come soon */ /* TODO use_ssl = camel_url_get_param (url, "use_ssl"); */ @@ -293,7 +303,7 @@ remove_esource (const char *conf_key, const char *group_name, char* source_name, } -/* looks up for e-source with having same info as old_account_info and changes its values passed in new values */ +/* looks for e-source with the same info as old_account_info and changes its values to the values passed in */ static void modify_esource (const char* conf_key, HulaAccountInfo *old_account_info, const char* new_group_name, CamelURL *new_url) @@ -307,18 +317,13 @@ modify_esource (const char* conf_key, HulaAccountInfo *old_account_info, const c CamelURL *url; gboolean found_group; GConfClient* client; - const char *address; - const char *cal_port; char *new_relative_uri; - const char *new_address; url = camel_url_new (old_account_info->source_url, NULL); - address = url->host; - if (!address || strlen (address) ==0) + if (!url->host || strlen (url->host) ==0) return; - new_address = new_url->host; - - old_relative_uri = g_strdup_printf ("%s@%s:%s/dav/%s/calendar/Personal", url->user, url->host, cal_port, url->user); + + old_relative_uri = g_strdup_printf ("%s@%s:%d/dav/%s/calendar/Personal", url->user, url->host, url->port, url->user); client = gconf_client_get_default (); list = e_source_list_new_for_gconf (client, conf_key); groups = e_source_list_peek_groups (list); @@ -340,7 +345,7 @@ modify_esource (const char* conf_key, HulaAccountInfo *old_account_info, const c if (strcmp (e_source_peek_relative_uri (source), old_relative_uri) == 0) { - new_relative_uri = g_strdup_printf ("%s@%s:%s/dav/%s/calendar/Personal", url->user, url->host, cal_port, url->user); + new_relative_uri = g_strdup_printf ("%s@%s:%d/dav/%s/calendar/Personal", new_url->user, new_url->host, new_url->port, new_url->user); e_source_group_set_name (group, new_group_name); e_source_set_relative_uri (source, new_relative_uri); e_source_set_property (source, "username", new_url->user); @@ -414,7 +419,7 @@ account_added (EAccountList *account_listener, EAccount *account) EAccount *parent; CamelURL *parent_url; - if (!is_hula_account (account)) + if (!is_hula_account (account) || !is_hula_caldav_account (account)) return; info = g_new0 (HulaAccountInfo, 1); @@ -439,7 +444,7 @@ account_removed (EAccountList *account_listener, EAccount *account) { HulaAccountInfo *info; - if (!is_hula_account (account)) + if (!is_hula_account (account) || !is_hula_caldav_account (account)) return; info = lookup_account_info (account->uid); @@ -466,6 +471,8 @@ account_changed (EAccountList *account_listener, EAccount *account) const char *old_address, *new_address; is_hula = is_hula_account (account); + if (is_hula == FALSE) + is_hula = is_hula_caldav_account (account); existing_account_info = lookup_account_info (account->uid); @@ -474,12 +481,12 @@ account_changed (EAccountList *account_listener, EAccount *account) if (!account->enabled) return; - /* some account of other type is changed to hula*/ + /* some account of other type is changed to hula */ account_added (account_listener, account); - } else if ( existing_account_info != NULL && !is_hula) { + } else if (existing_account_info != NULL && !is_hula) { - /*hula account is changed to some other type */ + /* hula account is changed to some other type */ remove_calendar_sources (existing_account_info); hula_accounts = g_list_remove (hula_accounts, existing_account_info); g_free (existing_account_info->uid); @@ -494,7 +501,7 @@ account_changed (EAccountList *account_listener, EAccount *account) return; } - /* some info of hula account is changed . update the sources with new info if required */ + /* some info of hula account is changed. update the sources with new info if required */ old_url = camel_url_new (existing_account_info->source_url, NULL); old_address = old_url->host; old_caldav_port = camel_url_get_param (old_url, "caldav_port"); diff --git a/plugins/import-ics-attachments/.cvsignore b/plugins/import-ics-attachments/.cvsignore new file mode 100644 index 0000000000..2a782dc66a --- /dev/null +++ b/plugins/import-ics-attachments/.cvsignore @@ -0,0 +1,3 @@ +Makefile.in +Makefile +*.eplug diff --git a/plugins/import-ics-attachments/icsimporter.c b/plugins/import-ics-attachments/icsimporter.c index 577a5af7ca..40c5a02ddd 100644 --- a/plugins/import-ics-attachments/icsimporter.c +++ b/plugins/import-ics-attachments/icsimporter.c @@ -219,7 +219,7 @@ init_widgets(char *path) subcomp = icalcomponent_get_inner(icidata->icalcomp); kind = icalcomponent_isa (subcomp); - char *label_str; + char *label_str = NULL; if (kind == ICAL_VTODO_COMPONENT ) { e_cal_get_sources (&source_list, E_CAL_SOURCE_TYPE_TODO, NULL); label_str = _("Select Task List"); @@ -232,7 +232,7 @@ init_widgets(char *path) char *markup; markup = g_markup_printf_escaped ("<b>%s</b>", label_str); - gtk_label_set_markup (label, markup); + gtk_label_set_markup (GTK_LABEL (label), markup); hbox = gtk_hbox_new (FALSE, FALSE); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 6); @@ -240,9 +240,9 @@ init_widgets(char *path) selector = e_source_selector_new (source_list); e_source_selector_show_selection (E_SOURCE_SELECTOR (selector), FALSE); scrolled = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy((GtkScrolledWindow *)scrolled, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_add((GtkContainer *)scrolled, selector); - gtk_scrolled_window_set_shadow_type (scrolled, GTK_SHADOW_IN); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled), GTK_SHADOW_IN); hbox = gtk_hbox_new (FALSE, FALSE); gtk_box_pack_start (GTK_BOX (hbox), scrolled, TRUE, TRUE, 6); gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 6); @@ -261,13 +261,13 @@ init_widgets(char *path) gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 6); gtk_widget_show(label); GtkWidget *button = gtk_button_new (); - gtk_container_add (button, hbox); - gtk_dialog_add_action_widget (dialog, button, GTK_RESPONSE_OK); + gtk_container_add (GTK_CONTAINER (button), hbox); + gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_OK); gtk_widget_grab_focus (button); - gtk_window_set_default_size (dialog, 210,340); + gtk_window_set_default_size (GTK_WINDOW (dialog), 210,340); gtk_widget_show_all (dialog); - gtk_dialog_run (dialog); + gtk_dialog_run (GTK_DIALOG (dialog)); } static void @@ -414,7 +414,7 @@ ical_import_done(ICalImporterData *icidata) { g_object_unref (icidata->client); icalcomponent_free (icidata->icalcomp); - gtk_signal_emit_by_name (GTK_DIALOG(icidata->window), "close"); + gtk_signal_emit_by_name (GTK_OBJECT (icidata->window), "close"); g_free (icidata); } diff --git a/plugins/ipod-sync/.cvsignore b/plugins/ipod-sync/.cvsignore new file mode 100644 index 0000000000..2a782dc66a --- /dev/null +++ b/plugins/ipod-sync/.cvsignore @@ -0,0 +1,3 @@ +Makefile.in +Makefile +*.eplug diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog index 865926cb65..f7190e454a 100644 --- a/plugins/itip-formatter/ChangeLog +++ b/plugins/itip-formatter/ChangeLog @@ -1,3 +1,12 @@ +2006-01-09 Kjartan Maraas <kmaraas@gnome.org> + + * itip-formatter.c: (find_cal_opened_cb), (message_foreach_part), + (update_attendee_status), (view_response_cb), (check_is_instance), + (format_itip_object): Add some comments and remove unused code. + * itip-view.c: (itip_view_class_init), (recur_toggled_cb), + (itip_view_add_upper_info_item_printf), + (itip_view_add_lower_info_item_printf): Remove more cruft. + 2006-01-10 Simon Zheng <simon.zheng@sun.com> * itip-view.c: use e_utf8_strftime() in evolution-data-server/ diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index 4d88964174..a3baaad25e 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -447,6 +447,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data) if ((pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST) && !pitip->current_ecal) { + /* Reuse already declared one or rename? */ ESource *source = NULL; char *uid; @@ -682,6 +683,7 @@ message_foreach_part (CamelMimePart *part, GSList **part_list) if (CAMEL_IS_MULTIPART (containee)) { parts = camel_multipart_get_number (CAMEL_MULTIPART (containee)); for (i = 0; go && i < parts; i++) { + /* Reuse already declared *parts? */ CamelMimePart *part = camel_multipart_get_part (CAMEL_MULTIPART (containee), i); message_foreach_part (part, part_list); @@ -964,6 +966,7 @@ update_attendee_status (FormatItipPObject *pitip) itip_strip_mailto (a->delfrom), itip_strip_mailto (a->value), NULL); if (response == GTK_RESPONSE_YES) { + /* Already declared in this function */ icalproperty *prop = find_attendee (icalcomp, itip_strip_mailto (a->value)); icalcomponent_add_property (icalcomp,icalproperty_new_clone (prop)); e_cal_component_rescan (comp); @@ -992,6 +995,7 @@ update_attendee_status (FormatItipPObject *pitip) goto cleanup; } else { if (a->status == ICAL_PARTSTAT_DELEGATED) { + /* *prop already declared in this function */ icalproperty *prop, *new_prop; prop = find_attendee (icalcomp, itip_strip_mailto (a->value)); @@ -1413,9 +1417,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) if (itip_view_get_rsvp (ITIP_VIEW (pitip->view)) && status) { ECalComponent *comp = NULL; - ECalComponentVType vtype; icalcomponent *ical_comp; - icalproperty *prop; icalvalue *value; const char *attendee, *comment; GSList *l, *list = NULL; @@ -1425,8 +1427,6 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) if (comp == NULL) return; - vtype = e_cal_component_get_vtype (comp); - if (pitip->my_address == NULL) find_my_address (pitip, pitip->ical_comp, NULL); g_assert (pitip->my_address != NULL); @@ -1504,7 +1504,6 @@ check_is_instance (icalcomponent *icalcomp) x_name = icalproperty_get_x_name (icalprop); if (!strcmp (x_name, "X-GW-RECURRENCE-KEY")) { return TRUE; - break; } icalprop = icalcomponent_get_next_property (icalcomp, ICAL_X_PROPERTY); } @@ -1776,6 +1775,7 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject CamelFolder *folder; CamelURL *url; char *uri; + /* *l is already declared in this function */ GSList *groups, *l; ESource *source = NULL; gboolean found = FALSE; diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index d490c96308..21afa00568 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -50,7 +50,7 @@ #define MEETING_ICON "stock_new-meeting" -G_DEFINE_TYPE (ItipView, itip_view, GTK_TYPE_HBOX); +G_DEFINE_TYPE (ItipView, itip_view, GTK_TYPE_HBOX) typedef struct { ItipViewInfoItemType type; @@ -775,10 +775,8 @@ itip_view_destroy (GtkObject *object) static void itip_view_class_init (ItipViewClass *klass) { - GObjectClass *object_class; GtkObjectClass *gtkobject_class; - object_class = G_OBJECT_CLASS (klass); gtkobject_class = GTK_OBJECT_CLASS (klass); gtkobject_class->destroy = itip_view_destroy; @@ -822,11 +820,9 @@ recur_toggled_cb (GtkWidget *widget, gpointer data) { ItipView *view = data; ItipViewPrivate *priv; - gboolean is_recur; priv = view->priv; - is_recur = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->recur_check)); itip_view_set_mode (view, priv->mode); } @@ -1448,7 +1444,6 @@ itip_view_add_upper_info_item (ItipView *view, ItipViewInfoItemType type, const guint itip_view_add_upper_info_item_printf (ItipView *view, ItipViewInfoItemType type, const char *format, ...) { - ItipViewPrivate *priv; va_list args; char *message; guint id; @@ -1456,8 +1451,6 @@ itip_view_add_upper_info_item_printf (ItipView *view, ItipViewInfoItemType type, g_return_val_if_fail (view != NULL, 0); g_return_val_if_fail (ITIP_IS_VIEW (view), 0); - priv = view->priv; - va_start (args, format); message = g_strdup_vprintf (format, args); va_end (args); @@ -1546,7 +1539,6 @@ itip_view_add_lower_info_item (ItipView *view, ItipViewInfoItemType type, const guint itip_view_add_lower_info_item_printf (ItipView *view, ItipViewInfoItemType type, const char *format, ...) { - ItipViewPrivate *priv; va_list args; char *message; guint id; @@ -1554,8 +1546,6 @@ itip_view_add_lower_info_item_printf (ItipView *view, ItipViewInfoItemType type, g_return_val_if_fail (view != NULL, 0); g_return_val_if_fail (ITIP_IS_VIEW (view), 0); - priv = view->priv; - va_start (args, format); message = g_strdup_vprintf (format, args); va_end (args); diff --git a/plugins/mail-account-disable/.cvsignore b/plugins/mail-account-disable/.cvsignore new file mode 100644 index 0000000000..2a782dc66a --- /dev/null +++ b/plugins/mail-account-disable/.cvsignore @@ -0,0 +1,3 @@ +Makefile.in +Makefile +*.eplug diff --git a/plugins/mail-remote/.cvsignore b/plugins/mail-remote/.cvsignore new file mode 100644 index 0000000000..2a782dc66a --- /dev/null +++ b/plugins/mail-remote/.cvsignore @@ -0,0 +1,3 @@ +Makefile.in +Makefile +*.eplug diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am index 57d29acdb3..94a717857b 100644 --- a/plugins/mail-to-task/Makefile.am +++ b/plugins/mail-to-task/Makefile.am @@ -4,14 +4,14 @@ INCLUDES = \ @EVO_PLUGIN_RULE@ -plugin_DATA = org-gnome-mail-to-task.eplug org-gnome-mail-to-task.xml +plugin_DATA = org-gnome-mail-to-task.eplug #org-gnome-mail-to-task.xml plugin_LTLIBRARIES = liborg-gnome-mail-to-task.la liborg_gnome_mail_to_task_la_SOURCES = mail-to-task.c liborg_gnome_mail_to_task_la_LDFLAGS = -module -avoid-version -EXTRA_DIST = org-gnome-mail-to-task.eplug.xml \ - org-gnome-mail-to-task.xml +EXTRA_DIST = org-gnome-mail-to-task.eplug.xml +# org-gnome-mail-to-task.xml BUILT_SOURCES = org-gnome-mail-to-task.eplug CLEANFILES = $(BUILT_SOURCES) diff --git a/plugins/mark-all-read/.cvsignore b/plugins/mark-all-read/.cvsignore new file mode 100644 index 0000000000..2a782dc66a --- /dev/null +++ b/plugins/mark-all-read/.cvsignore @@ -0,0 +1,3 @@ +Makefile.in +Makefile +*.eplug diff --git a/plugins/mono/.cvsignore b/plugins/mono/.cvsignore new file mode 100644 index 0000000000..2a782dc66a --- /dev/null +++ b/plugins/mono/.cvsignore @@ -0,0 +1,3 @@ +Makefile.in +Makefile +*.eplug diff --git a/plugins/new-mail-notify/.cvsignore b/plugins/new-mail-notify/.cvsignore new file mode 100644 index 0000000000..2a782dc66a --- /dev/null +++ b/plugins/new-mail-notify/.cvsignore @@ -0,0 +1,3 @@ +Makefile.in +Makefile +*.eplug diff --git a/plugins/plugin-manager/ChangeLog b/plugins/plugin-manager/ChangeLog index 61c4d9c846..793d5f0117 100644 --- a/plugins/plugin-manager/ChangeLog +++ b/plugins/plugin-manager/ChangeLog @@ -1,3 +1,7 @@ +2006-01-16 Kjartan Maraas <kmaraas@gnome.org> + + * plugin-manager.c: (eppm_enable_toggled): Remove unused var. + 2006-01-13 Srinivasa Ragavan <sragavan@novell.com> ** Fixes bug #326265 diff --git a/plugins/plugin-manager/plugin-manager.c b/plugins/plugin-manager/plugin-manager.c index 7ee0c90c0c..fbc1106af8 100644 --- a/plugins/plugin-manager/plugin-manager.c +++ b/plugins/plugin-manager/plugin-manager.c @@ -132,13 +132,11 @@ eppm_selection_changed(GtkTreeSelection *selection, Manager *m) static void eppm_enable_toggled(GtkCellRendererToggle *renderer, char *arg1, Manager *m) { - GtkTreeSelection *selection; GtkTreePath *path; GtkTreeIter iter; EPlugin *plugin; path = gtk_tree_path_new_from_string(arg1); - selection = gtk_tree_view_get_selection(m->tree); if (gtk_tree_model_get_iter((GtkTreeModel *)m->model, &iter, path)) { gtk_tree_model_get((GtkTreeModel *)m->model, &iter, 2, &plugin, -1); e_plugin_enable(plugin, !plugin->enabled); diff --git a/plugins/print-message/.cvsignore b/plugins/print-message/.cvsignore new file mode 100644 index 0000000000..2a782dc66a --- /dev/null +++ b/plugins/print-message/.cvsignore @@ -0,0 +1,3 @@ +Makefile.in +Makefile +*.eplug diff --git a/plugins/profiler/.cvsignore b/plugins/profiler/.cvsignore new file mode 100644 index 0000000000..2a782dc66a --- /dev/null +++ b/plugins/profiler/.cvsignore @@ -0,0 +1,3 @@ +Makefile.in +Makefile +*.eplug diff --git a/plugins/publish-calendar/.cvsignore b/plugins/publish-calendar/.cvsignore new file mode 100644 index 0000000000..2a782dc66a --- /dev/null +++ b/plugins/publish-calendar/.cvsignore @@ -0,0 +1,3 @@ +Makefile.in +Makefile +*.eplug diff --git a/plugins/publish-calendar/ChangeLog b/plugins/publish-calendar/ChangeLog index e8010a7412..0758f235ff 100644 --- a/plugins/publish-calendar/ChangeLog +++ b/plugins/publish-calendar/ChangeLog @@ -1,3 +1,7 @@ +2006-01-27 Kjartan Maraas <kmaraas@gnome.org> + + * publish-format-fb.c: Add missing include. + 2006-01-27 Andre Klapper <a9016009@gmx.de> * publish-calendar.glade: removed string "dialog1" from translation. Fixes bug 306118. diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c index 2e65dcfbf0..12aae23ebe 100644 --- a/plugins/publish-calendar/publish-format-fb.c +++ b/plugins/publish-calendar/publish-format-fb.c @@ -27,6 +27,7 @@ #include <libedataserver/e-source-list.h> #include <libecal/e-cal.h> #include <libecal/e-cal-util.h> +#include <libecal/e-cal-time-util.h> #include <calendar/common/authentication.h> #include "publish-format-fb.h" diff --git a/plugins/sa-junk-plugin/.cvsignore b/plugins/sa-junk-plugin/.cvsignore new file mode 100644 index 0000000000..2a782dc66a --- /dev/null +++ b/plugins/sa-junk-plugin/.cvsignore @@ -0,0 +1,3 @@ +Makefile.in +Makefile +*.eplug diff --git a/plugins/sa-junk-plugin/ChangeLog b/plugins/sa-junk-plugin/ChangeLog index 807aa5d269..d2a4a245c9 100644 --- a/plugins/sa-junk-plugin/ChangeLog +++ b/plugins/sa-junk-plugin/ChangeLog @@ -1,3 +1,7 @@ +2006-01-09 Kjartan Maraas <kmaraas@gnome.org> + + * em-junk-filter.c: (em_junk_sa_run_spamd): Remove unused var. + 2006-01-11 Andre Klapper <a9016009@gmx.de> * org-gnome-sa-junk-plugin.eplug.xml: Changing strings to be more precise. Fixes bug 325132. diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index 8fbe471fc0..d97fc1fe90 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -324,7 +324,6 @@ em_junk_sa_run_spamd (char *binary) d(fprintf (stderr, "trying to run %s with socket path %s\n", binary, em_junk_sa_get_socket_path ())); if (!pipe_to_sa_full (NULL, NULL, argv, -1, 0, NULL)) { - int i; struct timespec time_req; struct stat stat_buf; diff --git a/plugins/save-calendar/ChangeLog b/plugins/save-calendar/ChangeLog index 7e97e80a8b..5776d140f0 100644 --- a/plugins/save-calendar/ChangeLog +++ b/plugins/save-calendar/ChangeLog @@ -1,3 +1,10 @@ +2006-01-09 Kjartan Maraas <kmaraas@gnome.org> + + * csv-format.c: (string_needsquotes): + * save-calendar.c: (ask_destination_and_save): Fix confusion + between = and ==. Silences the compiler, but someone has to check + if this really is correct. + 2006-01-10 Simon Zheng <simon.zheng@sun.com> * csv-format.c: diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index ff53c737e2..39d373775f 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -229,15 +229,15 @@ string_needsquotes (const char *value, CsvConfig *config) if (!needquotes) { gint len = strlen (config->delimiter); - if ((len == 2) && (config->delimiter[1] = ' ')) { + if ((len == 2) && (config->delimiter[1] == ' ')) { needquotes = strchr (value, config->delimiter[0])?TRUE:FALSE; if (!needquotes) { - gint len = strlen (config->newline); - if ((len == 2) && (config->newline[1] = ' ')) { + len = strlen (config->newline); + if ((len == 2) && (config->newline[1] == ' ')) { needquotes = strchr (value, config->newline[0])?TRUE:FALSE; if (!needquotes) { - gint len = strlen (config->quote); - if ((len == 2) && (config->quote[1] = ' ')) { + len = strlen (config->quote); + if ((len == 2) && (config->quote[1] == ' ')) { needquotes = strchr (value, config->quote[0])?TRUE:FALSE; } diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c index 2abdd54951..947f4652d3 100644 --- a/plugins/save-calendar/save-calendar.c +++ b/plugins/save-calendar/save-calendar.c @@ -139,8 +139,7 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource renderer, "text", DEST_NAME_COLUMN, NULL); while (format_handlers) { - FormatHandler *handler = format_handlers->data; - + handler = format_handlers->data; gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, DEST_NAME_COLUMN, handler->combo_label, -1); diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index 6e159e72c4..b1eeb0578b 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -147,6 +147,7 @@ startup_wizard_importer_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data for (l = import_importers; l; l = l->next) { EImportImporter *eii = l->data; char *str; + /* *label already declared */ GtkWidget *w, *label; w = e_import_get_widget(import, (EImportTarget *)import_target, eii); |