From acf09ceea694ba046816c46cada28f661bdf4d7e Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Fri, 6 Mar 2015 14:09:37 +0100 Subject: [PATCH 1/1] compile against libxfce4ui --- configure.ac.in | 4 +-- po/xfvnc.pot | 90 ------------------------------------------------------- xfvnc/Makefile.am | 4 +-- xfvnc/main.c | 2 +- 4 files changed, 5 insertions(+), 95 deletions(-) delete mode 100644 po/xfvnc.pot diff --git a/configure.ac.in b/configure.ac.in index 03e0471..9cfdc45 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -19,7 +19,7 @@ AC_PREREQ([2.50]) dnl init automake AM_INIT_AUTOMAKE([dist-bzip2]) -AM_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADERS([config.h]) dnl AC_DEFINE([WEBSITE], ["http://spuriousinterrupt.org/projects/xfvnc"], dnl [Location of the xfvnc website]) AM_MAINTAINER_MODE @@ -53,7 +53,7 @@ dnl XDT_CHECK_LIBX11_REQUIRE dnl required XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0]) -XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0]) XDT_CHECK_PACKAGE([LIBGLADE], [libglade-2.0], [2.6.0]) XDT_CHECK_PACKAGE([GTK_VNC], [gtk-vnc-1.0], [0.2.0]) diff --git a/po/xfvnc.pot b/po/xfvnc.pot deleted file mode 100644 index aa4d073..0000000 --- a/po/xfvnc.pot +++ /dev/null @@ -1,90 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-11-02 01:40-0700\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../xfvnc/main.c:28 -msgid "Connected. Starting session..." -msgstr "" - -#: ../xfvnc/main.c:50 -#, c-format -msgid "XfVNC .:. %s" -msgstr "" - -#: ../xfvnc/main.c:64 -msgid "Connection Error" -msgstr "" - -#: ../xfvnc/main.c:66 -msgid "There was an error connecting to the VNC server" -msgstr "" - -#: ../xfvnc/main.c:67 -msgid "Unfortunately, the type of error is unknown." -msgstr "" - -#: ../xfvnc/xfvnc.desktop.in.h:1 -msgid "VNC Viewer" -msgstr "" - -#: ../xfvnc/xfvnc.desktop.in.h:2 ../xfvnc/xfvnc.glade.h:4 -msgid "XfVNC" -msgstr "" - -#: ../xfvnc/xfvnc.desktop.in.h:3 -msgid "Xfce VNC Viewer Application" -msgstr "" - -#: ../xfvnc/xfvnc.glade.h:1 -msgid "Connecting..." -msgstr "" - -#: ../xfvnc/xfvnc.glade.h:2 -msgid "Display _number:" -msgstr "" - -#: ../xfvnc/xfvnc.glade.h:3 -msgid "Show _fullscreen" -msgstr "" - -#: ../xfvnc/xfvnc.glade.h:5 -msgid "XfVNC Status" -msgstr "" - -#: ../xfvnc/xfvnc.glade.h:6 -msgid "Xfce VNC Viewer" -msgstr "" - -#: ../xfvnc/xfvnc.glade.h:7 -msgid "_Allow other clients to connect" -msgstr "" - -#: ../xfvnc/xfvnc.glade.h:8 -msgid "_Computer name:" -msgstr "" - -#: ../xfvnc/xfvnc.glade.h:9 -msgid "_Password:" -msgstr "" - -#: ../xfvnc/xfvnc.glade.h:10 -msgid "_Recent servers:" -msgstr "" - -#: ../xfvnc/xfvnc.glade.h:11 -msgid "_View only" -msgstr "" diff --git a/xfvnc/Makefile.am b/xfvnc/Makefile.am index bad6c7c..212a3d6 100644 --- a/xfvnc/Makefile.am +++ b/xfvnc/Makefile.am @@ -7,14 +7,14 @@ xfvnc_SOURCES = \ xfvnc_CFLAGS = \ -DLOCALEDIR=\"$(localedir)\" \ $(LIBXFCE4UTIL_CFLAGS) \ - $(LIBXFCEGUI4_CFLAGS) \ + $(LIBXFCE4UI_CFLAGS) \ $(GTK_CFLAGS) \ $(LIBGLADE_CFLAGS) \ $(GTK_VNC_CFLAGS) xfvnc_LDADD = \ $(LIBXFCE4UTIL_LIBS) \ - $(LIBXFCEGUI4_LIBS) \ + $(LIBXFCE4UI_LIBS) \ $(GTK_LIBS) \ $(LIBGLADE_LIBS) \ $(GTK_VNC_LIBS) diff --git a/xfvnc/main.c b/xfvnc/main.c index fdbe950..4270e11 100644 --- a/xfvnc/main.c +++ b/xfvnc/main.c @@ -33,7 +33,7 @@ #include #include -#include +#include #include -- 2.3.1