...
 
Commits (1215)
......@@ -44,3 +44,5 @@ tags
TAGS
ABOUT-NLS
config.rpath
test-driver
INSTALL
[submodule "libempathy-gtk/egg-list-box"]
path = libempathy-gtk/egg-list-box
url = git://git.gnome.org/egg-list-box
[submodule "telepathy-account-widgets"]
path = telepathy-account-widgets
url = https://gitlab.gnome.org/GNOME/telepathy-account-widgets.git
This diff is collapsed.
Please visite the Empathy website for installation instructions:
http://live.gnome.org/Empathy/Install
MY_SUBDIRS = tools extensions po data libempathy libempathy-gtk src help tests
NST_SUBDIRS = nautilus-sendto-plugin
MY_SUBDIRS = tools extensions po data telepathy-account-widgets libempathy libempathy-gtk src help tests
GOA_SUBDIRS = goa-mc-plugin
UOA_SUBDIRS = ubuntu-online-accounts
DIST_SUBDIRS = $(MY_SUBDIRS) $(NST_SUBDIRS) $(GOA_SUBDIRS) $(UOA_SUBDIRS)
DIST_SUBDIRS = $(MY_SUBDIRS) $(GOA_SUBDIRS) $(UOA_SUBDIRS)
SUBDIRS = $(MY_SUBDIRS)
if HAVE_NST
SUBDIRS += $(NST_SUBDIRS)
endif
if HAVE_GOA
SUBDIRS += $(GOA_SUBDIRS)
endif
......
This diff is collapsed.
......@@ -6,7 +6,8 @@ $ make && make install
2) Start empathy
$ empathy
This will start MC, connect all enabled accounts and add a GtkStatusIcon. If you
start a private chat or someone is saying something to you, empathy-chat will be
started automagicaly and display a chat UI for your conversation.
This will start telepathy-mission-control, connect all enabled accounts and add
a GtkStatusIcon. If you start a private chat or someone is saying something to
you, empathy-chat will be started automagicaly and display a chat UI for your
conversation.
......@@ -19,15 +19,15 @@ which gnome-autogen.sh || {
}
# Fetch submodules if needed
if test ! -f libempathy-gtk/egg-list-box/COPYING;
if test ! -f telepathy-account-widgets/COPYING;
then
echo "+ Setting up submodules"
git submodule init
fi
git submodule update
cd libempathy-gtk/egg-list-box
cd telepathy-account-widgets
sh autogen.sh --no-configure
cd ../..
cd ..
USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
......@@ -2,8 +2,8 @@ dnl If not 1, append datestamp to the version number
m4_define(empathy_released, 0)
m4_define([empathy_major_version], [3])
m4_define([empathy_minor_version], [6])
m4_define([empathy_micro_version], [3])
m4_define([empathy_minor_version], [25])
m4_define([empathy_micro_version], [90])
m4_define([empathy_nano_version], [0])
dnl Display the nano_version only if it's not '0'
......@@ -34,16 +34,15 @@ AC_COPYRIGHT([
# Minimal version required
# Hardp deps
FOLKS_REQUIRED=0.7.3
GNUTLS_REQUIRED=2.8.5
FOLKS_REQUIRED=0.9.5
GLIB_REQUIRED=2.33.3
AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_30, [Ignore post 2.30 deprecations])
AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_34, [Prevent post 2.34 APIs])
GLIB_REQUIRED=2.48.0
AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_48, [Ignore post 2.48 deprecations])
AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_48, [Prevent post 2.48 APIs])
GTK_REQUIRED=3.5.1
AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_4, [Ignore post 3.4 deprecations])
AC_DEFINE(GDK_VERSION_MAX_ALLOWED, GDK_VERSION_3_4, [Prevent post 3.4 APIs])
GTK_REQUIRED=3.9.4
AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_8, [Ignore post 3.8 deprecations])
AC_DEFINE(GDK_VERSION_MAX_ALLOWED, GDK_VERSION_3_10, [Prevent post 3.10 APIs])
CLUTTER_REQUIRED=1.10.0
AC_DEFINE(CLUTTER_VERSION_MIN_REQUIRED, CLUTTER_VERSION_1_8, [Ignore post 1.8 deprecations])
......@@ -51,30 +50,38 @@ AC_DEFINE(CLUTTER_VERSION_MAX_ALLOWED, CLUTTER_VERSION_1_10, [Prevent post 1.10
CLUTTER_GTK_REQUIRED=1.1.2
TELEPATHY_GLIB_REQUIRED=0.19.9
TELEPATHY_GLIB_REQUIRED=0.23.2
AC_DEFINE(TP_VERSION_MIN_REQUIRED, TP_VERSION_0_20, [Ignore post 0.20 deprecations])
AC_DEFINE(TP_VERSION_MAX_ALLOWED, TP_VERSION_0_20, [Prevent post 0.20 APIs])
AC_DEFINE(TP_VERSION_MAX_ALLOWED, TP_VERSION_0_24, [Prevent post 0.24 APIs])
AC_DEFINE(TP_SEAL_ENABLE, 1, [Prevent to use sealed variables])
AC_DEFINE(TP_DISABLE_SINGLE_INCLUDE, 1, [Disable single include header])
COGL_REQUIRED=1.14
AC_DEFINE(COGL_VERSION_MIN_REQUIRED, COGL_VERSION_1_8, [Ignore post 1.8 deprecations])
AC_DEFINE(COGL_VERSION_MAX_ALLOWED, COGL_VERSION_1_14, [Prevent post 1.14 APIs])
GSTREAMER_REQUIRED=0.10.32
TP_FS_REQUIRED=0.6.0
LIBSECRET_REQUIRED=0.5
GCR_REQUIRED=2.91.4
LIBCANBERRA_GTK_REQUIRED=0.25
LIBNOTIFY_REQUIRED=0.7.0
TELEPATHY_LOGGER=0.2.13
WEBKIT_REQUIRED=1.3.13
LIBSOUP_REQUIRED=2.42.0
TELEPATHY_LOGGER=0.8.0
WEBKIT_REQUIRED=2.10.0
GOA_REQUIRED=3.5.1
# Optional deps
ENCHANT_REQUIRED=1.2.0
GEOCLUE_REQUIRED=0.12
GEOCLUE_REQUIRED=2.1.0
GEOCODE_GLIB_REQUIRED=0.99.1
ISO_CODES_REQUIRED=0.35
NAUTILUS_SENDTO_REQUIRED=2.90.0
NETWORK_MANAGER_REQUIRED=0.7.0
CHAMPLAIN_REQUIRED=0.12.1
CHEESE_GTK_REQUIRED=3.4.0
LIBACCOUNTS_REQUIRED=1.1
LIBSIGNON_REQUIRED=1.1
LIBACCOUNTS_REQUIRED=1.4
LIBSIGNON_REQUIRED=1.8
MC_PLUGINS_REQUIRED=5.13.1
# Use --enable-maintainer-mode to disable deprecated symbols,
......@@ -84,15 +91,27 @@ MC_PLUGINS_REQUIRED=5.13.1
#ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
#GNOME_MAINTAINER_MODE_DEFINES
# egg-list-box
PKG_PROG_PKG_CONFIG([0.25])
# tp-account-widgets
prev_top_build_prefix=$ac_top_build_prefix
prev_ac_configure_args=$ac_configure_args
AX_CONFIG_DIR([libempathy-gtk/egg-list-box])
ac_configure_args="$ac_configure_args --with-pkgdatadir=${datadir}/empathy"
ac_configure_args="$ac_configure_args --with-gettext-package=empathy-tpaw"
ifelse(empathy_released, 1, [],
[
ac_configure_args="$ac_configure_args --enable-unreleased-checks"
])
AX_CONFIG_DIR([telepathy-account-widgets])
ac_top_build_prefix=$prev_top_build_prefix
ac_configure_args=$prev_ac_configure_args
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"libempathy-gtk/egg-list-box
PKG_CHECK_MODULES(EGGLISTBOX, egg-list-box)
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"telepathy-account-widgets/
PKG_CHECK_MODULES(TPAW, telepathy-account-widgets)
EMPATHY_UOA_PROVIDER=`$PKG_CONFIG --variable=uoa_provider telepathy-account-widgets`
AC_DEFINE_UNQUOTED(EMPATHY_UOA_PROVIDER, "$EMPATHY_UOA_PROVIDER",
[Name of provider for accounts imported from libaccounts])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
......@@ -109,7 +128,7 @@ AM_SILENT_RULES([yes])
# Check for programs
AC_PROG_CC
AC_HEADER_STDC
AM_PROG_MKDIR_P
AC_PROG_MKDIR_P
AM_PATH_GLIB_2_0
AC_PATH_XTRA
......@@ -119,6 +138,9 @@ LT_INIT
AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
GLIB_GSETTINGS
GLIB_COMPILE_RESOURCES=`$PKG_CONFIG gio-2.0 --variable=glib_compile_resources`
AC_SUBST(GLIB_COMPILE_RESOURCES)
GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
AC_SUBST(GLIB_GENMARSHAL)
......@@ -135,12 +157,6 @@ EMPATHY_ARG_VALGRIND
# Error flags
# -----------------------------------------------------------
AS_COMPILER_FLAG(-Wall, ERROR_CFLAGS="-Wall", ERROR_CFLAGS="")
AS_COMPILER_FLAG(-Werror, werror=yes, werror=no)
AC_ARG_ENABLE(Werror,
AS_HELP_STRING([--disable-Werror],
[compile without -Werror (normally enabled in development builds)]),
werror=$enableval, :)
AS_COMPILER_FLAG(-Wextra, wextra=yes, wextra=no)
AS_COMPILER_FLAG(-Wno-missing-field-initializers,
......@@ -152,9 +168,6 @@ AS_COMPILER_FLAG(-Wno-unused-parameter,
ifelse(empathy_released, 1, [],
[
if test x$werror = xyes; then
ERROR_CFLAGS="$ERROR_CFLAGS -Werror"
fi
if test x$wextra = xyes -a \
x$wno_missing_field_initializers = xyes -a \
x$wno_unused_parameter = xyes; then
......@@ -197,7 +210,6 @@ PKG_CHECK_MODULES(EMPATHY,
gio-2.0 >= $GLIB_REQUIRED
gio-unix-2.0 >= $GLIB_REQUIRED
libsecret-1 >= $LIBSECRET_REQUIRED
gnutls >= $GNUTLS_REQUIRED
gmodule-export-2.0
gobject-2.0
gsettings-desktop-schemas
......@@ -211,66 +223,30 @@ PKG_CHECK_MODULES(EMPATHY,
gcr-3 >= $GCR_REQUIRED
libpulse
libpulse-mainloop-glib
webkitgtk-3.0 >= $WEBKIT_REQUIRED
libsoup-2.4
gee-1.0
webkit2gtk-4.0 >= $WEBKIT_REQUIRED
libsoup-2.4 >= $LIBSOUP_REQUIRED
gee-0.8
])
# -----------------------------------------------------------
# GStreamer
# -----------------------------------------------------------
AC_ARG_ENABLE(gst-1.0,
AS_HELP_STRING([--enable-gst-1.0=@<:@no/yes/auto@:>@],
[build with GStreamer 1.0]),
enable_gst1=$enableval,
enable_gst1=auto)
# Try to use GStreamer 1.à if available
have_gst1="no"
if test "x$enable_gst1" != "xno"; then
PKG_CHECK_MODULES(EMPATHY_CALL,
[
farstream-0.2
telepathy-farstream >= 0.4.999
clutter-1.0 >= $CLUTTER_REQUIRED
clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED
clutter-gst-2.0
gstreamer-1.0
gstreamer-audio-1.0
gstreamer-video-1.0
], have_gst1="yes", have_gst1="no")
if test "x$have_gst1" = "xyes"; then
AC_DEFINE(HAVE_GST1, 1, [Build with GStreamer 1.0])
fi
fi
if test "x$enable_gst1" = "xyes" -a "x$have_gst1" != "xyes"; then
AC_MSG_ERROR([Could not find GStreamer 1.0 dependencies:
$EMPATHY_CALL_PKG_ERRORS])
fi
if test "x$have_gst1" != "xyes"; then
PKG_CHECK_MODULES(EMPATHY_CALL,
[
farstream-0.1
telepathy-farstream >= 0.2.1
clutter-1.0 >= $CLUTTER_REQUIRED
clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED
clutter-gst-1.0 >= 1.5.2
gstreamer-0.10 >= $GSTREAMER_REQUIRED
gstreamer-interfaces-0.10
])
fi
PKG_CHECK_MODULES(EMPATHY_CALL,
[
farstream-0.2
telepathy-farstream >= $TP_FS_REQUIRED
clutter-1.0 >= $CLUTTER_REQUIRED
clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED
clutter-gst-3.0
gstreamer-1.0
gstreamer-audio-1.0
gstreamer-video-1.0
cogl-1.0 >= $COGL_REQUIRED
])
AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts",
[Name of provider for accounts imported from GOA])
AC_DEFINE(EMPATHY_UOA_PROVIDER,
"im.telepathy.Account.Storage.UOA",
[Name of provider for accounts imported from libaccounts])
# -----------------------------------------------------------
# Enable debug
# -----------------------------------------------------------
......@@ -403,11 +379,18 @@ AC_ARG_ENABLE(location,
if test "x$enable_location" != "xno"; then
PKG_CHECK_MODULES(GEOCLUE,
[
geoclue >= $GEOCLUE_REQUIRED
geoclue-2.0 >= $GEOCLUE_REQUIRED
], have_geoclue="yes", have_geoclue="no")
if test "x$have_geoclue" = "xyes"; then
AC_DEFINE(HAVE_GEOCLUE, 1, [Define if you have geoclue])
GEOCLUE_XML_FILE=`$PKG_CONFIG --variable=dbus_interface geoclue-2.0`
if test "x$GEOCLUE_XML_FILE" = "x"; then
echo "Can't find dbus_interface variable in geoclue-2.0.pc"
have_geoclue="no"
else
AC_DEFINE(HAVE_GEOCLUE, 1, [Define if you have geoclue-2])
AC_SUBST(GEOCLUE_XML_FILE)
fi
fi
else
have_geoclue="no"
......@@ -434,7 +417,7 @@ AC_ARG_ENABLE(geocode,
if test "x$enable_geocode" != "xno"; then
PKG_CHECK_MODULES(GEOCODE,
[
geocode-glib
geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED
], have_geocode="yes", have_geocode="no")
if test "x$have_geocode" = "xyes"; then
......@@ -454,31 +437,6 @@ AM_CONDITIONAL(HAVE_GEOCODE, test "x$have_geocode" = "xyes")
AC_SUBST(GEOCODE_CFLAGS)
AC_SUBST(GEOCODE_LIBS)
# -----------------------------------------------------------
# nautilus-sendto
# -----------------------------------------------------------
AC_ARG_ENABLE(nautilus-sendto,
AS_HELP_STRING([--enable-nautilus-sendto=@<:@no/yes/auto@:>@],
[build nautilus-sendto plugin]), ,
enable_nautilus_sendto=auto)
if test "x$enable_nautilus_sendto" != "xno"; then
PKG_CHECK_MODULES(NST,
[
nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED
], have_nst="yes", have_nst="no")
else
have_nst=no
fi
if test "x$enable_nautilus_sendto" = "xyes" -a "x$have_nst" != "xyes"; then
AC_MSG_ERROR([Could not find nautilus-sendto dependencies:
$NST_PKG_ERRORS])
fi
AM_CONDITIONAL(HAVE_NST, test "x$have_nst" = "xyes")
# -----------------------------------------------------------
# goa-mc-plugin
# -----------------------------------------------------------
......@@ -549,35 +507,35 @@ if test "x$enable_ubuntu_online_accounts" != "xno"; then
# provider plugin dir
AC_MSG_CHECKING([Accounts provider plugin dir])
ACCOUNTS_PROVIDER_PLUGIN_DIR=`pkg-config --variable=provider_plugindir account-plugin`
ACCOUNTS_PROVIDER_PLUGIN_DIR=`$PKG_CONFIG --variable=provider_plugindir account-plugin`
AC_MSG_RESULT([$ACCOUNTS_PROVIDER_PLUGIN_DIR])
AC_SUBST(ACCOUNTS_PROVIDER_PLUGIN_DIR)
# app plugin dir
AC_MSG_CHECKING([Accounts provider app plugin dir])
ACCOUNTS_APP_PLUGIN_DIR=`pkg-config --variable=application_plugindir account-plugin`
ACCOUNTS_APP_PLUGIN_DIR=`$PKG_CONFIG --variable=application_plugindir account-plugin`
AC_MSG_RESULT([$ACCOUNTS_APP_PLUGIN_DIR])
AC_SUBST(ACCOUNTS_APP_PLUGIN_DIR)
# provider files dir
AC_MSG_CHECKING([Accounts provider files dir])
ACCOUNTS_PROVIDER_FILES_DIR=`pkg-config --variable=providerfilesdir libaccounts-glib`
ACCOUNTS_PROVIDER_FILES_DIR=`$PKG_CONFIG --variable=providerfilesdir libaccounts-glib`
AC_MSG_RESULT([$ACCOUNTS_PROVIDER_FILES_DIR])
AC_SUBST(ACCOUNTS_PROVIDER_FILES_DIR)
# service files dir
AC_MSG_CHECKING([Accounts service files dir])
ACCOUNTS_SERVICE_FILES_DIR=`pkg-config --variable=servicefilesdir libaccounts-glib`
ACCOUNTS_SERVICE_FILES_DIR=`$PKG_CONFIG --variable=servicefilesdir libaccounts-glib`
AC_MSG_RESULT([$ACCOUNTS_SERVICE_FILES_DIR])
AC_SUBST(ACCOUNTS_SERVICE_FILES_DIR)
# application files dir
AC_MSG_CHECKING([Accounts applications files dir])
ACCOUNTS_APPLICATION_FILES_DIR=`pkg-config --variable=applicationfilesdir libaccounts-glib`
ACCOUNTS_APPLICATION_FILES_DIR=`$PKG_CONFIG --variable=applicationfilesdir libaccounts-glib`
AC_MSG_RESULT([$ACCOUNTS_APPLICATION_FILES_DIR])
AC_SUBST(ACCOUNTS_APPLICATION_FILES_DIR)
......@@ -600,7 +558,7 @@ AM_CONDITIONAL(HAVE_UOA, test "x$have_uoa" = "xyes")
if test "x$have_uoa" = "xyes" -o "x$have_goa" = "xyes"; then
AC_MSG_CHECKING([Mission Control plugins dir])
MISSION_CONTROL_PLUGINS_DIR=${libdir}/mission-control-plugins.`pkg-config --variable=MCP_ABI_VERSION mission-control-plugins`
MISSION_CONTROL_PLUGINS_DIR=`$PKG_CONFIG --define-variable=libdir='${libdir}' --variable=plugindir mission-control-plugins`
AC_MSG_RESULT([$MISSION_CONTROL_PLUGINS_DIR])
AC_SUBST(MISSION_CONTROL_PLUGINS_DIR)
......@@ -625,7 +583,7 @@ AC_SUBST([ENABLE_CODING_STYLE_CHECKS])
AC_CONFIG_FILES([
Makefile
data/Makefile
data/empathy.desktop.in
data/org.gnome.Empathy.desktop.in
data/icons/Makefile
data/themes/Makefile
extensions/Makefile
......@@ -633,7 +591,6 @@ AC_CONFIG_FILES([
libempathy/Makefile
libempathy-gtk/Makefile
src/Makefile
nautilus-sendto-plugin/Makefile
goa-mc-plugin/Makefile
ubuntu-online-accounts/Makefile
ubuntu-online-accounts/mc-plugin/Makefile
......@@ -659,7 +616,6 @@ Configure summary:
Linker Flags................: ${LDFLAGS}
Prefix......................: ${prefix}
Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS}
Use GStreamer 1.0...........: ${have_gst1}
Features:
Spell checking (enchant)....: ${have_enchant}
......@@ -670,7 +626,6 @@ Configure summary:
Camera monitoring...........: ${have_gudev}
Extras:
Nautilus-sendto plugin......: ${have_nst}
GOA MC plugin...............: ${have_goa}
Ubuntu Online plugins.......: ${have_uoa}
"
empathy.appdata.xml
empathy.desktop
empathy.desktop.in
org.gnome.Empathy.gschema.valid
......
......@@ -2,7 +2,7 @@ SUBDIRS = icons themes
desktopdir = $(datadir)/applications
desktop_in_files = \
empathy.desktop.in \
org.gnome.Empathy.desktop.in \
$(NULL)
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
......@@ -60,7 +60,13 @@ css_DATA = \
empathy.css \
$(NULL)
appdatadir = $(datadir)/metainfo
appdata_in_files = org.gnome.Empathy.appdata.xml.in
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
@INTLTOOL_XML_RULE@
EXTRA_DIST = \
$(appdata_in_files) \
$(convert_DATA) \
$(desktop_in_files) \
$(desktop_DATA) \
......@@ -69,8 +75,11 @@ EXTRA_DIST = \
$(clientfile_DATA) \
$(servicefile_in_files) \
$(gsettings_SCHEMAS) \
$(css_DATA) \
$(css_DATA) \
$(NULL)
CLEANFILES = \
$(appdata_DATA)
DISTCLEANFILES = \
$(desktop_DATA) \
......
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
......@@ -27,6 +26,7 @@
this.isCoalescing = false;
this.isConsecutive = undefined;
this.shouldScroll = undefined;
this.interdiv = undefined;
var appendElement = function (elem) {
document.getElementById("Chat").appendChild(elem);
......@@ -102,6 +102,22 @@
}
}
// This method is called, if the size of the chat window
// changes or after new messages have been appended.
// Adjusts the size of the interleaving page (if existing)
this.onchange = function() {
if (self.interdiv !== undefined){
var old_padding = parseInt(self.interdiv.style.paddingTop, 10);
var diff = document.height -
(self.interdiv.offsetTop + old_padding);
new_padding = window.innerHeight - diff;
if (new_padding <= 0)
removePage();
else
self.interdiv.style.paddingTop = new_padding + "px";
}
}
// coalased analogs to the global functions
......@@ -119,6 +135,7 @@
node = null;
setShouldScroll(shouldScroll);
self.onchange();
self.coalesce();
}
......@@ -134,6 +151,7 @@
}
node = null;
setShouldScroll(shouldScroll);
self.onchange();
self.coalesce();
}
......@@ -306,6 +324,7 @@
window.onresize = function windowDidResize(){
alignChat(true/*nearBottom()*/); //nearBottom buggy with inactive tabs
window.onresize = coalescedHTML.onchange;
}
function initStyle() {
......@@ -313,6 +332,41 @@
if(!coalescedHTML)
coalescedHTML = new CoalescedHTML();
}
/* Implementation of the CTRL-L command to clear the chat
* window. (Similar to a linux terminal)
*/
function clearPage(){
removePage();
if (checkForAndRemoveInsertNodes()){
var interdiv = document.createElement('div');
interdiv.id = 'interleaving_page';
interdiv.style.paddingTop = window.innerHeight + 'px';
chat.appendChild(interdiv);
coalescedHTML.interdiv = interdiv;
}
}
function checkForAndRemoveInsertNodes() {
var inserts = chat.querySelectorAll("#insert");
if (inserts.length <= 0){
return false;
}
for (var n = 0; n < inserts.length-1; n++) {
var rm = inserts[n];
rm.parentNode.removeChild(rm);
}
return true;
}
function removePage(){
var interdivs = chat.querySelectorAll("#interleaving_page");
if (interdivs.length > 0){
var rm = interdivs[0];
rm.parentNode.removeChild(rm);
}
coalescedHTML.interdiv = undefined;
}
</script>
<style type="text/css">
......
......@@ -54,8 +54,5 @@ close-main-window = /apps/empathy/hints/close_main_window
[org.gnome.Empathy.location]
publish = /apps/empathy/location/publish
resource-network = /apps/empathy/location/resource_network
resource-cell = /apps/empathy/location/resource_cell
resource-gps = /apps/empathy/location/resource_gps
reduce-accuracy = /apps/empathy/location/reduce_accuracy
/*
FIXME: Update for GTK+ 3.20
.empathy-tab-close-button {
-GtkButton-default-border : 0;
-GtkButton-default-outside-border : 0;
......@@ -14,3 +17,9 @@
-GtkButtonBox-child-internal-pad-x: 0;
-GtkButtonBox-child-internal-pad-y: 0;
}
*/
.empathy-smiley-menu-item
{
padding: 8px 12px;
}
......@@ -5,12 +5,13 @@ public_icons_themes = \
$(NULL)
public_icons = \
hicolor_apps_16x16_empathy.png \
hicolor_apps_22x22_empathy.png \
hicolor_apps_24x24_empathy.png \
hicolor_apps_32x32_empathy.png \
hicolor_apps_48x48_empathy.png \
hicolor_apps_256x256_empathy.png \
hicolor_apps_16x16_org.gnome.Empathy.png \
hicolor_apps_22x22_org.gnome.Empathy.png \
hicolor_apps_24x24_org.gnome.Empathy.png \
hicolor_apps_32x32_org.gnome.Empathy.png \
hicolor_apps_48x48_org.gnome.Empathy.png \
hicolor_apps_256x256_org.gnome.Empathy.png \
hicolor_apps_scalable_org.gnome.Empathy-symbolic.svg \
$(NULL)
private_icons_themes = \
......@@ -24,129 +25,6 @@ private_icons = \
hicolor_status_16x16_im-message.png \
hicolor_status_22x22_im-message.png \
hicolor_status_16x16_user-typing.png \
hicolor_apps_16x16_im-aim.png \
hicolor_apps_16x16_im-ekiga.png \
hicolor_apps_16x16_im-facebook.png \
hicolor_apps_16x16_im-gizmo.png \
hicolor_apps_16x16_im-google-talk.png \
hicolor_apps_16x16_im-icq.png \
hicolor_apps_16x16_im-irc.png \
hicolor_apps_16x16_im-jabber.png \
hicolor_apps_16x16_im-msn.png \
hicolor_apps_16x16_im-silc.png \
hicolor_apps_16x16_im-sip.png \
hicolor_apps_16x16_im-local-xmpp.png \
hicolor_apps_16x16_im-gadugadu.png \
hicolor_apps_16x16_im-groupwise.png \
hicolor_apps_16x16_im-qq.png \
hicolor_apps_16x16_im-meanwhile.png \
hicolor_apps_16x16_im-mxit.png \
hicolor_apps_16x16_im-myspace.png \
hicolor_apps_16x16_im-sametime.png \
hicolor_apps_16x16_im-yahoo.png \
hicolor_apps_16x16_im-zephyr.png \
hicolor_apps_22x22_im-aim.png \
hicolor_apps_22x22_im-ekiga.png \
hicolor_apps_22x22_im-facebook.png \
hicolor_apps_22x22_im-gizmo.png \
hicolor_apps_22x22_im-google-talk.png \
hicolor_apps_22x22_im-icq.png \
hicolor_apps_22x22_im-irc.png \
hicolor_apps_22x22_im-jabber.png \
hicolor_apps_22x22_im-msn.png \
hicolor_apps_22x22_im-silc.png \
hicolor_apps_22x22_im-sip.png \
hicolor_apps_22x22_im-local-xmpp.png \
hicolor_apps_22x22_im-gadugadu.png \
hicolor_apps_22x22_im-groupwise.png \
hicolor_apps_22x22_im-qq.png \
hicolor_apps_22x22_im-meanwhile.png \
hicolor_apps_22x22_im-mxit.png \
hicolor_apps_22x22_im-myspace.png \
hicolor_apps_22x22_im-sametime.png \
hicolor_apps_22x22_im-yahoo.png \
hicolor_apps_22x22_im-zephyr.png \
hicolor_apps_24x24_im-aim.png \
hicolor_apps_24x24_im-ekiga.png \
hicolor_apps_24x24_im-gizmo.png \
hicolor_apps_24x24_im-google-talk.png \
hicolor_apps_24x24_im-icq.png \
hicolor_apps_24x24_im-irc.png \
hicolor_apps_24x24_im-jabber.png \
hicolor_apps_24x24_im-msn.png \
hicolor_apps_24x24_im-silc.png \
hicolor_apps_24x24_im-sip.png \
hicolor_apps_24x24_im-local-xmpp.png \
hicolor_apps_24x24_im-gadugadu.png \
hicolor_apps_24x24_im-groupwise.png \
hicolor_apps_24x24_im-qq.png \
hicolor_apps_24x24_im-meanwhile.png \
hicolor_apps_24x24_im-mxit.png \
hicolor_apps_24x24_im-myspace.png \
hicolor_apps_24x24_im-sametime.png \
hicolor_apps_24x24_im-yahoo.png \
hicolor_apps_24x24_im-zephyr.png \
hicolor_apps_32x32_im-aim.png \
hicolor_apps_32x32_im-ekiga.png \
hicolor_apps_32x32_im-gizmo.png \
hicolor_apps_32x32_im-google-talk.png \
hicolor_apps_32x32_im-icq.png \
hicolor_apps_32x32_im-irc.png \
hicolor_apps_32x32_im-jabber.png \
hicolor_apps_32x32_im-msn.png \
hicolor_apps_32x32_im-silc.png \
hicolor_apps_32x32_im-sip.png \
hicolor_apps_32x32_im-local-xmpp.png \
hicolor_apps_32x32_im-gadugadu.png \
hicolor_apps_32x32_im-groupwise.png \
hicolor_apps_32x32_im-qq.png \
hicolor_apps_32x32_im-meanwhile.png \
hicolor_apps_32x32_im-mxit.png \
hicolor_apps_32x32_im-myspace.png \
hicolor_apps_32x32_im-sametime.png \
hicolor_apps_32x32_im-yahoo.png \
hicolor_apps_32x32_im-zephyr.png \
hicolor_apps_48x48_im-aim.png \
hicolor_apps_48x48_im-ekiga.png \
hicolor_apps_48x48_im-facebook.png \
hicolor_apps_48x48_im-gizmo.png \
hicolor_apps_48x48_im-google-talk.png \
hicolor_apps_48x48_im-icq.png \
hicolor_apps_48x48_im-irc.png \
hicolor_apps_48x48_im-jabber.png \
hicolor_apps_48x48_im-msn.png \
hicolor_apps_48x48_im-silc.png \
hicolor_apps_48x48_im-sip.png \
hicolor_apps_48x48_im-local-xmpp.png \
hicolor_apps_48x48_im-gadugadu.png \
hicolor_apps_48x48_im-groupwise.png \
hicolor_apps_48x48_im-qq.png \
hicolor_apps_48x48_im-meanwhile.png \
hicolor_apps_48x48_im-mxit.png \
hicolor_apps_48x48_im-myspace.png \
hicolor_apps_48x48_im-sametime.png \
hicolor_apps_48x48_im-yahoo.png \
hicolor_apps_48x48_im-zephyr.png \
hicolor_apps_scalable_im-aim.svg \
hicolor_apps_scalable_im-ekiga.svg \
hicolor_apps_scalable_im-gizmo.svg \
hicolor_apps_scalable_im-google-talk.svg \
hicolor_apps_scalable_im-icq.svg \
hicolor_apps_scalable_im-irc.svg \
hicolor_apps_scalable_im-jabber.svg \
hicolor_apps_scalable_im-msn.svg \
hicolor_apps_scalable_im-silc.svg \
hicolor_apps_scalable_im-sip.svg \
hicolor_apps_scalable_im-local-xmpp.svg \
hicolor_apps_scalable_im-gadugadu.svg \
hicolor_apps_scalable_im-groupwise.svg \
hicolor_apps_scalable_im-qq.svg \
hicolor_apps_scalable_im-meanwhile.svg \
hicolor_apps_scalable_im-mxit.svg \
hicolor_apps_scalable_im-myspace.svg \
hicolor_apps_scalable_im-sametime.svg \
hicolor_apps_scalable_im-yahoo.svg \
hicolor_apps_scalable_im-zephyr.svg \
hicolor_status_16x16_user-available.png \
hicolor_status_16x16_user-away.png \
hicolor_status_16x16_user-busy.png \
......@@ -188,8 +66,7 @@ private_icons = \
EXTRA_DIST = \
$(public_icons) \
$(private_icons) \
empathy.svg \
local-xmpp.svg \
org.gnome.Empathy.svg \
$(NULL)
include $(srcdir)/utils.mk
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.