From: Sergio Villar Senin Date: Tue, 10 Mar 2009 11:15:07 +0000 (+0000) Subject: * Fixes NB#105153, removed hildon-help dependency in Fremantle X-Git-Tag: git_migration_finished~360 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=adac94902c290224a653eafac2648e49867e04f6;ds=sidebyside * Fixes NB#105153, removed hildon-help dependency in Fremantle pmo-trunk-r7913 --- diff --git a/configure.ac b/configure.ac index 8b4945f..468f0af 100644 --- a/configure.ac +++ b/configure.ac @@ -358,9 +358,9 @@ fi fi # -# check hildon-help (only for maemo) +# check hildon-help (only for maemo AND NOT fremantle) # -if test "x$with_toolkit" != "xgtk"; then +if test "x$with_toolkit" == "xhildon1"; then PKG_CHECK_MODULES(MODEST_HILDON_HELP,hildon-help,have_hildon_help=true,have_hildon_help=false) if test "x$have_hildon_help" == "xfalse"; then PKG_CHECK_MODULES(MODEST_HILDON_HELP,libossohelp,have_osso_help=true,have_osso_help=false) @@ -371,7 +371,7 @@ if test "x$with_toolkit" != "xgtk"; then AC_MSG_ERROR([you need to have either osso-help or hildon-help installed]) fi else - helplib="hildon-help" + helplib="hildon-help" AC_DEFINE_UNQUOTED(MODEST_HAVE_HILDON_HELP, 1, ["Whether hildon-help is used."]) fi fi @@ -615,7 +615,9 @@ if test "x$with_platform" == "xmaemo"; then echo "Maemo Launcher : $maemo_launcher" echo "Editor lib : $wpeditor" echo "Addressbook : $have_abook" - echo "Help lib : $helplib" + if test "x$with_toolkit" == "xhildon1"; then + echo "Help lib : $helplib" + fi echo "libconic support : $have_libconic" echo "Alarm : $have_libalarm" echo "MCE : $have_mce" diff --git a/debian/control b/debian/control index bd1496d..26fb567 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-common, gtkhtml3.14-dev, libcon libdbus-glib-1-dev, libebook-dev, osso-af-settings, libedataserver-dev, libhildonnotify-dev, libgconf2-dev, libglib2.0-dev, libosso-abook-dev, libosso-gnomevfs2-dev, libhildonmime-dev, libprofile-dev, libtinymail-1.0-0-dev, libtinymail-camel-1.0-0-dev, libtinymail-maemo-1.0-0-dev, libtinymailui-1.0-0-dev, libtinymail-gnomevfs-1.0-0-dev, libtinymailui-gtk-1.0-0-dev, wpeditor0, - wpeditor-dev, libhildonhelp-dev, modest-providers-data, libalarm-dev, gtk-doc-tools, libhildonnotify-dev, libnotify-dev, + wpeditor-dev, modest-providers-data, libalarm-dev, gtk-doc-tools, libhildonnotify-dev, libnotify-dev, libogs1.2-dev, microb-engine-dev, mce-dev, maemo-launcher-dev, profile-data-dev Standards-Version: 3.6.0 diff --git a/debian/control.maemo-fremantle b/debian/control.maemo-fremantle new file mode 100644 index 0000000..26fb567 --- /dev/null +++ b/debian/control.maemo-fremantle @@ -0,0 +1,53 @@ +Source: modest +Section: mail +Priority: optional +Maintainer: Dirk-Jan C. Binnema +Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-common, gtkhtml3.14-dev, libconic0-dev, libhildon1-dev, libdbus-1-dev, + libdbus-glib-1-dev, libebook-dev, osso-af-settings, libedataserver-dev, libhildonnotify-dev, libgconf2-dev, + libglib2.0-dev, libosso-abook-dev, libosso-gnomevfs2-dev, libhildonmime-dev, libprofile-dev, libtinymail-1.0-0-dev, libtinymail-camel-1.0-0-dev, + libtinymail-maemo-1.0-0-dev, libtinymailui-1.0-0-dev, libtinymail-gnomevfs-1.0-0-dev, libtinymailui-gtk-1.0-0-dev, wpeditor0, + wpeditor-dev, modest-providers-data, libalarm-dev, gtk-doc-tools, libhildonnotify-dev, libnotify-dev, + libogs1.2-dev, microb-engine-dev, mce-dev, maemo-launcher-dev, profile-data-dev +Standards-Version: 3.6.0 + +Package: modest +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends}, modest-providers-data, modest-l10n-mr0, + osso-icons-theme, operator-wizard-settings, osso-countries-l10n-mr0, microb-engine +Description: an e-mail client for platforms with modest resources + e-mail client for osso + +Package: modest-plugin-dev +Architecture: any +Depends: modest +Description: Plugin development packages for modest mail client. + Plugin development packages for modest, the e-mail client for osso. + +Package: modest-dbg +Section: devel +Architecture: any +Depends: modest (=${Source-Version}) +Description: debug package for modest + Contains the debug symbols for modest app + +Package: libmodest-dbus-client +Section: devel +Architecture: any +Depends: ${shlibs:Depends} +Description: library wrapping modest's dbus interface + This packages provides the library wrapping for modest's + dbus interface + +Package: libmodest-dbus-client-dev +Section: devel +Architecture: any +Depends: libmodest-dbus-client +Description: library wrapping modest's dbus interface (dev package) + Development packages for libmodest-dbus-client + +Package: libmodest-dbus-client-dbg +Section: devel +Architecture: any +Depends: libmodest-dbus-client (=${Source-Version}) +Description: debug package for modest dbus client + This package contains the debug symbols for modest dbus client diff --git a/src/hildon2/modest-connection-specific-smtp-edit-window.c b/src/hildon2/modest-connection-specific-smtp-edit-window.c index bcf75a0..aa76e26 100644 --- a/src/hildon2/modest-connection-specific-smtp-edit-window.c +++ b/src/hildon2/modest-connection-specific-smtp-edit-window.c @@ -474,10 +474,6 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd modest_window_mgr_prevent_hibernation_while_window_is_shown ( modest_runtime_get_window_mgr (), GTK_WINDOW (self)); - hildon_help_dialog_help_enable (GTK_DIALOG(self), - "applications_email_connectionspecificsmtpconf", - modest_maemo_utils_get_osso_context()); - /* Refresh view with current settings */ auth_picker_set_sensitive (priv); security_picker_set_port (priv);