nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Closes #6787 Remove Precise support

Browse source
This commit is contained in:
Eric Gregory 2013-04-10 18:13:07 -07:00
parent 39607a439b
commit 3198df0d62
10 changed files with 12 additions and 27541 deletions
Download patch file Download diff file Expand all files Collapse all files

27333
bindings/gir/WebKit-3.0.gir
View file

File diff suppressed because it is too large Load diff

4
debian/control vendored
View file

@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 8),
cmake (>= 2.8.0),
libsqlite3-dev (>= 3.7.4),
libgnome-keyring-dev (>= 3.2.2),
libindicate-dev (>= 0.6.1),
libmessaging-menu-dev (>= 12.10.2),
libunity-dev (>= 5.12.0),
intltool,
libgirepository1.0-dev (>= 1.32.0)
@ -35,7 +35,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
libxml2 (>= 2.6.32),
libsqlite3-0 (>= 3.7.4),
libgnome-keyring0 (>= 3.2.2),
libindicate5 (>= 0.6.1),
libmessaging-menu0 (>= 12.10.2),
libunity9 (>= 5.12.0)
Description: Email client
Geary is an email client built for the GNOME desktop environment. It

60
debian/control.quantal vendored
View file

@ -1,60 +0,0 @@
Source: geary
Section: gnome
Priority: optional
Maintainer: Jim Nelson <jim@yorba.org>
Build-Depends: debhelper (>= 8),
libgee-dev (>= 0.6.0),
libglib2.0-dev (>= 2.30.0),
libgtk-3-dev (>= 3.2.0),
libunique-3.0-dev (>= 3.0.0),
libnotify-dev (>=0.7.5),
libcanberra-dev (>= 0.28),
libwebkitgtk-3.0-dev (>= 1.8.0),
libgmime-2.6-dev (>= 2.6.0),
valac-0.18 (>= 0.17.4),
cmake (>= 2.8.0),
libsqlite3-dev (>= 3.7.4),
libgnome-keyring-dev (>= 3.2.2),
libmessaging-menu-dev (>= 12.10.2),
libunity-dev (>= 5.12.0),
intltool,
libgirepository1.0-dev (>= 1.32.0)
Standards-Version: 3.8.3
Homepage: http://www.yorba.org
Package: geary
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
libgee2 (>= 0.6.0),
libglib2.0-0 (>= 2.30.0),
libgtk-3-0 (>= 3.2.0),
libunique-3.0-0 (>= 3.0.0),
libnotify4 (>= 0.7.5),
libcanberra0 (>= 0.28),
libwebkitgtk-3.0-0 (>= 1.8.0),
libxml2 (>= 2.6.32),
libsqlite3-0 (>= 3.7.4),
libgnome-keyring0 (>= 3.2.2),
libmessaging-menu0 (>= 12.10.2),
libunity9 (>= 5.12.0)
Description: Email client
Geary is an email client built for the GNOME desktop environment. It
allows you to read and send email with a simple, modern interface.
.
Visit http://www.yorba.org to read about the current state of
Geary's development.
Package: geary-dbg
Architecture: any
Section: debug
Priority: extra
Depends: geary (= ${binary:Version}), ${misc:Depends}
Enhances: geary
Description: Email client (debugging symbols)
Geary is an email client built for the GNOME desktop environment. It
allows you to read and send email with a simple, modern interface.
.
Visit http://www.yorba.org to read about the current state of
Geary's development.
.
This package contains debugging symbols for geary.

23
src/CMakeLists.txt
View file

@ -245,7 +245,6 @@ client/folder-list/folder-list-special-grouping.vala
client/models/conversation-list-store.vala
client/notification/libindicate.vala
client/notification/libmessagingmenu.vala
client/notification/new-messages-indicator.vala
client/notification/new-messages-monitor.vala
@ -301,27 +300,6 @@ ensure_vala_version("0.17.4" MINIMUM)
include(ValaPrecompile)
# Packages
if (LIBINDICATE_FOUND)
message(STATUS "Unity indicate support: ON")
set(EXTRA_CLIENT_PKG_CONFIG
${EXTRA_CLIENT_PKG_CONFIG}
indicate-0.7
)
set(EXTRA_CLIENT_PACKAGES
${EXTRA_CLIENT_PACKAGES}
Dbusmenu-0.4
Indicate-0.7
)
set(EXTRA_VALA_OPTIONS
${EXTRA_VALA_OPTIONS}
-D HAVE_LIBINDICATE
)
else ()
message(STATUS "Unity indicate support: OFF")
endif ()
if (LIBMESSAGINGMENU_FOUND)
message(STATUS "Unity messaging menu support: ON")
set(EXTRA_CLIENT_PKG_CONFIG
@ -434,7 +412,6 @@ add_definitions(${CFLAGS})
set(VALAC_OPTIONS
--vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi
--metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata
--girdir=${CMAKE_SOURCE_DIR}/bindings/gir
--target-glib=${TARGET_GLIB}
--thread
--enable-checking

13
src/client/composer/composer-window.vala
View file

@ -335,7 +335,7 @@ public class ComposerWindow : Gtk.Window {
editor.editable = true;
editor.load_finished.connect(on_load_finished);
editor.hovering_over_link.connect(on_hovering_over_link);
editor.button_press_event.connect(on_button_press_event);
editor.context_menu.connect(on_context_menu);
editor.move_focus.connect(update_actions);
editor.copy_clipboard.connect(update_actions);
editor.cut_clipboard.connect(update_actions);
@ -391,7 +391,6 @@ public class ComposerWindow : Gtk.Window {
s.enable_scripts = false;
s.enable_java_applet = false;
s.enable_plugins = false;
s.enable_default_context_menu = false; // Deprecated, still needed for Precise
editor.settings = s;
scroll.add(editor);
@ -1185,10 +1184,8 @@ public class ComposerWindow : Gtk.Window {
return base.key_press_event(event);
}
private bool on_button_press_event(Gdk.EventButton event) {
if (event.button != 3)
return false;
private bool on_context_menu(Gtk.Widget default_menu, WebKit.HitTestResult hit_test_result,
bool keyboard_triggered) {
context_menu = new Gtk.Menu();
// Undo
@ -1243,11 +1240,11 @@ public class ComposerWindow : Gtk.Window {
context_menu.append(html_item);
context_menu.show_all();
context_menu.popup(null, null, null, event.button, event.time);
context_menu.popup(null, null, null, 0, Gtk.get_current_event_time());
update_actions();
return true;
return true; // Suppress default context menu.
}
private void update_actions() {

105
src/client/notification/libindicate.vala
View file

@ -1,105 +0,0 @@
/* Copyright 2011-2012 Yorba Foundation
*
* This software is licensed under the GNU Lesser General Public License
* (version 2.1 or later). See the COPYING file in this distribution.
*/
public class Libindicate : NewMessagesIndicator {
#if HAVE_LIBINDICATE
private Indicate.Server? indicator = null;
private Indicate.Indicator? compose = null;
private Gee.HashMap<Geary.Folder, Indicate.Indicator> folder_indicators
= new Gee.HashMap<Geary.Folder, Indicate.Indicator>();
public Libindicate(NewMessagesMonitor monitor) {
base (monitor);
// Find the desktop file this app instance is using (running from build dir vs. install dir)
File? desktop_file = GearyApplication.instance.get_desktop_file();
if (desktop_file == null) {
debug("Unable to setup libindicate support: no desktop file found");
return;
}
debug("Using libindicate for messaging menu support w/ .desktop file %s", desktop_file.get_path());
indicator = Indicate.Server.ref_default();
indicator.set_type("message.email");
indicator.set_desktop_file(desktop_file.get_path());
indicator.server_display.connect(on_display_server);
// Create "Compose Message" option and always display it
compose = new Indicate.Indicator.with_server(indicator);
compose.set_property_variant("name", _("Compose Message"));
compose.user_display.connect(on_activate_composer);
compose.show();
monitor.folder_added.connect(on_folder_added);
monitor.folder_removed.connect(on_folder_removed);
monitor.new_messages_arrived.connect(on_new_messages_changed);
monitor.new_messages_retired.connect(on_new_messages_changed);
indicator.show();
}
~Libindicate() {
if (indicator != null) {
monitor.folder_added.disconnect(on_folder_added);
monitor.folder_removed.disconnect(on_folder_removed);
monitor.new_messages_arrived.disconnect(on_new_messages_changed);
monitor.new_messages_retired.disconnect(on_new_messages_changed);
}
}
private void on_folder_added(Geary.Folder folder) {
// Create "New Messages" option which is only displayed if new messages are available
Indicate.Indicator folder_indicator = new Indicate.Indicator.with_server(indicator);
folder_indicator.set_property_variant("name",
_("%s - New Messages").printf(folder.account.information.nickname));
// Use a lambda here (as opposed to an on_activate_inbox method) so we
// can still get to the folder ref to pass to the signal.
folder_indicator.user_display.connect(
(timestamp) => { inbox_activated(folder, timestamp); });
folder_indicators.set(folder, folder_indicator);
}
private void on_folder_removed(Geary.Folder folder) {
Indicate.Indicator folder_indicator;
folder_indicators.unset(folder, out folder_indicator);
folder_indicator.hide();
}
private void on_new_messages_changed(Geary.Folder folder, int count) {
Indicate.Indicator folder_indicator = folder_indicators.get(folder);
if (count > 0) {
if (!monitor.should_notify_new_messages(folder))
return;
// count is in fact a string property
folder_indicator.set_property_variant("count", count.to_string());
folder_indicator.set_property_bool("draw-attention", true);
folder_indicator.show();
} else {
folder_indicator.hide();
}
}
private void on_display_server(uint timestamp) {
application_activated(timestamp);
}
private void on_activate_composer(uint timestamp) {
composer_activated(timestamp);
}
#else
public Libindicate(NewMessagesMonitor monitor) {
base (monitor);
}
#endif
}

11
src/client/notification/new-messages-indicator.vala
View file

@ -4,7 +4,7 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
// This is coded this way to allow for libindicate and libmessagingmenu to coexist in code (if not
// This is coded this way to allow for multiple indicators to coexist in code (if not
// compiled at same time) and minimize the exposure of differences to the rest of the application.
public abstract class NewMessagesIndicator : Geary.BaseObject {
@ -23,19 +23,14 @@ public abstract class NewMessagesIndicator : Geary.BaseObject {
public static NewMessagesIndicator create(NewMessagesMonitor monitor) {
NewMessagesIndicator? indicator = null;
// these are ordered in order of preference, as it's possible for libindicate and
// libmessagingmenu to coexist (although only libmessagingmenu will work)
// Indicators are ordered from most to least prefered. If more than one is available,
// use the first.
#if HAVE_LIBMESSAGINGMENU
if (indicator == null)
indicator = new Libmessagingmenu(monitor);
#endif
#if HAVE_LIBINDICATE
if (indicator == null)
indicator = new Libindicate(monitor);
#endif
if (indicator == null)
indicator = new NullIndicator(monitor);

2
src/client/notification/new-messages-monitor.vala
View file

@ -5,7 +5,7 @@
*/
// NewMessagesMonitor is a central data store for new message information that the various
// notification methods (libnotify, libindicate, libunity, etc.) can monitor to do their thing.
// notification methods (libnotify, libunity, etc.) can monitor to do their thing.
// Subclasses should trap the "notify::count" signal and use that to perform whatever magic
// they need for their implementation, or trap "new-messages" to receive notifications of the emails
// themselves as they're added. In the latter case, subscribers should add required Email.Field

1
src/client/views/conversation-viewer.vala
View file

@ -86,6 +86,7 @@ public class ConversationViewer : Gtk.Box {
web_view = new ConversationWebView();
web_view.hovering_over_link.connect(on_hovering_over_link);
web_view.context_menu.connect(() => { return true; }); // Suppress default context menu.
web_view.realize.connect( () => { web_view.get_vadjustment().value_changed.connect(mark_read); });
web_view.size_allocate.connect(mark_read);

1
src/client/views/conversation-web-view.vala
View file

@ -33,7 +33,6 @@ public class ConversationWebView : WebKit.WebView {
config.enable_scripts = false;
config.enable_java_applet = false;
config.enable_plugins = false;
config.enable_default_context_menu = false; // Deprecated, still needed for Precise
config.enable_developer_extras = Args.inspector;
settings = config;