From 7c9ddae4383fdc5766d21f339e116226c033cf73 Mon Sep 17 00:00:00 2001 From: mjn Date: Thu, 14 Sep 2006 10:53:41 +0000 Subject: [PATCH] add send via email git-svn-id: svn+ssh://garage/svnroot/maemo-recorder/trunk@13 2441f5eb-5316-0410-9386-a49b32a51a4a --- configure.ac | 4 ++++ debian/changelog | 1 + debian/control | 2 +- debian/maemo-recorder.postinst | 4 +++- src/Makefile.am | 4 ++-- src/maemo-recorder-ui.c | 25 +++++++++++++++++++++++++ 6 files changed, 36 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 5c897df..1befd9d 100644 --- a/configure.ac +++ b/configure.ac @@ -62,6 +62,10 @@ PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0) AC_SUBST(GNOME_VFS_LIBS) AC_SUBST(GNOME_VFS_CFLAGS) +PKG_CHECK_MODULES(OSSO_EMAIL, libossoemailinterface) +AC_SUBST(OSSO_EMAIL_LIBS) +AC_SUBST(OSSO_EMAIL_CFLAGS) + dnl MIME-type registration AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no) AM_CONDITIONAL(HAVE_26_MIME, test x$UPDATE_MIME_DATABASE != xno) diff --git a/debian/changelog b/debian/changelog index a656a80..aab31e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ maemo-recorder (0.0.18) unstable; urgency=low * cleaned up and re-organized the settings dialog * WAVs are now saved as .wav, not .raw :) * added mime type for wav + * added send via email... -- Jari Tenhunen Fri, 8 Sep 2006 20:06:14 +0300 diff --git a/debian/control b/debian/control index 59a9649..5a013b5 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: maemo-recorder Section: user/multimedia Priority: optional Maintainer: Tapio Tolvanen -Build-Depends: debhelper (>= 4.0.0), libgstreamer0.10-dev (>= 0.10.1-1), hildon-libs-dev (>= 0.8.4), libosso-dev (>= 0.8.4) +Build-Depends: debhelper (>= 4.0.0), libgstreamer0.10-dev (>= 0.10.1-1), hildon-libs-dev (>= 0.8.4), libosso-dev (>= 0.8.4), libosso-email-interface-dev Standards-Version: 3.6.0 Package: maemo-recorder diff --git a/debian/maemo-recorder.postinst b/debian/maemo-recorder.postinst index 2e4262c..1a31ef2 100644 --- a/debian/maemo-recorder.postinst +++ b/debian/maemo-recorder.postinst @@ -22,7 +22,9 @@ case "$1" in update-mime-database /usr/share/mime update-desktop-database -q osso-update-category-database /usr/share/mime - maemo-select-menu-location maemo_recorder.desktop + if [ -z "$2" ]; then + maemo-select-menu-location maemo_recorder.desktop + fi ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/src/Makefile.am b/src/Makefile.am index edf150e..c13ca83 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,5 +3,5 @@ bin_PROGRAMS = maemo_recorder maemo_recorder_SOURCES = maemo-recorder.c maemo-recorder-ui.c maemo-recorder-file.c maemo-recorder-au.c settings.c -maemo_recorder_CFLAGS = $(GTK_CFLAGS) $(OSSO_CFLAGS) $(HILDON_LGPL_CFLAGS) $(GSTREAMER_CFLAGS) $(HILDON_FM_CFLAGS) $(GNOME_VFS_CFLAGS) -maemo_recorder_LDADD = $(GTK_LIBS) $(OSSO_LIBS) $(HILDON_LGPL_LIBS) $(GSTREAMER_LIBS) $(HILDON_FM_LIBS) $(GNOME_VFS_LIBS) +maemo_recorder_CFLAGS = $(GTK_CFLAGS) $(OSSO_CFLAGS) $(HILDON_LGPL_CFLAGS) $(GSTREAMER_CFLAGS) $(HILDON_FM_CFLAGS) $(GNOME_VFS_CFLAGS) $(OSSO_EMAIL_CFLAGS) +maemo_recorder_LDADD = $(GTK_LIBS) $(OSSO_LIBS) $(HILDON_LGPL_LIBS) $(GSTREAMER_LIBS) $(HILDON_FM_LIBS) $(GNOME_VFS_LIBS) $(OSSO_EMAIL_LIBS) diff --git a/src/maemo-recorder-ui.c b/src/maemo-recorder-ui.c index 0bfc029..e9f3497 100644 --- a/src/maemo-recorder-ui.c +++ b/src/maemo-recorder-ui.c @@ -33,6 +33,8 @@ #include #include #include +#include "osso-helplib.h" +#include #include "maemo-recorder.h" #include "maemo-recorder-ui.h" @@ -1089,6 +1091,24 @@ static void cbSettings(GtkWidget* widget, AppData *data) settings_edit( widget, data ); } +static void cbEmailing(GtkWidget* widget, AppData *data) +{ + gchar *file = NULL; + GSList *list = NULL; + + g_assert(NULL != data); + + file = gtk_entry_get_text(GTK_ENTRY(data->mainViewData.fileNameEntry)); + if ( g_file_test( file, G_FILE_TEST_EXISTS ) ) + { + ULOG_INFO("Emailing: %s", file); + list= g_slist_append( list , file ); + osso_email_files_email( data->osso, list ); + g_slist_free(list); + } + g_free(file); +} + static void cbSaveAs(GtkWidget* widget, AppData *data) { GtkWidget* dialog = NULL; @@ -1525,6 +1545,7 @@ static void createMenu( AppData *data ) GtkWidget *item_ilbc; GtkWidget *item_pcm; GtkWidget *item_settings; + GtkWidget *item_email; /* GtkWidget *item_radio_type1; */ @@ -1545,6 +1566,7 @@ static void createMenu( AppData *data ) item_file_save_as = gtk_menu_item_new_with_label(_("Save as...")); item_others = gtk_menu_item_new_with_label (_("Recording format")); item_settings = gtk_menu_item_new_with_label (_("Settings")); + item_email = gtk_menu_item_new_with_label(_("Send via e-mail...")); item_pcma = gtk_radio_menu_item_new_with_label( group, FORMAT_NAME_PCMA); @@ -1582,6 +1604,7 @@ static void createMenu( AppData *data ) gtk_menu_append( main_menu, item_file ); gtk_menu_append( menu_file, item_file_open ); gtk_menu_append( menu_file, item_file_save_as ); + gtk_menu_append( menu_file, item_email ); gtk_menu_append( main_menu, item_others ); gtk_menu_append( menu_others, item_pcm ); gtk_menu_append( menu_others, item_pcma ); @@ -1604,6 +1627,8 @@ static void createMenu( AppData *data ) GTK_SIGNAL_FUNC (cbSaveAs), data); g_signal_connect( G_OBJECT( item_settings ), "activate", GTK_SIGNAL_FUNC (cbSettings), data); + g_signal_connect( G_OBJECT( item_email ), "activate", + GTK_SIGNAL_FUNC (cbEmailing), data); g_signal_connect( G_OBJECT( item_close ), "activate", GTK_SIGNAL_FUNC (cbItemClose), data); -- 1.7.9.5