|
 |
b7cafba |
From: Emilio Pozuelo Monfort <pochu@debian.org>
|
|
|
b7cafba |
Date: Wed, 27 Feb 2013 21:22:24 +0100
|
|
|
b7cafba |
Subject: Don't check for pangox, it's not needed.
|
|
|
b7cafba |
|
|
|
b7cafba |
Bug-Debian: https://bugs.debian.org/701840
|
|
|
b7cafba |
---
|
|
|
b7cafba |
configure.in | 6 +++---
|
|
|
b7cafba |
src/Makefile.am | 6 +++---
|
|
|
b7cafba |
src/preference.c | 26 +++++---------------------
|
|
|
b7cafba |
3 files changed, 11 insertions(+), 27 deletions(-)
|
|
|
b7cafba |
|
|
|
b7cafba |
diff --git a/configure.in b/configure.in
|
|
|
b7cafba |
index 450ceb8..1a36f99 100644
|
|
|
b7cafba |
--- a/configure.in
|
|
|
b7cafba |
+++ b/configure.in
|
|
|
b7cafba |
@@ -21,9 +21,9 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.0.0)
|
|
|
b7cafba |
AC_SUBST(GTK_CFLAGS)
|
|
|
b7cafba |
AC_SUBST(GTK_LIBS)
|
|
|
b7cafba |
|
|
|
b7cafba |
-PKG_CHECK_MODULES(PANGOX, pangox)
|
|
|
b7cafba |
-AC_SUBST(PANGOX_CFLAGS)
|
|
|
b7cafba |
-AC_SUBST(PANGOX_LIBS)
|
|
|
b7cafba |
+PKG_CHECK_MODULES(PANGO, pango)
|
|
|
b7cafba |
+AC_SUBST(PANGO_CFLAGS)
|
|
|
b7cafba |
+AC_SUBST(PANGO_LIBS)
|
|
|
b7cafba |
|
|
|
b7cafba |
eb_LIB_EB4
|
|
|
b7cafba |
|
|
|
b7cafba |
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
|
b7cafba |
index aee2509..31241b7 100644
|
|
|
b7cafba |
--- a/src/Makefile.am
|
|
|
b7cafba |
+++ b/src/Makefile.am
|
|
|
b7cafba |
@@ -2,9 +2,9 @@ bin_PROGRAMS = ebview
|
|
|
b7cafba |
|
|
|
b7cafba |
AM_CPPFLAGS= @EBCONF_PTHREAD_CPPFLAGS@ @EBCONF_EBINCS@ \
|
|
|
b7cafba |
@EBCONF_ZLIBINCS@ @EBCONF_INTLINCS@
|
|
|
b7cafba |
-AM_CFLAGS = @PANGOX_CFLAGS@ @GTK_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@ @CYGWIN_CFLAGS@ -Wall
|
|
|
b7cafba |
-AM_CXXFLAGS = @PANGOX_CFLAGS@ @GTK_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@
|
|
|
b7cafba |
-ebview_LDADD = @PANGOX_LIBS@ @GTK_LIBS@ @THREAD_LIBS@ @CYGWIN_CFLAGS@ \
|
|
|
b7cafba |
+AM_CFLAGS = @PANGO_CFLAGS@ @GTK_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@ @CYGWIN_CFLAGS@ -Wall
|
|
|
b7cafba |
+AM_CXXFLAGS = @PANGO_CFLAGS@ @GTK_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@
|
|
|
b7cafba |
+ebview_LDADD = @PANGO_LIBS@ @GTK_LIBS@ @THREAD_LIBS@ @CYGWIN_CFLAGS@ \
|
|
|
b7cafba |
@EBCONF_EBLIBS@ @EBCONF_ZLIBLIBS@ @EBCONF_INTLLIBS@ @RES_FILE@ @EXTRA_LIBS@
|
|
|
b7cafba |
ebview_LDFLAGS = @EBCONF_PTHREAD_LDFLAGS@
|
|
|
b7cafba |
|
|
|
b7cafba |
diff --git a/src/preference.c b/src/preference.c
|
|
|
b7cafba |
index cf9b1d7..d592414 100644
|
|
|
b7cafba |
--- a/src/preference.c
|
|
|
b7cafba |
+++ b/src/preference.c
|
|
|
b7cafba |
@@ -24,11 +24,7 @@
|
|
|
b7cafba |
#include <langinfo.h>
|
|
|
b7cafba |
#endif
|
|
|
b7cafba |
|
|
|
b7cafba |
-#ifdef __WIN32__
|
|
|
b7cafba |
-#include <pango/pangowin32.h>
|
|
|
b7cafba |
-#else
|
|
|
b7cafba |
-#include <pango/pangox.h>
|
|
|
b7cafba |
-#endif
|
|
|
b7cafba |
+#include <pango/pango.h>
|
|
|
b7cafba |
|
|
|
b7cafba |
#include "dictbar.h"
|
|
|
b7cafba |
#include "selection.h"
|
|
|
b7cafba |
@@ -420,30 +416,18 @@ void calculate_font_size(){
|
|
|
b7cafba |
desc = pango_font_description_from_string(fontset_normal);
|
|
|
b7cafba |
lang = pango_language_from_string("ja");
|
|
|
b7cafba |
|
|
|
b7cafba |
-#ifdef __WIN32__
|
|
|
b7cafba |
- fontmap = pango_win32_font_map_for_display();
|
|
|
b7cafba |
-#else
|
|
|
b7cafba |
- display = gdk_x11_drawable_get_xdisplay(main_window->window);
|
|
|
b7cafba |
- if(display == NULL){
|
|
|
b7cafba |
- LOG(LOG_INFO, "display == NULL");
|
|
|
b7cafba |
+ context = gtk_widget_get_pango_context(main_window);
|
|
|
b7cafba |
+ if(context == NULL){
|
|
|
b7cafba |
+ LOG(LOG_INFO, "context == NULL");
|
|
|
b7cafba |
return;
|
|
|
b7cafba |
}
|
|
|
b7cafba |
|
|
|
b7cafba |
- fontmap = pango_x_font_map_for_display(display);
|
|
|
b7cafba |
-#endif
|
|
|
b7cafba |
-
|
|
|
b7cafba |
+ fontmap = pango_context_get_font_map (context);
|
|
|
b7cafba |
if(fontmap == NULL){
|
|
|
b7cafba |
LOG(LOG_INFO, "fontmap == NULL");
|
|
|
b7cafba |
return;
|
|
|
b7cafba |
}
|
|
|
b7cafba |
|
|
|
b7cafba |
-
|
|
|
b7cafba |
- context = gtk_widget_get_pango_context(main_window);
|
|
|
b7cafba |
- if(context == NULL){
|
|
|
b7cafba |
- LOG(LOG_INFO, "context == NULL");
|
|
|
b7cafba |
- return;
|
|
|
b7cafba |
- }
|
|
|
b7cafba |
-
|
|
|
b7cafba |
fontset = pango_font_map_load_fontset(fontmap,
|
|
|
b7cafba |
context,
|
|
|
b7cafba |
desc,
|