From e0965ab239c03af7a2bec82b1d39bb5f085e6e23 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 7 Sep 2007 07:51:47 +0000 Subject: 2007-09-07 mcrha Fix for bug #473903 svn path=/trunk/; revision=34192 --- a11y/ChangeLog | 7 +++++++ a11y/e-table/gal-a11y-e-cell-tree.c | 4 +++- addressbook/ChangeLog | 7 +++++++ addressbook/gui/merging/eab-contact-merging.c | 2 +- calendar/ChangeLog | 11 ++++++++++ calendar/gui/cal-search-bar.c | 2 +- calendar/gui/e-meeting-store.c | 2 +- calendar/gui/e-tasks.c | 2 +- calendar/gui/itip-utils.c | 2 +- calendar/gui/print.c | 6 +++--- composer/ChangeLog | 7 +++++++ composer/e-msg-composer.c | 2 +- e-util/ChangeLog | 7 +++++++ e-util/e-print.c | 2 ++ mail/ChangeLog | 13 ++++++++++++ mail/em-composer-utils.c | 6 +++--- mail/em-folder-tree.c | 24 ++++++++-------------- mail/em-folder-utils.c | 3 ++- mail/em-format.c | 2 +- mail/em-mailer-prefs.c | 6 ++++-- plugins/bogo-junk-plugin/ChangeLog | 7 +++++++ plugins/bogo-junk-plugin/bf-junk-filter.c | 8 +++----- plugins/exchange-operations/ChangeLog | 9 ++++++++ .../exchange-operations/exchange-delegates-user.c | 10 +++++---- plugins/exchange-operations/exchange-delegates.c | 2 +- .../exchange-mail-send-options.c | 2 +- plugins/mail-to-task/ChangeLog | 7 +++++++ plugins/mail-to-task/mail-to-task.c | 2 +- plugins/sa-junk-plugin/ChangeLog | 7 +++++++ plugins/sa-junk-plugin/em-junk-filter.c | 6 +++--- widgets/table/ChangeLog | 7 +++++++ widgets/table/e-tree.c | 2 +- 32 files changed, 138 insertions(+), 48 deletions(-) diff --git a/a11y/ChangeLog b/a11y/ChangeLog index 80b421f2d2..29c2849395 100644 --- a/a11y/ChangeLog +++ b/a11y/ChangeLog @@ -1,3 +1,10 @@ +2007-09-07 Milan Crha + + ** Fix for bug #473903 + + * e-table/gal-a11y-e-cell-tree.c: (kill_view_cb): + Fixes serious compiler warning. + 2007-07-27 Matthew Barnes * Makefile.am: diff --git a/a11y/e-table/gal-a11y-e-cell-tree.c b/a11y/e-table/gal-a11y-e-cell-tree.c index d97cc4f292..e62f6b357e 100644 --- a/a11y/e-table/gal-a11y-e-cell-tree.c +++ b/a11y/e-table/gal-a11y-e-cell-tree.c @@ -51,10 +51,12 @@ ectr_model_row_changed_cb (ETableModel *etm, static void kill_view_cb(ECellView *subcell_view, - GList *subcell_a11ies) + gpointer psubcell_a11ies) { GList *node; + GList *subcell_a11ies = (GList *) psubcell_a11ies; GalA11yECell *subcell; + for (node = subcell_a11ies; node != NULL; node = g_list_next (node)) { subcell = GAL_A11Y_E_CELL(node->data); diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 6cfdc67473..6bac422bf0 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2007-09-07 Milan Crha + + ** Fix for bug #473903 + + * gui/merging/eab-contact-merging.c: (mergeit): + Fixes serious compiler warning. + 2007-09-03 Srinivasa Ragavan * gui/component/addressbook-config.c: (source_to_uri_parts): Fix for a diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c index 903b730ddf..446868643c 100644 --- a/addressbook/gui/merging/eab-contact-merging.c +++ b/addressbook/gui/merging/eab-contact-merging.c @@ -185,7 +185,7 @@ mergeit (EContactMergingLookup *lookup) int num_of_email; GList *email_attr_list; int row = -1; - int value; + int value = 0; dialog = (GtkDialog *)(gtk_dialog_new_with_buttons (_("Merge Contact"), NULL, GTK_DIALOG_NO_SEPARATOR, NULL)); gtk_container_border_width (GTK_CONTAINER(dialog), 5); diff --git a/calendar/ChangeLog b/calendar/ChangeLog index e8390419ee..01b0093801 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,14 @@ +2007-09-07 Milan Crha + + ** Fix for bug #473903 + + * gui/e-meeting-store.c: (freebusy_async): + * gui/cal-search-bar.c: (get_current_category ): + * gui/itip-utils.c: (comp_limit_attendees): + * gui/e-tasks.c: (e_tasks_open_task_id): + * gui/print.c: (struct PrintCompItem), (struct PrintCalItem): + Fixes serious compiler warnings. + 2007-01-08 Wang Xin Fixes #470968 diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c index 4d0f50201c..dbb046aea2 100644 --- a/calendar/gui/cal-search-bar.c +++ b/calendar/gui/cal-search-bar.c @@ -253,7 +253,7 @@ static const char * get_current_category (CalSearchBar *cal_search) { CalSearchBarPrivate *priv; - gint viewid, i; + gint viewid, i = -1; priv = cal_search->priv; diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c index 90c29b7159..1c3b645afe 100644 --- a/calendar/gui/e-meeting-store.c +++ b/calendar/gui/e-meeting-store.c @@ -1151,7 +1151,7 @@ freebusy_async (gpointer data) FreeBusyAsyncData *fbd = data; EMeetingAttendee *attendee = fbd->attendee; gchar *default_fb_uri = NULL; - const char *fburi = NULL; + char *fburi = NULL; static GStaticMutex mutex = G_STATIC_MUTEX_INIT; EMeetingStorePrivate *priv = fbd->store->priv; GnomeVFSAsyncHandle *handle; diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c index 235f8cb9d9..2c44e58927 100644 --- a/calendar/gui/e-tasks.c +++ b/calendar/gui/e-tasks.c @@ -1457,7 +1457,7 @@ e_tasks_open_task_id (ETasks *tasks, return; attendee_prop = icalcomponent_get_first_property (icalcomp, ICAL_ATTENDEE_PROPERTY); - e_calendar_table_open_task (E_CALENDAR_TABLE (tasks->priv->tasks_view), client, icalcomp, (gboolean)attendee_prop); + e_calendar_table_open_task (E_CALENDAR_TABLE (tasks->priv->tasks_view), client, icalcomp, attendee_prop != NULL); icalcomponent_free (icalcomp); return; diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 9a668a5bf9..2cfd5244c3 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -890,7 +890,7 @@ comp_limit_attendees (ECalComponent *comp) char *attendee_text; icalparameter *param; const char *attendee_sentby; - char *attendee_sentby_text; + char *attendee_sentby_text = NULL; /* If we've already found something, just erase the rest */ if (found) { diff --git a/calendar/gui/print.c b/calendar/gui/print.c index ccdc894f7f..e1f07de8aa 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -60,12 +60,12 @@ typedef struct PrintCompItem PrintCompItem; typedef struct PrintCalItem PrintCalItem; struct PrintCompItem { - struct ECal *client; - struct ECalComponent *comp; + ECal *client; + ECalComponent *comp; }; struct PrintCalItem { - struct GnomeCalendar *gcal; + GnomeCalendar *gcal; time_t start; }; diff --git a/composer/ChangeLog b/composer/ChangeLog index acb5eeaf5f..7db08ee174 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,10 @@ +2007-09-07 Milan Crha + + ** Fix for bug #473903 + + * e-msg-composer.c: (handle_multipart_encrypted): + Fixes serious compiler warning. + 2007-09-03 Srinivasa Ragavan ** Fix for bug #471791 (Move away from asserts to g_ret*) diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index f38afb554e..d8415c9404 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -4345,7 +4345,7 @@ handle_multipart_encrypted (EMsgComposer *composer, CamelMimePart *multipart, in handle_multipart_signed (composer, content_multipart, depth); } else if (CAMEL_IS_MULTIPART_ENCRYPTED (content)) { /* decrypt the encrypted content and configure the composer to encrypt outgoing messages */ - handle_multipart_encrypted (composer, content_multipart, depth); + handle_multipart_encrypted (composer, mime_part, depth); } else if (camel_content_type_is (content_type, "multipart", "alternative")) { /* this contains the text/plain and text/html versions of the message body */ handle_multipart_alternative (composer, content_multipart, depth); diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 5d95f05d2f..1214ac7caa 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,10 @@ +2007-09-07 Milan Crha + + ** Fix for bug #473903 + + * e-print.c: (load_page_setup): + Fixes serious compiler warnings. + 2007-08-20 Milan Crha ** Fix for bug #367760 diff --git a/e-util/e-print.c b/e-util/e-print.c index 2bd1718c8f..204b621286 100644 --- a/e-util/e-print.c +++ b/e-util/e-print.c @@ -113,6 +113,8 @@ load_page_setup (GtkPrintSettings *settings) if (paper_size != NULL) gtk_page_setup_set_paper_size_and_default_margins ( page_setup, paper_size); + + return page_setup; } static void diff --git a/mail/ChangeLog b/mail/ChangeLog index 3ed9f52111..f2e16cbb9d 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,16 @@ +2007-09-07 Milan Crha + + ** Fix for bug #473903 + + * em-folder-utils.c: (new_folder_created_cb), + (emfu_popup_new_folder_response): + * em-folder-tree.c: (get_last_child), + (em_folder_tree_select_prev_path): + * em-composer-utils.c: (composer_get_message): + * em-format.c: (em_format_add_puri): + * em-mailer-prefs.c: (junk_plugin_changed), (junk_plugin_setup): + Fixes serious compiler warnings. + 2007-09-06 Andre Klapper * mail-config.c: (config_cache_labels): diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index b238d05b22..0d4c056450 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -257,7 +257,7 @@ composer_get_message (EMsgComposer *composer, gboolean save_html_object_data) int i; GList *postlist; EMEvent *eme; - EMEventTargetMessage *target; + EMEventTargetComposer *target; gconf = mail_config_get_gconf_client (); @@ -367,11 +367,11 @@ composer_get_message (EMsgComposer *composer, gboolean save_html_object_data) */ eme = em_event_peek(); target = em_event_target_new_composer (eme, composer, 0); - g_object_set_data (composer, "presend_check_status", GINT_TO_POINTER(0)); + g_object_set_data (G_OBJECT (composer), "presend_check_status", GINT_TO_POINTER(0)); e_event_emit((EEvent *)eme, "composer.presendchecks", (EEventTarget *)target); - if (GPOINTER_TO_INT (g_object_get_data (composer, "presend_check_status"))) + if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (composer), "presend_check_status"))) goto finished; /* actually get the message now, this will sign/encrypt etc */ diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index a3d6199790..fa0955a832 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -2378,21 +2378,15 @@ get_last_child (GtkTreeModel *model, GtkTreeIter *iter) gboolean has_child = gtk_tree_model_iter_has_child (model, iter); if (gtk_tree_model_iter_next (model, iter)) { - get_last_child (model, iter); - } else { - - if (has_child) { - /* Pick the last one */ - int nchildren = gtk_tree_model_iter_n_children (model, iter); - gtk_tree_model_iter_nth_child ( model, child, iter, nchildren-1); - get_last_child (model, child); - } - else { - return *iter; - } - + return get_last_child (model, iter); + } else if (has_child) { + /* Pick the last one */ + int nchildren = gtk_tree_model_iter_n_children (model, iter); + gtk_tree_model_iter_nth_child ( model, child, iter, nchildren-1); + return get_last_child (model, child); } -//TODO : The function should return the value here !! + + return *iter; } void @@ -2401,7 +2395,7 @@ em_folder_tree_select_prev_path (EMFolderTree *emft, gboolean skip_read_folders) GtkTreeSelection *selection; GtkTreeModel *model; GtkTreeIter iter, child; - GtkTreePath *path, *current_path = NULL; + GtkTreePath *path = NULL, *current_path = NULL; unsigned int unread = 0; struct _EMFolderTreePrivate *priv = emft->priv; diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index 66935aedd8..3fe2587195 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -678,6 +678,7 @@ new_folder_created_cb (CamelFolderInfo *fi, void *user_data) em_folder_tree_set_selected ((EMFolderTree *) emcftd->emft, emcftd->uri, GPOINTER_TO_INT(g_object_get_data ((GObject *)emcftd->emft, "select")) ? FALSE : TRUE); } g_object_unref (emcftd->emfs); + g_free (emcftd->uri); g_free (emcftd); } @@ -725,7 +726,7 @@ emfu_popup_new_folder_response (EMFolderSelector *emfs, int response, gpointer d /* Temp data to pass to create_folder_real function */ emcftd = (struct _EMCreateFolderTempData *) g_malloc(sizeof(struct _EMCreateFolderTempData)); emcftd->emfs = emfs; - emcftd->uri = uri; + emcftd->uri = g_strdup (uri); emcftd->emft = (EMFolderTree *) data; g_object_ref (emfs); diff --git a/mail/em-format.c b/mail/em-format.c index 994e077bd3..f22cc1a577 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -334,7 +334,7 @@ em_format_add_puri(EMFormat *emf, size_t size, const char *cid, CamelMimePart *p d(printf("adding puri for part: %s\n", emf->part_id->str)); if (size < sizeof(*puri)) { - g_warning ("size (%d) less than size of puri\n", size); + g_warning ("size (%ld) less than size of puri\n", size); size = sizeof (*puri); } diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index 1951b79ea2..a8f64a5728 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -779,8 +779,10 @@ junk_plugin_changed (GtkWidget *combo, EMMailerPrefs *prefs) struct _EMJunkHookItem *item = plugins->data;; if (item->plugin_name && def_plugin && !strcmp (item->plugin_name, def_plugin)) { + gboolean status; + session->junk_plugin = CAMEL_JUNK_PLUGIN (&(item->csp)); - void *status = e_plugin_invoke(item->hook->hook.plugin, item->validate_binary, NULL); + status = e_plugin_invoke (item->hook->hook.plugin, item->validate_binary, NULL) != NULL; if ((gboolean)status == TRUE) { char *text, *html; gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-info", GTK_ICON_SIZE_MENU); @@ -833,7 +835,7 @@ junk_plugin_setup (GtkWidget *combo, EMMailerPrefs *prefs) def_set = TRUE; gtk_combo_box_set_active (GTK_COMBO_BOX (combo), index); - status = (gboolean)e_plugin_invoke(item->hook->hook.plugin, item->validate_binary, NULL); + status = e_plugin_invoke (item->hook->hook.plugin, item->validate_binary, NULL) != NULL; if (status) { char *text, *html; gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-info", GTK_ICON_SIZE_MENU); diff --git a/plugins/bogo-junk-plugin/ChangeLog b/plugins/bogo-junk-plugin/ChangeLog index db92715031..4479eddb61 100644 --- a/plugins/bogo-junk-plugin/ChangeLog +++ b/plugins/bogo-junk-plugin/ChangeLog @@ -1,3 +1,10 @@ +2007-09-07 Milan Crha + + ** Part of fix for bug #473903 + + * bf-junk-filter.c: (em_junk_bf_validate_binary): Changing function + prototype to fit what is expected in 'invoke', returns value based on it. + 2007-08-27 Srinivasa Ragavan * bf-junk-filter.c: (e_plugin_lib_enable): Avoid re-entrancy in diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c index 87c1df28b7..e47e0382d8 100644 --- a/plugins/bogo-junk-plugin/bf-junk-filter.c +++ b/plugins/bogo-junk-plugin/bf-junk-filter.c @@ -60,7 +60,7 @@ GtkWidget * org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfi /* plugin fonction prototypes */ gboolean em_junk_bf_check_junk (EPlugin *ep, EMJunkHookTarget *target); -gboolean em_junk_bf_validate_binary (EPlugin *ep, EMJunkHookTarget *target); +void *em_junk_bf_validate_binary (EPlugin *ep, EMJunkHookTarget *target); void em_junk_bf_report_junk (EPlugin *ep, EMJunkHookTarget *target); void em_junk_bf_report_non_junk (EPlugin *ep, EMJunkHookTarget *target); void em_junk_bf_commit_reports (EPlugin *ep, EMJunkHookTarget *target); @@ -244,12 +244,10 @@ em_junk_bf_commit_reports (EPlugin *ep, EMJunkHookTarget *target) { } -gboolean +void * em_junk_bf_validate_binary (EPlugin *ep, EMJunkHookTarget *target) { - - return g_file_test (em_junk_bf_binary, G_FILE_TEST_EXISTS); - + return g_file_test (em_junk_bf_binary, G_FILE_TEST_EXISTS) ? "1" : NULL; } int diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index ba98b49a20..d5317d3958 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,12 @@ +2007-09-07 Milan Crha + + ** Fix for bug #473903 + + * exchange-delegates.c: (email_look_up): + * exchange-mail-send-options.c: (append_to_header): + * exchange-delegates-user.c: (exchange_delegates_user_edit): + Fixes serious compiler warnings. + 2007-08-24 Srinivasa Ragavan * org-gnome-exchange-cal-subscription.xml: Fix for empty menu in the diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c index 8fa918f3a8..916498782b 100644 --- a/plugins/exchange-operations/exchange-delegates-user.c +++ b/plugins/exchange-operations/exchange-delegates-user.c @@ -421,10 +421,12 @@ exchange_delegates_user_edit (ExchangeAccount *account, delegate_exchange_dn = e2k_entryid_to_dn (user->entryid); recipient_address = email_look_up (delegate_exchange_dn,account); - addr = camel_internet_address_new (); - camel_address_decode (CAMEL_ADDRESS (addr), recipient_address); - camel_mime_message_set_recipients (delegate_mail, CAMEL_RECIPIENT_TYPE_TO, addr); - camel_object_unref (addr); + if (recipient_address) { + addr = camel_internet_address_new (); + camel_address_decode (CAMEL_ADDRESS (addr), recipient_address); + camel_mime_message_set_recipients (delegate_mail, CAMEL_RECIPIENT_TYPE_TO, addr); + camel_object_unref (addr); + } eaccount = exchange_account_fetch (account); if(eaccount) { diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c index 12ef113f6f..4c4bc7efc9 100644 --- a/plugins/exchange-operations/exchange-delegates.c +++ b/plugins/exchange-operations/exchange-delegates.c @@ -528,7 +528,7 @@ email_look_up (const char *delegate_legacy, ExchangeAccount *account) gc = exchange_account_get_global_catalog (account); if (!gc) - return; + return NULL; status = e2k_global_catalog_lookup ( gc, NULL, E2K_GLOBAL_CATALOG_LOOKUP_BY_LEGACY_EXCHANGE_DN, diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c index a54936677f..8e5b7e377a 100644 --- a/plugins/exchange-operations/exchange-mail-send-options.c +++ b/plugins/exchange-operations/exchange-mail-send-options.c @@ -44,7 +44,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data) { EMsgComposer *composer; EMsgComposerHdrs *hdrs; - CamelInternetAddress *sender_address; + CamelAddress *sender_address; const char *sender_id, *recipient_id; composer = (EMsgComposer *)data; diff --git a/plugins/mail-to-task/ChangeLog b/plugins/mail-to-task/ChangeLog index c811d9dc7e..91e848aad1 100644 --- a/plugins/mail-to-task/ChangeLog +++ b/plugins/mail-to-task/ChangeLog @@ -1,3 +1,10 @@ +2007-09-07 Milan Crha + + ** Fix for bug #473903 + + * mail-to-task.c: (set_attachments): + Fixes serious compiler warning. + 2007-08-16 Milan Crha ** Part of fix for bug #350539 diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index 0cabb9b978..1b0ba16998 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -199,7 +199,7 @@ set_attachments (ECal *client, ECalComponent *comp, CamelMimeMessage *message) int parts, i; GSList *list = NULL; const char *uid; - char *store_uri; + const char *store_uri; char *store_dir; CamelDataWrapper *content; diff --git a/plugins/sa-junk-plugin/ChangeLog b/plugins/sa-junk-plugin/ChangeLog index 546a2982b8..ccade72b1f 100644 --- a/plugins/sa-junk-plugin/ChangeLog +++ b/plugins/sa-junk-plugin/ChangeLog @@ -1,3 +1,10 @@ +2007-09-07 Milan Crha + + ** Part of fix for bug #473903 + + * em-junk-filter.c: (em_junk_sa_validate_binary): Changing function + prototype to fit what is expected in 'invoke', returns value based on it. + 2007-08-22 Srinivasa Ragavan ** Fix for bug #468303 diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index 04262d9c9f..bfe1fbbd8d 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -65,7 +65,7 @@ gboolean em_junk_sa_check_junk (EPlugin *ep, EMJunkHookTarget *target); void em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target); void em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target); void em_junk_sa_commit_reports (EPlugin *ep, EMJunkHookTarget *target); -gboolean em_junk_sa_validate_binary (EPlugin *ep, EMJunkHookTarget *target); +void *em_junk_sa_validate_binary (EPlugin *ep, EMJunkHookTarget *target); GtkWidget *org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data); static void em_junk_sa_init (void); @@ -721,10 +721,10 @@ em_junk_sa_commit_reports (EPlugin *ep, EMJunkHookTarget *target) } } -gboolean +void * em_junk_sa_validate_binary (EPlugin *ep, EMJunkHookTarget *target) { - return em_junk_sa_is_available (); + return em_junk_sa_is_available () ? "1" : NULL; } static void diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog index e0ff5149c1..85b024ac18 100644 --- a/widgets/table/ChangeLog +++ b/widgets/table/ChangeLog @@ -1,3 +1,10 @@ +2007-09-07 Milan Crha + + ** Fix for bug #473903 + + * e-tree.c: (et_real_construct): + Fixes serious compiler warning. + 2007-08-31 Srinivasa Ragavan ** Move away from g_assert to g_return* critical warnings to debug diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index c327706644..7c4ca8ad6b 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -1463,7 +1463,7 @@ et_real_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete, g_object_unref(ete); - return e_tree; + return e_tree != NULL; } /** -- cgit v1.2.3