0003064: Remove check for libglade in configure
Removed all references to gtk.glade & libglade svn: r12951
This commit is contained in:
parent
01e89f17f2
commit
d6559f9044
23
configure.in
23
configure.in
@ -85,29 +85,6 @@ then
|
|||||||
fi
|
fi
|
||||||
AC_MSG_RESULT($has_pygtk)
|
AC_MSG_RESULT($has_pygtk)
|
||||||
|
|
||||||
AC_MSG_CHECKING(Python bindings for glade)
|
|
||||||
cat > conftest.py <<EOF
|
|
||||||
$pygtk_require
|
|
||||||
try:
|
|
||||||
# Do not import gtk.glade, this can raise a RuntimeError if the
|
|
||||||
# display cannot be opened. Just search it.
|
|
||||||
import imp
|
|
||||||
imp.find_module('glade',[[imp.find_module('gtk')[1]]])
|
|
||||||
out("gtk.glade")
|
|
||||||
except ImportError:
|
|
||||||
out("NO")
|
|
||||||
EOF
|
|
||||||
$PYTHON conftest.py
|
|
||||||
has_pyglade=`cat conftest.out`
|
|
||||||
rm -f conftest.out conftest.py
|
|
||||||
if test NO = "$has_pyglade"
|
|
||||||
then
|
|
||||||
AC_MSG_ERROR([
|
|
||||||
|
|
||||||
**** The python bindings for glade (pygtk2-libglade) could not be found.])
|
|
||||||
fi
|
|
||||||
AC_MSG_RESULT($has_pyglade)
|
|
||||||
|
|
||||||
AC_CONFIG_FILES([
|
AC_CONFIG_FILES([
|
||||||
po/Makefile.in
|
po/Makefile.in
|
||||||
m4/Makefile
|
m4/Makefile
|
||||||
|
@ -28,9 +28,7 @@
|
|||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
import locale
|
|
||||||
import const
|
import const
|
||||||
import signal
|
|
||||||
from gettext import gettext as _
|
from gettext import gettext as _
|
||||||
import platform
|
import platform
|
||||||
import logging
|
import logging
|
||||||
@ -54,7 +52,6 @@ except ImportError:
|
|||||||
#
|
#
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
import gtk
|
import gtk
|
||||||
from gtk import glade
|
|
||||||
import gobject
|
import gobject
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
@ -240,8 +237,6 @@ class Gramps(object):
|
|||||||
from viewmanager import ViewManager
|
from viewmanager import ViewManager
|
||||||
import DataViews
|
import DataViews
|
||||||
from cli.arghandler import ArgHandler
|
from cli.arghandler import ArgHandler
|
||||||
from cli.clidbman import CLIDbManager
|
|
||||||
import Config
|
|
||||||
import TipOfDay
|
import TipOfDay
|
||||||
|
|
||||||
register_stock_icons()
|
register_stock_icons()
|
||||||
|
@ -39,16 +39,3 @@ from validatedcomboentry import *
|
|||||||
from validatedmaskedentry import *
|
from validatedmaskedentry import *
|
||||||
from valueaction import *
|
from valueaction import *
|
||||||
from valuetoolitem import *
|
from valuetoolitem import *
|
||||||
|
|
||||||
# Enabling custom widgets to be included in Glade
|
|
||||||
from gtk.glade import set_custom_handler
|
|
||||||
|
|
||||||
def get_custom_handler(glade, function_name, widget_name,
|
|
||||||
str1, str2, int1, int2):
|
|
||||||
raise DeprecationWarning, "get_custom_handler: shouldn't get here"
|
|
||||||
if function_name == 'ValidatableMaskedEntry':
|
|
||||||
return ValidatableMaskedEntry()
|
|
||||||
if function_name == 'StyledTextEditor':
|
|
||||||
return StyledTextEditor()
|
|
||||||
|
|
||||||
set_custom_handler(get_custom_handler)
|
|
||||||
|
@ -38,12 +38,6 @@ except ImportError:
|
|||||||
f.write('pygtk=no\n')
|
f.write('pygtk=no\n')
|
||||||
f.write('pygtkver=no\n')
|
f.write('pygtkver=no\n')
|
||||||
|
|
||||||
try:
|
|
||||||
import gtk.glade
|
|
||||||
f.write('glade=yes\n')
|
|
||||||
except ImportError:
|
|
||||||
f.write('glade=no\n')
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import cairo
|
import cairo
|
||||||
f.write('pycairo=yes\n')
|
f.write('pycairo=yes\n')
|
||||||
|
Loading…
Reference in New Issue
Block a user