diff options
30 files changed, 119 insertions, 39 deletions
diff --git a/plugins/attachment-reminder/ChangeLog b/plugins/attachment-reminder/ChangeLog index 9ba93d3fbc..3d54bebb90 100644 --- a/plugins/attachment-reminder/ChangeLog +++ b/plugins/attachment-reminder/ChangeLog @@ -1,3 +1,9 @@ +2007-10-26 Kjartan Maraas <kmaraas@gnome.org> + + * attachment-reminder.c: (check_for_attachment_clues), + (clue_check_isempty): Don't mix code and declarations. Also + remove a c++ comment. + 2007-09-06 B S Srinidhi <srinidhi.bs@gmail.com> ** Fix for bug #468366 diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c index 59e3bb3a08..8cec986cd5 100644 --- a/plugins/attachment-reminder/attachment-reminder.c +++ b/plugins/attachment-reminder/attachment-reminder.c @@ -126,18 +126,19 @@ static gboolean ask_for_missing_attachment (GtkWindow *window) /* check for the clues */ static gboolean check_for_attachment_clues (gchar *msg) { - //TODO : Add more strings. RegEx ??? + /* TODO : Add more strings. RegEx ??? */ GConfClient *gconf; GSList *clue_list = NULL, *list; gboolean ret_val = FALSE; + guint msg_length; gconf = gconf_client_get_default (); - //Get the list from gconf + /* Get the list from gconf */ clue_list = gconf_client_get_list ( gconf, GCONF_KEY_ATTACH_REMINDER_CLUES, GCONF_VALUE_STRING, NULL ); - guint msg_length = strlen (msg); + msg_length = strlen (msg); for (list = clue_list;list && !ret_val;list=g_slist_next(list)) { gchar *needle = g_utf8_strdown (list->data, -1); @@ -301,7 +302,7 @@ clue_add_clicked (GtkButton *button, UIData *ui) /* Disconnect from signal so that we can create an empty row */ g_signal_handlers_disconnect_matched(G_OBJECT(model), G_SIGNAL_MATCH_FUNC, 0, 0, NULL, clue_check_isempty, ui); - //TODO : Trim and check for blank strings + /* TODO : Trim and check for blank strings */ new_clue = g_strdup (""); gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_set (GTK_LIST_STORE (model), &iter, diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog index 78810928ba..a7b0b3ec75 100644 --- a/plugins/bbdb/ChangeLog +++ b/plugins/bbdb/ChangeLog @@ -1,3 +1,8 @@ +2007-10-26 Kjartan Maraas <kmaraas@gnome.org> + + * bbdb.c: (bbdb_check_gaim_enabled), (source_changed_cb): + ANSIfication of function declaration. + 2007-10-22 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #417999 diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index a4b363af51..dfbced826e 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -341,7 +341,7 @@ bbdb_open_addressbook (int type) } gboolean -bbdb_check_gaim_enabled () +bbdb_check_gaim_enabled (void) { GConfClient *gconf; gboolean gaim_enabled; diff --git a/plugins/caldav/ChangeLog b/plugins/caldav/ChangeLog index 777abad41b..0801aed8cd 100644 --- a/plugins/caldav/ChangeLog +++ b/plugins/caldav/ChangeLog @@ -1,3 +1,8 @@ +2007-10-26 Kjartan Maraas <kmaraas@gnome.org> + + * caldav-source.c: (ensure_caldav_source_group): + ANSIfication of function declaration. + 2007-05-12 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #337616 diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c index 7290e89e4e..5e43b7ea1e 100644 --- a/plugins/caldav/caldav-source.c +++ b/plugins/caldav/caldav-source.c @@ -50,7 +50,7 @@ GtkWidget * oge_caldav (EPlugin *epl, /* plugin intialization */ static void -ensure_caldav_source_group () +ensure_caldav_source_group (void) { ESourceList *slist; ESourceGroup *group; diff --git a/plugins/calendar-weather/ChangeLog b/plugins/calendar-weather/ChangeLog index e81bffd51f..82a7b7fd60 100644 --- a/plugins/calendar-weather/ChangeLog +++ b/plugins/calendar-weather/ChangeLog @@ -1,3 +1,8 @@ +2007-10-26 Kjartan Maraas <kmaraas@gnome.org> + + * calendar-weather.c: (load_locations), (treeview_clicked): + ANSIfication of function declaration. + 2007-05-24 Matthew Barnes <mbarnes@redhat.com> * calendar-weather.c (e_calendar_weather_location): diff --git a/plugins/calendar-weather/calendar-weather.c b/plugins/calendar-weather/calendar-weather.c index bd4563c489..a7ad776894 100644 --- a/plugins/calendar-weather/calendar-weather.c +++ b/plugins/calendar-weather/calendar-weather.c @@ -146,7 +146,7 @@ parse_subtree (GtkTreeIter *parent, xmlNode *node) } static void -load_locations () +load_locations (void) { xmlDoc *doc; xmlNode *root, *child; diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index 56d43fd1d7..9f4513eb46 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,14 @@ +2007-10-26 Kjartan Maraas <kmaraas@gnome.org> + + * exchange-account-setup.c: (org_gnome_exchange_settings), + (print_error), (set_oof_info), (destroy_oof_data): + * exchange-delegates-user.c: (exchange_delegates_user_edit): + * exchange-mail-send-options.c: (append_to_header): + Warning fixes: + - mark some code static + - use non-deprecated GSignal apis + - rename shadowing variable + 2007-10-09 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #437579 diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index 911b5e617b..24aa1935be 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -87,7 +87,7 @@ typedef struct { GtkWidget *text_view; }OOFData; -OOFData *oof_data; +static OOFData *oof_data; static void update_state (GtkTextBuffer *buffer, gpointer data) @@ -280,7 +280,7 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data) radio_iof = (GtkRadioButton*) gtk_object_new (GTK_TYPE_RADIO_BUTTON, "label", _("I am in the office"), NULL); radio_oof = (GtkRadioButton*) gtk_object_new (GTK_TYPE_RADIO_BUTTON, "label", _("I am out of the office"), "group", radio_iof, NULL); } - gtk_signal_connect (GTK_OBJECT (radio_oof), "toggled", G_CALLBACK (toggled_state), NULL); + g_signal_connect (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); @@ -335,7 +335,7 @@ 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 Assistant"), NULL); - gtk_signal_connect (GTK_OBJECT (btn_dass), "clicked", G_CALLBACK (btn_dass_clicked), NULL); + g_signal_connect (btn_dass, "clicked", G_CALLBACK (btn_dass_clicked), NULL); /* Add items to the table */ #ifdef HAVE_KRB5 gtk_table_attach_defaults (tbl_auth, GTK_WIDGET (lbl_chpass), 0, 1, 0, 1); @@ -359,7 +359,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_OBJECT (btn_fsize), "clicked", G_CALLBACK (btn_fsize_clicked), NULL); + g_signal_connect (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); @@ -694,7 +694,7 @@ org_gnome_exchange_check_options(EPlugin *epl, EConfigHookPageCheckData *data) } static void -set_oof_info () +set_oof_info (void) { ExchangeAccount *account; @@ -707,7 +707,7 @@ set_oof_info () } static void -destroy_oof_data () +destroy_oof_data (void) { if (oof_data->message) g_free (oof_data->message); diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c index 916498782b..062a11a193 100644 --- a/plugins/exchange-operations/exchange-delegates-user.c +++ b/plugins/exchange-operations/exchange-delegates-user.c @@ -79,7 +79,7 @@ const char *exchange_delegates_user_folder_names[] = { /* To translators: The folder names to be displayed in the message being sent to the delegatee. */ -const char *folder_names_for_display[] = { +static const char *folder_names_for_display[] = { N_("Calendar"), N_("Tasks"), N_("Inbox"), N_("Contacts") }; @@ -442,7 +442,7 @@ exchange_delegates_user_edit (ExchangeAccount *account, out_folder = mail_component_get_folder (NULL, MAIL_COMPONENT_FOLDER_OUTBOX); info = camel_message_info_new (NULL); camel_message_info_set_flags (info, CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN); - mail_append_mail (out_folder, delegate_mail, info, em_utils_delegates_done, 0); + mail_append_mail (out_folder, delegate_mail, info, em_utils_delegates_done, NULL); } diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c index 8e5b7e377a..df23f7f6a2 100644 --- a/plugins/exchange-operations/exchange-mail-send-options.c +++ b/plugins/exchange-operations/exchange-mail-send-options.c @@ -46,6 +46,8 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data) EMsgComposerHdrs *hdrs; CamelAddress *sender_address; const char *sender_id, *recipient_id; + struct _camel_header_address *addr; + struct _camel_header_address *sender_addr; composer = (EMsgComposer *)data; if (state == GTK_RESPONSE_OK) { @@ -88,11 +90,8 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data) sender_address = (CamelAddress *) e_msg_composer_hdrs_get_from (hdrs); sender_id = (const char*) camel_address_encode (sender_address); - struct _camel_header_address *addr = camel_header_address_decode ( - dialog->options->delegate_address, NULL); - - struct _camel_header_address *sender_addr = camel_header_address_decode ( - sender_id, NULL); + addr = camel_header_address_decode (dialog->options->delegate_address, NULL); + sender_addr = camel_header_address_decode (sender_id, NULL); if(dialog->options->send_as_del_enabled && dialog->options->delegate_address && diff --git a/plugins/groupwise-account-setup/ChangeLog b/plugins/groupwise-account-setup/ChangeLog index 1d4ed2d539..817b28a694 100644 --- a/plugins/groupwise-account-setup/ChangeLog +++ b/plugins/groupwise-account-setup/ChangeLog @@ -1,3 +1,8 @@ +2007-10-26 Kjartan Maraas <kmaraas@gnome.org> + + * camel-gw-listener.c: (camel_gw_listener_new): + ANSIfication of function declaration. + 2007-08-23 Milan Crha <mcrha@redhat.com> ** Fix for bug #308636 diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c index 9765de7c7a..a2a957cf54 100644 --- a/plugins/groupwise-account-setup/camel-gw-listener.c +++ b/plugins/groupwise-account-setup/camel-gw-listener.c @@ -1018,7 +1018,7 @@ camel_gw_listener_get_type (void) } CamelGwListener* -camel_gw_listener_new () +camel_gw_listener_new (void) { CamelGwListener *config_listener; diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog index 6af2116224..83089bb2c1 100644 --- a/plugins/groupwise-features/ChangeLog +++ b/plugins/groupwise-features/ChangeLog @@ -1,3 +1,13 @@ +2007-10-26 Kjartan Maraas <kmaraas@gnome.org> + + * junk-mail-settings.c: (junk_mail_settings), + (org_gnome_junk_settings): + * send-options.c: (send_options_finalize), (get_source): + * status-track.c: (track_status), (org_gnome_track_status): + Warning fixes: + - mixing code and declarations + - ANSIfication of function declaration + 2007-09-27 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #477045 diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c index 6803c9aea7..89c5e9fe3c 100644 --- a/plugins/groupwise-features/junk-mail-settings.c +++ b/plugins/groupwise-features/junk-mail-settings.c @@ -70,10 +70,10 @@ junk_mail_settings (EPopup *ep, EPopupItem *item, void *data) JunkSettings *junk_tab; int page_count =0; EGwConnection *cnc; + gchar *msg; CamelFolder *folder = (CamelFolder *)data; CamelStore *store = folder->parent_store; cnc = get_cnc (store); - gchar *msg; dialog = gtk_dialog_new_with_buttons (_("Junk Settings"), NULL, diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c index d303890c90..e6b07664ae 100644 --- a/plugins/groupwise-features/send-options.c +++ b/plugins/groupwise-features/send-options.c @@ -229,7 +229,7 @@ org_gnome_send_options (EPlugin *epl, EConfigHookItemFactoryData *data) } static void -send_options_finalize () +send_options_finalize (void) { if (n_cnc) { g_object_unref (n_cnc); diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c index e4a130dd1b..7606fe0bf3 100644 --- a/plugins/groupwise-features/status-track.c +++ b/plugins/groupwise-features/status-track.c @@ -177,6 +177,7 @@ track_status (EPopup *ep, EPopupItem *item, void *data) { EGwItemRecipient *recipient; GString *label = NULL; + GtkLabel *detail; label = g_string_new(""); recipient = recipient_list->data; @@ -226,7 +227,6 @@ track_status (EPopup *ep, EPopupItem *item, void *data) label = g_string_append_c (label, '\n'); } - GtkLabel *detail; detail = GTK_LABEL(gtk_label_new (label->str)); g_string_free (label, TRUE); gtk_label_set_selectable (detail, TRUE); diff --git a/plugins/hula-account-setup/ChangeLog b/plugins/hula-account-setup/ChangeLog index 6a939b6335..5ada817be3 100644 --- a/plugins/hula-account-setup/ChangeLog +++ b/plugins/hula-account-setup/ChangeLog @@ -1,3 +1,8 @@ +2007-10-26 Kjartan Maraas <kmaraas@gnome.org> + + * camel-hula-listener.c: (camel_hula_listener_new): + ANSIfication of function declaration. + 2007-05-25 Matthew Barnes <mbarnes@redhat.com> * camel-hula-listener.c (remove_esource), (modify_esource): diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c index ab8662c783..df28b7e34a 100644 --- a/plugins/hula-account-setup/camel-hula-listener.c +++ b/plugins/hula-account-setup/camel-hula-listener.c @@ -592,7 +592,7 @@ camel_hula_listener_get_type (void) } CamelHulaListener* -camel_hula_listener_new () +camel_hula_listener_new (void) { CamelHulaListener *config_listener; diff --git a/plugins/ipod-sync/ChangeLog b/plugins/ipod-sync/ChangeLog index fc53b2bc0b..5d792691c2 100644 --- a/plugins/ipod-sync/ChangeLog +++ b/plugins/ipod-sync/ChangeLog @@ -1,3 +1,8 @@ +2007-10-26 Kjartan Maraas <kmaraas@gnome.org> + + * evolution-ipod-sync.c: (ipod_check_status): Don't mix code + and declarations. + 2007-09-14 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #476231 diff --git a/plugins/ipod-sync/evolution-ipod-sync.c b/plugins/ipod-sync/evolution-ipod-sync.c index 3b0a3d2de0..73e5536c17 100644 --- a/plugins/ipod-sync/evolution-ipod-sync.c +++ b/plugins/ipod-sync/evolution-ipod-sync.c @@ -29,13 +29,14 @@ ipod_check_status (gboolean silent) if (check_hal () == FALSE) { if (!silent) { + GtkWidget *message; gchar *msg1, *msg2; msg1 = g_strdup_printf("<span weight=\"bold\" size=\"larger\">%s</span>\n\n", _("Hardware Abstraction Layer not loaded")); msg2 = g_strdup_printf("%s%s", msg1, _("The \"hald\" service is required but not currently " "running. Please enable the service and rerun this " "program, or contact your system administrator.") ); - GtkWidget *message = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, msg2); + message = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, msg2); gtk_dialog_run (GTK_DIALOG (message)); @@ -62,13 +63,14 @@ ipod_check_status (gboolean silent) * it wasn't plugged in. Either way, we want to umount * the iPod when we finish syncing. */ if (!silent) { + GtkWidget *message; gchar *msg1, *msg2; msg1 = g_strdup_printf("<span weight=\"bold\" size=\"larger\">%s</span>\n\n", _("Search for an iPod failed")); msg2 = g_strdup_printf("%s%s", msg1, _("Evolution could not find an iPod to synchronize with. " "Either the iPod is not connected to the system or it " "is not powered on.")); - GtkWidget *message = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, msg2); + message = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, msg2); gtk_dialog_run (GTK_DIALOG (message)); diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog index 5aed2a1f68..57857a86a6 100644 --- a/plugins/itip-formatter/ChangeLog +++ b/plugins/itip-formatter/ChangeLog @@ -1,3 +1,8 @@ +2007-10-26 Kjartan Maraas <kmaraas@gnome.org> + + * itip-view.c: (itip_view_get_source_list), (itip_view_get_source), + (itip_view_get_rsvp_comment): Fix NULL vs FALSE warnings. + 2007-10-22 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #417999 diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index f6e2e06855..d48973dd4b 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -1856,8 +1856,8 @@ itip_view_get_source_list (ItipView *view) { ItipViewPrivate *priv; - g_return_val_if_fail (view != NULL, FALSE); - g_return_val_if_fail (ITIP_IS_VIEW (view), FALSE); + g_return_val_if_fail (view != NULL, NULL); + g_return_val_if_fail (ITIP_IS_VIEW (view), NULL); priv = view->priv; @@ -1886,8 +1886,8 @@ itip_view_get_source (ItipView *view) { ItipViewPrivate *priv; - g_return_val_if_fail (view != NULL, FALSE); - g_return_val_if_fail (ITIP_IS_VIEW (view), FALSE); + g_return_val_if_fail (view != NULL, NULL); + g_return_val_if_fail (ITIP_IS_VIEW (view), NULL); priv = view->priv; @@ -2027,8 +2027,8 @@ itip_view_get_rsvp_comment (ItipView *view) { ItipViewPrivate *priv; - g_return_val_if_fail (view != NULL, FALSE); - g_return_val_if_fail (ITIP_IS_VIEW (view), FALSE); + g_return_val_if_fail (view != NULL, NULL); + g_return_val_if_fail (ITIP_IS_VIEW (view), NULL); priv = view->priv; diff --git a/plugins/plugin-manager/ChangeLog b/plugins/plugin-manager/ChangeLog index abf48b55a9..40111f51cd 100644 --- a/plugins/plugin-manager/ChangeLog +++ b/plugins/plugin-manager/ChangeLog @@ -1,3 +1,8 @@ +2007-10-26 Kjartan Maraas <kmaraas@gnome.org> + + * plugin-manager.c: (org_gnome_plugin_manager_manage): + Don't mix code and declarations. + 2007-10-26 Sankar P <psankar@novell.com> * plugin-manager.c: (eppm_selection_changed): diff --git a/plugins/plugin-manager/plugin-manager.c b/plugins/plugin-manager/plugin-manager.c index 326f6ee49b..86b94c290d 100644 --- a/plugins/plugin-manager/plugin-manager.c +++ b/plugins/plugin-manager/plugin-manager.c @@ -71,7 +71,7 @@ struct _Manager { /* for tracking if we're shown */ static GtkDialog *dialog; -const int RESPONSE_CONFIGURE = 1; +static const int RESPONSE_CONFIGURE = 1; void org_gnome_plugin_manager_manage(void *ep, ESMenuTargetShell *t); int e_plugin_lib_configure(EPluginLib *ep); @@ -217,6 +217,8 @@ org_gnome_plugin_manager_manage(void *ep, ESMenuTargetShell *t) GtkTreeSelection *selection; GtkCellRenderer *renderer; GSList *l; + char *string; + GtkWidget *vbox, *subvbox; if (dialog) { gdk_window_raise(((GtkWidget *)dialog)->window); @@ -240,7 +242,6 @@ org_gnome_plugin_manager_manage(void *ep, ESMenuTargetShell *t) gtk_container_set_border_width((GtkContainer *)hbox, 12); gtk_box_pack_start((GtkBox *)m->dialog->vbox, hbox, TRUE, TRUE, 0); - char *string; string = g_strdup_printf("<i>%s</i>", _("Note: Some changes will not take effect until restart")); w = g_object_new(gtk_label_get_type(), @@ -307,12 +308,10 @@ org_gnome_plugin_manager_manage(void *ep, ESMenuTargetShell *t) gtk_container_add((GtkContainer *)w, (GtkWidget *)m->treeview); gtk_box_pack_start((GtkBox *)hbox, (GtkWidget *)w, FALSE, TRUE, 6); - GtkWidget *vbox; vbox = gtk_vbox_new(FALSE, 0); gtk_box_pack_start((GtkBox *)hbox, vbox, TRUE, TRUE, 6); /* this is plugin's name label */ - GtkWidget *subvbox; subvbox = gtk_vbox_new(FALSE, 0); m->items[0] = g_object_new(gtk_label_get_type(), "wrap", TRUE, @@ -324,9 +323,10 @@ org_gnome_plugin_manager_manage(void *ep, ESMenuTargetShell *t) /* this is every other data */ for (i=1;i<LABEL_LAST;i++) { + char *markup; + subvbox = gtk_vbox_new(FALSE, 0); - char *markup; markup = g_strdup_printf("<span weight=\"bold\">%s :</span>", _(label_info[i].label)); m->labels[i] = g_object_new(gtk_label_get_type(), "label", markup, diff --git a/plugins/prefer-plain/ChangeLog b/plugins/prefer-plain/ChangeLog index 82cd184dc0..1ac6c425a2 100644 --- a/plugins/prefer-plain/ChangeLog +++ b/plugins/prefer-plain/ChangeLog @@ -1,3 +1,8 @@ +2007-10-26 Kjartan Maraas <kmaraas@gnome.org> + + * prefer-plain.c: (e_plugin_lib_enable): + Fix NULL vs. 0. + 2007-10-30 Milan Crha <mcrha@redhat.com> ** Fix for bug #487922 diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c index 56d4bd3458..ff96e91da1 100644 --- a/plugins/prefer-plain/prefer-plain.c +++ b/plugins/prefer-plain/prefer-plain.c @@ -221,7 +221,7 @@ e_plugin_lib_enable(EPluginLib *ep, int enable) } else { if (epp_gconf) { g_object_unref(epp_gconf); - epp_gconf = 0; + epp_gconf = NULL; } } diff --git a/plugins/profiler/ChangeLog b/plugins/profiler/ChangeLog index 65c4151a04..50dfdf6e80 100644 --- a/plugins/profiler/ChangeLog +++ b/plugins/profiler/ChangeLog @@ -1,3 +1,7 @@ +2007-10-26 Kjartan Maraas <kmaraas@gnome.org> + + * profiler.c: Add missing includes. + 2007-04-02 Sankar P <psankar@novell.com> * Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr> diff --git a/plugins/profiler/profiler.c b/plugins/profiler/profiler.c index 7d3b4e23f7..915a39deba 100644 --- a/plugins/profiler/profiler.c +++ b/plugins/profiler/profiler.c @@ -25,6 +25,8 @@ #include <string.h> #include <stdio.h> +#include <sys/types.h> +#include <unistd.h> #include <glib.h> #include <e-util/e-profile-event.h> |