Merge branch 'develop' into feature/synctex

This commit is contained in:
Sebastian Ramacher 2013-12-27 21:13:18 +01:00
commit 83ca2119b4

5
main.c
View file

@ -55,12 +55,7 @@ main(int argc, char* argv[])
bool print_version = false; bool print_version = false;
bool synctex = false; bool synctex = false;
int page_number = ZATHURA_PAGE_NUMBER_UNSPECIFIED; int page_number = ZATHURA_PAGE_NUMBER_UNSPECIFIED;
#if GTK_CHECK_VERSION(3, 0, 0)
Window embed = 0; Window embed = 0;
#else
GdkNativeWindow embed = 0;
#endif
GOptionEntry entries[] = { GOptionEntry entries[] = {
{ "reparent", 'e', 0, G_OPTION_ARG_INT, &embed, _("Reparents to window specified by xid"), "xid" }, { "reparent", 'e', 0, G_OPTION_ARG_INT, &embed, _("Reparents to window specified by xid"), "xid" },