Merge branch 'master' into city-chooser

2014-08-27 23:08:10 +02:00 · 2014-08-27 23:08:10 +02:00 · 0c251bc445
commit 0c251bc445
parent 0c327ddba6 e56e0350eb
2 changed files with 8 additions and 1 deletions
--- a/src/ag-window.c
+++ b/src/ag-window.c
@ -1890,6 +1890,13 @@ ag_window_new(AgApp *app, WebKitUserContentManager *manager)
            TRUE, TRUE, 0
        );

+    g_signal_connect(
+            priv->chart_web_view,
+            "context-menu",
+            G_CALLBACK(ag_window_chart_context_cb),
+            NULL
+        );
+
    // TODO: translate this error message!
    webkit_web_view_load_html(
            WEBKIT_WEB_VIEW(priv->chart_web_view),
--- a/src/resources/ui/chart-default.xsl
+++ b/src/resources/ui/chart-default.xsl
@ -652,7 +652,7 @@
                            </xsl:for-each>
                        </g>

-                        <g id="antiscia" style="visibility:hidden">
+                        <g id="antiscia" visibility="hidden">
                            <xsl:for-each select="chartinfo/antiscia/antiscia">
                                <xsl:variable name="planet1" select="@body1"/>
                                <xsl:variable name="deg1">