Merge branch 'master' into city-chooser

This commit is contained in:
Gergely Polonkai 2014-08-27 23:08:10 +02:00
commit 0c251bc445
2 changed files with 8 additions and 1 deletions

View File

@ -1890,6 +1890,13 @@ ag_window_new(AgApp *app, WebKitUserContentManager *manager)
TRUE, TRUE, 0 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! // TODO: translate this error message!
webkit_web_view_load_html( webkit_web_view_load_html(
WEBKIT_WEB_VIEW(priv->chart_web_view), WEBKIT_WEB_VIEW(priv->chart_web_view),

View File

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