[maemo-commits] [maemo-commits] r17423 - in projects/haf/trunk/ke-recv: debian mmc-utils src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Sat Feb 14 13:32:24 EET 2009
- Previous message: [maemo-commits] r17422 - in projects/haf/trunk/libmatchbox2: . debian matchbox/client-types
- Next message: [maemo-commits] r17424 - projects/haf/trunk/clutter/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: kihamala Date: 2009-02-14 13:32:23 +0200 (Sat, 14 Feb 2009) New Revision: 17423 Added: projects/haf/trunk/ke-recv/debian/ke-recv.upstart Modified: projects/haf/trunk/ke-recv/debian/changelog projects/haf/trunk/ke-recv/debian/control projects/haf/trunk/ke-recv/debian/ke-recv.install projects/haf/trunk/ke-recv/debian/postinst projects/haf/trunk/ke-recv/debian/rules projects/haf/trunk/ke-recv/mmc-utils/mmc-pre-unmount.c projects/haf/trunk/ke-recv/src/events.c projects/haf/trunk/ke-recv/src/events.h projects/haf/trunk/ke-recv/src/ke-recv-test.c Log: added upstart script, fixed coverity issues, moved gconf schemas to proper place Modified: projects/haf/trunk/ke-recv/debian/changelog =================================================================== --- projects/haf/trunk/ke-recv/debian/changelog 2009-02-13 15:05:13 UTC (rev 17422) +++ projects/haf/trunk/ke-recv/debian/changelog 2009-02-14 11:32:23 UTC (rev 17423) @@ -1,3 +1,12 @@ +ke-recv (3.9-1~unreleased) unstable; urgency=low + + * Fixed some minor Coverity-found issues. + * Now installing /etc/event.d/ke-recv Upstart script. Fixes: NB#101496 + * Move GConf schema file from /etc/gconf/schemas to + /usr/share/gconf/schemas. + + -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com> Fri, 13 Feb 2009 11:00:18 +0200 + ke-recv (3.8-1) unstable; urgency=low * Remove unused service-launcher code. Fixes: NB#99635 Modified: projects/haf/trunk/ke-recv/debian/control =================================================================== --- projects/haf/trunk/ke-recv/debian/control 2009-02-13 15:05:13 UTC (rev 17422) +++ projects/haf/trunk/ke-recv/debian/control 2009-02-14 11:32:23 UTC (rev 17423) @@ -2,7 +2,7 @@ Section: base Priority: optional Maintainer: Kimmo Hämäläinen <kimmo.hamalainen at nokia.com> -Build-Depends: debhelper (>= 4.0.0), libosso-dev, libglib2.0-dev, pkg-config, osso-af-settings, libhildon1-dev, libxml-parser-perl, libgconf2-dev, libosso-gnomevfs2-dev, libhal-dev, libhildonmime-dev +Build-Depends: debhelper (>= 4.0.0), libosso-dev, libglib2.0-dev, pkg-config, osso-af-settings, libhildon1-dev, libxml-parser-perl, libgconf2-dev, libosso-gnomevfs2-dev, libhal-dev, libhildonmime-dev, upstart-dev Standards-Version: 3.6.0 Package: ke-recv Modified: projects/haf/trunk/ke-recv/debian/ke-recv.install =================================================================== --- projects/haf/trunk/ke-recv/debian/ke-recv.install 2009-02-13 15:05:13 UTC (rev 17422) +++ projects/haf/trunk/ke-recv/debian/ke-recv.install 2009-02-14 11:32:23 UTC (rev 17423) @@ -1,3 +1,3 @@ ../../src/*.conf /etc/dbus-1/system.d ../../src/*.sh /usr/sbin -../../src/*.schemas /etc/gconf/schemas +../../src/*.schemas /usr/share/gconf/schemas Added: projects/haf/trunk/ke-recv/debian/ke-recv.upstart =================================================================== --- projects/haf/trunk/ke-recv/debian/ke-recv.upstart 2009-02-13 15:05:13 UTC (rev 17422) +++ projects/haf/trunk/ke-recv/debian/ke-recv.upstart 2009-02-14 11:32:23 UTC (rev 17423) @@ -0,0 +1,9 @@ +description "starting ke-recv" +author "Philippe De Swert" +start on started hildon-desktop +stop on ACT_DEAD +console none +script + export RUNLEVEL=2 + exec /etc/init.d/ke-recv start +end script Modified: projects/haf/trunk/ke-recv/debian/postinst =================================================================== --- projects/haf/trunk/ke-recv/debian/postinst 2009-02-13 15:05:13 UTC (rev 17422) +++ projects/haf/trunk/ke-recv/debian/postinst 2009-02-14 11:32:23 UTC (rev 17423) @@ -19,7 +19,8 @@ case "$1" in configure) HOME=/root GCONF_CONFIG_SOURCE=xml::/etc/gconf/gconf.xml.defaults \ - gconftool-2 --makefile-install-rule /etc/gconf/schemas/ke-recv.schemas + gconftool-2 --makefile-install-rule \ + /usr/share/gconf/schemas/ke-recv.schemas ;; abort-upgrade|abort-remove|abort-deconfigure) Modified: projects/haf/trunk/ke-recv/debian/rules =================================================================== --- projects/haf/trunk/ke-recv/debian/rules 2009-02-13 15:05:13 UTC (rev 17422) +++ projects/haf/trunk/ke-recv/debian/rules 2009-02-14 11:32:23 UTC (rev 17423) @@ -106,8 +106,8 @@ # dh_installemacsen # dh_installpam # dh_installmime - dh_installinit \ - -u 'start 30 2 3 4 . stop 30 0 1 5 6 .' + dh_installinit -u 'start 30 2 3 4 . stop 30 0 1 5 6 .' + dh_installupstart --init-script=ke-recv # dh_installcron # dh_installinfo dh_installman Modified: projects/haf/trunk/ke-recv/mmc-utils/mmc-pre-unmount.c =================================================================== --- projects/haf/trunk/ke-recv/mmc-utils/mmc-pre-unmount.c 2009-02-13 15:05:13 UTC (rev 17422) +++ projects/haf/trunk/ke-recv/mmc-utils/mmc-pre-unmount.c 2009-02-14 11:32:23 UTC (rev 17423) @@ -71,9 +71,11 @@ if (v != NULL) { char *s; s = gnome_vfs_volume_get_activation_uri (v); - if (strstr(s, vol) != NULL) { + if (s && strstr(s, vol) != NULL) { + g_free (s); return 1; } + if (s) g_free (s); } } return 0; Modified: projects/haf/trunk/ke-recv/src/events.c =================================================================== --- projects/haf/trunk/ke-recv/src/events.c 2009-02-13 15:05:13 UTC (rev 17422) +++ projects/haf/trunk/ke-recv/src/events.c 2009-02-14 11:32:23 UTC (rev 17423) @@ -143,8 +143,8 @@ /* read the volume label from the file */ - g_file_get_contents(mmc->volume_label_file, &buf, NULL, &err); - if (err != NULL) { + if (!g_file_get_contents(mmc->volume_label_file, &buf, NULL, &err) + || err != NULL) { ULOG_ERR_F("couldn't read volume label file %s", mmc->volume_label_file); g_error_free(err); @@ -659,7 +659,11 @@ if (ret != 0) { ULOG_ERR_F("mlabel failed: exec_prog returned %d", ret); - display_dialog(MSG_MEMORY_CARD_IS_CORRUPTED); + if (mmc->internal_card) + display_dialog( + MSG_MEMORY_CARD_IS_CORRUPTED_INT); + else + display_dialog(MSG_MEMORY_CARD_IS_CORRUPTED); /* even if renaming failed it makes sense to * try mounting the card */ } @@ -668,7 +672,11 @@ ULOG_DEBUG_F("successful renaming"); if (!mount_volumes(mmc)) { ULOG_ERR_F("could not mount it"); - display_dialog(MSG_MEMORY_CARD_IS_CORRUPTED); + if (mmc->internal_card) + display_dialog( + MSG_MEMORY_CARD_IS_CORRUPTED_INT); + else + display_dialog(MSG_MEMORY_CARD_IS_CORRUPTED); } } else { ULOG_DEBUG_F("umount failed"); @@ -779,10 +787,11 @@ const char* args[] = {"/usr/sbin/mmc-check", NULL, NULL}; l = get_nth_volume(mmc, mmc->preferred_volume); - part_device = l != NULL ? l->dev_name : NULL; - udi = l->udi; - if (part_device == NULL) { + if (l && l->dev_name && l->udi) { + part_device = l->dev_name; + udi = l->udi; + } else { ULOG_ERR_F("device name for the partition not found"); display_system_note(MSG_UNABLE_TO_REPAIR); return; @@ -872,7 +881,10 @@ l->corrupt = 1; inform_mmc_swapping(FALSE, mmc); set_mmc_corrupted_flag(TRUE, mmc); - display_dialog(MSG_MEMORY_CARD_IS_CORRUPTED); + if (mmc->internal_card) + display_dialog(MSG_MEMORY_CARD_IS_CORRUPTED_INT); + else + display_dialog(MSG_MEMORY_CARD_IS_CORRUPTED); } inform_mmc_used_over_usb(FALSE, mmc); return count; Modified: projects/haf/trunk/ke-recv/src/events.h =================================================================== --- projects/haf/trunk/ke-recv/src/events.h 2009-02-13 15:05:13 UTC (rev 17422) +++ projects/haf/trunk/ke-recv/src/events.h 2009-02-14 11:32:23 UTC (rev 17423) @@ -120,7 +120,8 @@ #define MSG_USB_DISCONNECTED _("card_ib_usb_disconnected") #define MSG_NO_MEMORY_CARD_INSERTED _("card_ni_usb_no_memory_card_inserted") #define MSG_MEMORY_CARD_AVAILABLE _("card_ib_memory_card_available") -#define MSG_MEMORY_CARD_IS_CORRUPTED _("card_ib_memory_card_corrupted") +#define MSG_MEMORY_CARD_IS_CORRUPTED_INT _("card_ib_unknown_format_device") +#define MSG_MEMORY_CARD_IS_CORRUPTED _("card_ia_corrupted") #define MSG_FORMATTING_COMPLETE _("card_ib_formatting_complete") #define MSG_USB_MEMORY_CARD_IN_USE _("card_ni_usb_failed_card_in_use") #define MSG_USB_MEMORY_CARDS_IN_USE _("card_ni_usb_failed_cards_in_use") Modified: projects/haf/trunk/ke-recv/src/ke-recv-test.c =================================================================== --- projects/haf/trunk/ke-recv/src/ke-recv-test.c 2009-02-13 15:05:13 UTC (rev 17422) +++ projects/haf/trunk/ke-recv/src/ke-recv-test.c 2009-02-14 11:32:23 UTC (rev 17423) @@ -103,7 +103,7 @@ static void rename_mmc(const char *device) { - DBusMessage* m = NULL, *reply = NULL; + DBusMessage* m = NULL; dbus_bool_t ret = FALSE; DBusError err; const char* label = "KERECVTEST"; @@ -130,8 +130,7 @@ } assert(ses_conn != NULL); - reply = dbus_connection_send_with_reply_and_block(ses_conn, m, - 20000, &err); + dbus_connection_send_with_reply_and_block(ses_conn, m, 20000, &err); if (dbus_error_is_set(&err)) { ULOG_CRIT_F("error reply: %s", err.message); exit(1);
- Previous message: [maemo-commits] r17422 - in projects/haf/trunk/libmatchbox2: . debian matchbox/client-types
- Next message: [maemo-commits] r17424 - projects/haf/trunk/clutter/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]