Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim] Deleted branch mainwindow
by Philipp Hörist (＠lovetox) 05 Dec '21

05 Dec '21

Philipp Hörist deleted branch mainwindow at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] BaseControl: Disconnect contact signals on shutdown
by Philipp Hörist (＠lovetox) 05 Dec '21

05 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0da42301 by lovetox at 2021-12-05T21:34:51+01:00 BaseControl: Disconnect contact signals on shutdown Fixes #10697 - - - - - 1 changed file: - gajim/gtk/controls/base.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -690,6 +690,7 @@ def shutdown(self) -> None: 'chat_control_base_update_toolbar', self) self._client.disconnect_all_from_obj(self) + self.contact.disconnect_all_from_obj(self) for i in list(self.handlers.keys()): if self.handlers[i].handler_is_connected(i): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0da42301b371f186871ed14e1b02c050… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0da42301b371f186871ed14e1b02c050… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Flatpak: Update dependency dbus-glib
by André (＠andre) 05 Dec '21

05 Dec '21

André pushed to branch master at gajim / gajim Commits: dd54d955 by André Apitzsch at 2021-12-05T13:34:28+01:00 Flatpak: Update dependency dbus-glib - - - - - 4 changed files: - flatpak/modules/dbus-glib/dbus-glib-0.110.json → flatpak/modules/dbus-glib/dbus-glib.json - flatpak/modules/intltool/intltool-0.51.json - + flatpak/modules/intltool/intltool-perl5.26-regex-fixes.patch - flatpak/modules/libappindicator/libappindicator-gtk3-introspection-12.10.json Changes: ===================================== flatpak/modules/dbus-glib/dbus-glib-0.110.json → flatpak/modules/dbus-glib/dbus-glib.json ===================================== @@ -16,8 +16,8 @@ "sources": [ { "type": "archive", - "url": "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz", - "sha256": "7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825" + "url": "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.112.tar.gz", + "sha256": "7d550dccdfcd286e33895501829ed971eeb65c614e73aadb4a08aeef719b143a" } ] } ===================================== flatpak/modules/intltool/intltool-0.51.json ===================================== @@ -6,6 +6,10 @@ "type": "archive", "url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz", "sha256": "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd" + }, + { + "type": "patch", + "path": "intltool-perl5.26-regex-fixes.patch" } ] } ===================================== flatpak/modules/intltool/intltool-perl5.26-regex-fixes.patch ===================================== @@ -0,0 +1,59 @@ +Description: Escape "{", to prevent complaints from perl 5.22 and 5.26 +Author: Roderich Schupp <roderich.schupp(a)gmail.com> +Author: gregor herrmann <gregoa(a)debian.org> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788705 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826471 +Bug-Upstream: https://bugs.launchpad.net/intltool/+bug/1490906 + +Index: intltool-0.51.0/intltool-update.in +=================================================================== +--- intltool-0.51.0.orig/intltool-update.in 2017-07-23 17:24:35.113169465 +0200 ++++ intltool-0.51.0/intltool-update.in 2017-07-23 17:24:35.109169052 +0200 +@@ -1062,13 +1062,13 @@ + } + } + +- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) ++ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/) + { + my $rest = $3; + my $untouched = $1; + my $sub = ""; + # Ignore recursive definitions of variables +- $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/; ++ $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2}?/; + + return SubstituteVariable ("$untouched$sub$rest"); + } +@@ -1190,10 +1190,10 @@ + $name =~ s/$+$//g; + $version =~ s/\(+$//g; + +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); + } + + if ($conf_source =~ /^AC_INIT\(([^,$]+),([^,\)]+)[,]?([^,\)]+)?/m) +@@ -1219,11 +1219,11 @@ + $version =~ s/\(+$//g; + $bugurl =~ s/\(+$//g if (defined $bugurl); + +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); +- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); ++ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/); + } + + # \s makes this not work, why? ===================================== flatpak/modules/libappindicator/libappindicator-gtk3-introspection-12.10.json ===================================== @@ -1,7 +1,8 @@ { "name": "libappindicator", "build-options": { - "cflags": "-Wno-error" + "cflags": "-Wno-error", + "make-args": [ "-j1" ] }, "rm-configure": true, "config-opts": [ @@ -49,7 +50,7 @@ ], "modules": [ "../intltool/intltool-0.51.json", - "../dbus-glib/dbus-glib-0.110.json", + "../dbus-glib/dbus-glib.json", { "name": "libdbusmenu", "build-options": { View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dd54d955188969fe1324a55367369580… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dd54d955188969fe1324a55367369580… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Flatpak: Update dependencies
by André (＠andre) 04 Dec '21

04 Dec '21

André pushed to branch master at gajim / gajim Commits: fdc4c7a2 by André Apitzsch at 2021-12-05T00:05:43+01:00 Flatpak: Update dependencies - - - - - 8 changed files: - + flatpak/modules/dbus-glib/dbus-glib-0.110.json - + flatpak/modules/intltool/intltool-0.51.json - + flatpak/modules/libappindicator/libappindicator-fix-crash-from-incorrect-signal-emission.patch - + flatpak/modules/libappindicator/libappindicator-fix-crash-iterating-icon-themes.patch - + flatpak/modules/libappindicator/libappindicator-ftbfs.patch - + flatpak/modules/libappindicator/libappindicator-gtk3-introspection-12.10.json - + flatpak/modules/libappindicator/libappindicator-no-python.patch - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/modules/dbus-glib/dbus-glib-0.110.json ===================================== @@ -0,0 +1,23 @@ +{ + "name": "dbus-glib", + "cleanup": [ + "*.la", + "/bin", + "/etc", + "/include", + "/libexec", + "/share/gtk-doc", + "/share/man" + ], + "config-opts": [ + "--disable-static", + "--disable-gtk-doc" + ], + "sources": [ + { + "type": "archive", + "url": "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz", + "sha256": "7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825" + } + ] +} ===================================== flatpak/modules/intltool/intltool-0.51.json ===================================== @@ -0,0 +1,11 @@ +{ + "name": "intltool", + "cleanup": [ "*" ], + "sources": [ + { + "type": "archive", + "url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz", + "sha256": "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd" + } + ] +} ===================================== flatpak/modules/libappindicator/libappindicator-fix-crash-from-incorrect-signal-emission.patch ===================================== @@ -0,0 +1,74 @@ +--- libappindicator-12.10.0/src/app-indicator.c 2012-07-11 13:28:34.415113869 -0400 ++++ wrk/src/app-indicator.c 2020-03-19 12:14:47.813191652 -0400 +@@ -443,7 +443,7 @@ + G_STRUCT_OFFSET (AppIndicatorClass, new_icon), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, +- G_TYPE_NONE, 0, G_TYPE_NONE); ++ G_TYPE_NONE, 0); + + /** + * AppIndicator::new-attention-icon: +@@ -457,7 +457,7 @@ + G_STRUCT_OFFSET (AppIndicatorClass, new_attention_icon), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, +- G_TYPE_NONE, 0, G_TYPE_NONE); ++ G_TYPE_NONE, 0); + + /** + * AppIndicator::new-status: +@@ -505,7 +505,7 @@ + G_STRUCT_OFFSET (AppIndicatorClass, connection_changed), + NULL, NULL, + g_cclosure_marshal_VOID__BOOLEAN, +- G_TYPE_NONE, 1, G_TYPE_BOOLEAN, G_TYPE_NONE); ++ G_TYPE_NONE, 1, G_TYPE_BOOLEAN); + + /** + * AppIndicator::new-icon-theme-path: +@@ -1175,7 +1175,7 @@ + gchar * guide = priv->label_guide != NULL ? priv->label_guide : ""; + + g_signal_emit(G_OBJECT(self), signals[NEW_LABEL], 0, +- label, guide, TRUE); ++ label, guide); + if (priv->dbus_registration != 0 && priv->connection != NULL) { + GError * error = NULL; + +@@ -1490,7 +1490,7 @@ + static void + theme_changed_cb (GtkIconTheme * theme, gpointer user_data) + { +- g_signal_emit (user_data, signals[NEW_ICON], 0, TRUE); ++ g_signal_emit (user_data, signals[NEW_ICON], 0); + + AppIndicator * self = (AppIndicator *)user_data; + AppIndicatorPrivate *priv = self->priv; +@@ -1904,7 +1904,7 @@ + } + + if (changed) { +- g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0, TRUE); ++ g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0); + + if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) { + GError * error = NULL; +@@ -1982,7 +1982,7 @@ + } + + if (changed) { +- g_signal_emit (self, signals[NEW_ICON], 0, TRUE); ++ g_signal_emit (self, signals[NEW_ICON], 0); + + if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) { + GError * error = NULL; +@@ -2048,7 +2048,7 @@ + + self->priv->icon_theme_path = g_strdup(icon_theme_path); + +- g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path, TRUE); ++ g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path); + + if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) { + GError * error = NULL; ===================================== flatpak/modules/libappindicator/libappindicator-fix-crash-iterating-icon-themes.patch ===================================== @@ -0,0 +1,11 @@ +--- libappindicator-12.10.0/src/app-indicator.c ++++ libappindicator-12.10.0/src/app-indicator.c +@@ -1606,7 +1606,7 @@ status_icon_changes (AppIndicator * self, gpointer data) + gint n_elements, i; + gboolean found=FALSE; + gtk_icon_theme_get_search_path(icon_theme, &path, &n_elements); +- for (i=0; i< n_elements || path[i] == NULL; i++) { ++ for (i=0; i< n_elements; i++) { + if(g_strcmp0(path[i], self->priv->icon_theme_path) == 0) { + found=TRUE; + break; ===================================== flatpak/modules/libappindicator/libappindicator-ftbfs.patch ===================================== @@ -0,0 +1,20 @@ +From: Olivier Tilloy <olivier.tilloy(a)canonical.com> +Date: Tue 2018-03-20 12:47:56 +0000 +Subject: [PATCH] libappindicator FTBFS on bionic + +Fix build failures on bionic, +and update Vcs-* fields in debian/control. (LP: #1757121) + +Approved by: Marco Trevisan (Treviño) +--- +--- libappindicator-12.10.0/src/app-indicator.c 2017-02-15 14:10:41 +0000 ++++ libappindicator-12.10.0/src/app-indicator.c 2018-03-20 12:38:59 +0000 +@@ -2196,7 +2196,7 @@ app_indicator_set_secondary_activate_tar + + g_return_if_fail (GTK_IS_WIDGET (menuitem)); + +- priv->sec_activate_target = g_object_ref(G_OBJECT(menuitem)); ++ priv->sec_activate_target = g_object_ref(menuitem); + priv->sec_activate_enabled = widget_is_menu_child(self, menuitem); + g_signal_connect(menuitem, "parent-set", G_CALLBACK(sec_activate_target_parent_changed), self); + } ===================================== flatpak/modules/libappindicator/libappindicator-gtk3-introspection-12.10.json ===================================== @@ -0,0 +1,129 @@ +{ + "name": "libappindicator", + "build-options": { + "cflags": "-Wno-error" + }, + "rm-configure": true, + "config-opts": [ + "--disable-static", + "--disable-gtk-doc", + "--disable-tests", + "--disable-mono-tests", + "--enable-introspection=yes", + "--with-gtk=3" + ], + "cleanup": [ + "/include", + "/lib/pkgconfig", + "/lib/*.la", + "/share/gtk-doc", + "/share/gir-1.0" + ], + "sources": [ + { + "type": "archive", + "url": "https://launchpad.net/libappindicator/12.10/12.10.0/+download/libappindicat…", + "sha256": "d5907c1f98084acf28fd19593cb70672caa0ca1cf82d747ba6f4830d4cc3b49f" + }, + { + "type": "patch", + "path": "libappindicator-ftbfs.patch" + }, + { + "type": "patch", + "path": "libappindicator-no-python.patch" + }, + { + "type": "patch", + "path": "libappindicator-fix-crash-from-incorrect-signal-emission.patch" + }, + { + "type": "patch", + "path": "libappindicator-fix-crash-iterating-icon-themes.patch" + }, + { + "type": "script", + "commands": ["autoreconf -sfi"], + "dest-filename": "autogen.sh" + } + ], + "modules": [ + "../intltool/intltool-0.51.json", + "../dbus-glib/dbus-glib-0.110.json", + { + "name": "libdbusmenu", + "build-options": { + "cflags": "-Wno-error", + "env": { + "HAVE_VALGRIND_FALSE": "#", + "HAVE_VALGRIND_TRUE": "" + } + }, + "cleanup": [ + "/include", + "/libexec", + "/lib/pkgconfig", + "/lib/*.la", + "/share/doc", + "/share/libdbusmenu", + "/share/gtk-doc", + "/share/gir-1.0" + ], + "config-opts": [ + "--disable-static", + "--disable-gtk-doc", + "--enable-introspection=yes", + "--disable-vala", + "--disable-dumper", + "--disable-tests", + "--with-gtk=3" + ], + "sources": [ + { + "type": "archive", + "url": "https://launchpad.net/libdbusmenu/16.04/16.04.0/+download/libdbusmenu-16.04…", + "sha256": "b9cc4a2acd74509435892823607d966d424bd9ad5d0b00938f27240a1bfa878a" + } + ] + }, + { + "name": "libindicator", + "build-options": { + "cflags": "-Wno-error" + }, + "cleanup": [ + "/include", + "/libexec", + "/lib/pkgconfig", + "/lib/*.la", + "/share/libindicator", + "/share/gtk-doc", + "/share/gir-1.0" + ], + "config-opts": [ + "--disable-static", + "--disable-tests", + "--with-gtk=3" + ], + "sources": [ + { + "type": "archive", + "url": "https://launchpad.net/libindicator/12.10/12.10.1/+download/libindicator-12.…", + "sha256": "b2d2e44c10313d5c9cd60db455d520f80b36dc39562df079a3f29495e8f9447f" + }, + { + "type": "shell", + "commands": [ + "# FTBFS fix", + "sed -e '/LIBINDICATOR_LIBS/ s/\\$LIBM/ $LIBM/' -i configure.ac" + ] + }, + { + "type": "script", + "commands": ["autoreconf -sfi"], + "dest-filename": "autogen.sh" + } + ] + } + ] +} ===================================== flatpak/modules/libappindicator/libappindicator-no-python.patch ===================================== @@ -0,0 +1,888 @@ +diff --git a/bindings/Makefile.am b/bindings/Makefile.am +index d1f6d73..dccca6c 100644 +--- a/bindings/Makefile.am ++++ b/bindings/Makefile.am +@@ -3,7 +3,6 @@ SUBDIRS = \ + vala + else + SUBDIRS = \ +- python \ + vala + endif + +diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am +deleted file mode 100644 +index fe95c02..0000000 +--- a/bindings/python/Makefile.am ++++ /dev/null +@@ -1,39 +0,0 @@ +-defsdir = $(datadir)/pygtk/2.0/defs +-defs_DATA = appindicator.defs +- +-#CFLAGS = -Wall -Werror +-INCLUDES = \ +- -I$(top_srcdir)/src \ +- -DG_LOG_DOMAIN=\"appindicator-python\" \ +- -DDATADIR=\"$(datadir)\" \ +- -DLIBDIR=\"$(libdir)\" \ +- $(APPINDICATOR_PYTHON_CFLAGS) \ +- $(PYTHON_INCLUDES) +- +-pkgpythondir = $(pyexecdir) +-pkgpyexecdir = $(pyexecdir) +- +-pkgappindicatordir = $(pkgpythondir)/appindicator +-pkgappindicator_PYTHON = __init__.py +- +-appindicatordir = $(pkgpyexecdir)/appindicator +-appindicator_LTLIBRARIES = _appindicator.la +- +-_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator +-_appindicator_la_LIBADD = $(APPINDICATOR_PYTHON_LIBS) -L$(top_builddir)/src/.libs -lappindicator +-_appindicator_la_SOURCES = appindicatormodule.c +-nodist__appindicator_la_SOURCES = appindicator.c +- +-CLEANFILES = appindicator.c +-EXTRA_DIST = appindicator.override.in appindicator-arg-types.py $(defs_DATA) +-appindicator.c: $(defs_DATA) appindicator.override +- +-%.c: %.defs +- ($(PYGTK_CODEGEN) \ +- --register $(PYGTK_DEFSDIR)/gtk-types.defs \ +- --register $(PYGTK_DEFSDIR)/gdk-types.defs \ +- --load-types $(srcdir)/appindicator-arg-types.py \ +- --override $*.override \ +- --prefix py$* $(srcdir)/$*.defs) > gen-$*.c \ +- && cp gen-$*.c $*.c \ +- && rm -f gen-$*.c +diff --git a/bindings/python/__init__.py b/bindings/python/__init__.py +deleted file mode 100644 +index 20e2140..0000000 +--- a/bindings/python/__init__.py ++++ /dev/null +@@ -1,27 +0,0 @@ +-# Python bindings for libappindicator. +-# +-# Copyright 2009 Canonical Ltd. +-# +-# Authors: +-# Eitan Isaacson <eitan(a)ascender.com> +-# Neil Jagdish Patel <neil.patel(a)canonical.com> +-# +-# This program is free software: you can redistribute it and/or modify it +-# under the terms of either or both of the following licenses: +-# +-# 1) the GNU Lesser General Public License version 3, as published by the +-# Free Software Foundation; and/or +-# 2) the GNU Lesser General Public License version 2.1, as published by +-# the Free Software Foundation. +-# +-# This program is distributed in the hope that it will be useful, but +-# WITHOUT ANY WARRANTY; without even the implied warranties of +-# MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR +-# PURPOSE. See the applicable version of the GNU Lesser General Public +-# License for more details. +-# +-# You should have received a copy of both the GNU Lesser General Public +-# License version 3 and version 2.1 along with this program. If not, see +-# <http://www.gnu.org/licenses/> +- +-from _appindicator import * +diff --git a/bindings/python/appindicator-arg-types.py b/bindings/python/appindicator-arg-types.py +deleted file mode 100644 +index 9d74aa0..0000000 +--- a/bindings/python/appindicator-arg-types.py ++++ /dev/null +@@ -1,27 +0,0 @@ +-# Python bindings for libappindicator. +-# +-# Copyright 2009 Canonical Ltd. +-# +-# Authors: +-# Eitan Isaacson <eitan(a)ascender.com> +-# +-# This program is free software: you can redistribute it and/or modify it +-# under the terms of either or both of the following licenses: +-# +-# 1) the GNU Lesser General Public License version 3, as published by the +-# Free Software Foundation; and/or +-# 2) the GNU Lesser General Public License version 2.1, as published by +-# the Free Software Foundation. +-# +-# This program is distributed in the hope that it will be useful, but +-# WITHOUT ANY WARRANTY; without even the implied warranties of +-# MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR +-# PURPOSE. See the applicable version of the GNU Lesser General Public +-# License for more details. +-# +-# You should have received a copy of both the GNU Lesser General Public +-# License version 3 and version 2.1 along with this program. If not, see +-# <http://www.gnu.org/licenses/> +- +-import argtypes +- +diff --git a/bindings/python/appindicator.defs b/bindings/python/appindicator.defs +deleted file mode 100644 +index 4fcc2d5..0000000 +--- a/bindings/python/appindicator.defs ++++ /dev/null +@@ -1,200 +0,0 @@ +-;; -*- scheme -*- +-; object definitions ... +-(define-object Indicator +- (in-module "App") +- (parent "GObject") +- (c-name "AppIndicator") +- (gtype-id "APP_TYPE_INDICATOR") +-) +- +-;; Enumerations and flags ... +- +-(define-enum IndicatorCategory +- (in-module "App") +- (c-name "AppIndicatorCategory") +- (gtype-id "APP_INDICATOR_TYPE_INDICATOR_CATEGORY") +- (values +- '("ApplicationStatus" "APP_INDICATOR_CATEGORY_APPLICATION_STATUS") +- '("Communications" "APP_INDICATOR_CATEGORY_COMMUNICATIONS") +- '("SystemServices" "APP_INDICATOR_CATEGORY_SYSTEM_SERVICES") +- '("Hardware" "APP_INDICATOR_CATEGORY_HARDWARE") +- '("Other" "APP_INDICATOR_CATEGORY_OTHER") +- ) +-) +- +-(define-enum IndicatorStatus +- (in-module "App") +- (c-name "AppIndicatorStatus") +- (gtype-id "APP_INDICATOR_TYPE_INDICATOR_STATUS") +- (values +- '("Passive" "APP_INDICATOR_STATUS_PASSIVE") +- '("Active" "APP_INDICATOR_STATUS_ACTIVE") +- '("NeedsAttention" "APP_INDICATOR_STATUS_ATTENTION") +- ) +-) +- +-;; From app-indicator.h +- +-(define-function app_indicator_get_type +- (c-name "app_indicator_get_type") +- (return-type "GType") +-) +- +-(define-function app_indicator_new_with_path +- (c-name "app_indicator_new_with_path") +- (is-constructor-of "AppIndicator") +- (return-type "AppIndicator*") +- (parameters +- '("const-gchar*" "id") +- '("const-gchar*" "icon_name") +- '("AppIndicatorCategory" "category") +- '("const-gchar*" "icon_theme_path" (null-ok) (default "NULL")) +- ) +-) +- +-(define-method set_status +- (of-object "AppIndicator") +- (c-name "app_indicator_set_status") +- (return-type "none") +- (parameters +- '("AppIndicatorStatus" "status") +- ) +-) +- +-(define-method set_attention_icon +- (of-object "AppIndicator") +- (c-name "app_indicator_set_attention_icon_full") +- (return-type "none") +- (parameters +- '("const-gchar*" "icon_name") +- '("const-gchar*" "icon_desc" (null-ok) (default "NULL")) +- ) +-) +- +-(define-method set_menu +- (of-object "AppIndicator") +- (c-name "app_indicator_set_menu") +- (return-type "none") +- (parameters +- '("GtkMenu*" "menu") +- ) +-) +- +-(define-method set_icon +- (of-object "AppIndicator") +- (c-name "app_indicator_set_icon_full") +- (return-type "none") +- (parameters +- '("const-gchar*" "icon_name") +- '("const-gchar*" "icon_desc" (null-ok) (default "NULL")) +- ) +-) +- +-(define-method set_label +- (of-object "AppIndicator") +- (c-name "app_indicator_set_label") +- (return-type "none") +- (parameters +- '("const-gchar*" "label" (null-ok)) +- '("const-gchar*" "guide" (null-ok) (default "NULL")) +- ) +-) +- +-(define-method set_ordering_index +- (of-object "AppIndicator") +- (c-name "app_indicator_set_ordering_index") +- (parameters +- '("guint32" "ordering_index") +- ) +-) +- +-(define-method set_icon_theme_path +- (of-object "AppIndicator") +- (c-name "app_indicator_set_icon_theme_path") +- (return-type "none") +- (parameters +- '("const-gchar*" "icon_theme_path" (null-ok)) +- ) +-) +- +-(define-method get_id +- (of-object "AppIndicator") +- (c-name "app_indicator_get_id") +- (return-type "const-gchar*") +-) +- +-(define-method get_category +- (of-object "AppIndicator") +- (c-name "app_indicator_get_category") +- (return-type "AppIndicatorCategory") +-) +- +-(define-method get_status +- (of-object "AppIndicator") +- (c-name "app_indicator_get_status") +- (return-type "AppIndicatorStatus") +-) +- +-(define-method get_icon +- (of-object "AppIndicator") +- (c-name "app_indicator_get_icon") +- (return-type "const-gchar*") +-) +- +-(define-method get_icon_desc +- (of-object "AppIndicator") +- (c-name "app_indicator_get_icon_desc") +- (return-type "const-gchar*") +-) +- +-(define-method get_icon_theme_path +- (of-object "AppIndicator") +- (c-name "app_indicator_get_icon_theme_path") +- (return-type "const-gchar*") +-) +- +-(define-method get_attention_icon +- (of-object "AppIndicator") +- (c-name "app_indicator_get_attention_icon") +- (return-type "const-gchar*") +-) +- +-(define-method get_attention_icon_desc +- (of-object "AppIndicator") +- (c-name "app_indicator_get_attention_icon_desc") +- (return-type "const-gchar*") +-) +- +-(define-method get_menu +- (of-object "AppIndicator") +- (c-name "app_indicator_get_menu") +- (return-type "GtkMenu*") +-) +- +-(define-method get_label +- (of-object "AppIndicator") +- (c-name "app_indicator_get_label") +- (return-type "const-gchar*") +-) +- +-(define-method get_label_guide +- (of-object "AppIndicator") +- (c-name "app_indicator_get_label_guide") +- (return-type "const-gchar*") +-) +- +-(define-method get_ordering_index +- (of-object "AppIndicator") +- (c-name "app_indicator_get_ordering_index") +- (return-type "guint32") +-) +- +-(define-method build_menu_from_desktop +- (of-object "AppIndicator") +- (c-name "app_indicator_build_menu_from_desktop") +- (return-type "none") +- (parameters +- '("const-gchar*" "desktop_file") +- '("const-gchar*" "desktop_profile") +- ) +-) +diff --git a/bindings/python/appindicator.override.in b/bindings/python/appindicator.override.in +deleted file mode 100644 +index 84d3159..0000000 +--- a/bindings/python/appindicator.override.in ++++ /dev/null +@@ -1,65 +0,0 @@ +-/* +-Python bindings for libappindicator. +- +-Copyright 2009 Canonical Ltd. +- +-Authors: +- Eitan Isaacson <eitan(a)ascender.com> (original) +- Neil Jagdish Patel <neil.patel(a)canonical.com> +- +-This program is free software: you can redistribute it and/or modify it +-under the terms of either or both of the following licenses: +- +-1) the GNU Lesser General Public License version 3, as published by the +-Free Software Foundation; and/or +-2) the GNU Lesser General Public License version 2.1, as published by +-the Free Software Foundation. +- +-This program is distributed in the hope that it will be useful, but +-WITHOUT ANY WARRANTY; without even the implied warranties of +-MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR +-PURPOSE. See the applicable version of the GNU Lesser General Public +-License for more details. +- +-You should have received a copy of both the GNU Lesser General Public +-License version 3 and version 2.1 along with this program. If not, see +-<http://www.gnu.org/licenses/> +-*/ +-%% +-headers +-#include <Python.h> +-#include "@top_srcdir@/src/app-indicator.h" +-#include "@top_builddir@/src/app-indicator-enum-types.h" +-#include <glib.h> +-#include "pygobject.h" +-#include "pyglib.h" +-#include <pygtk/pygtk.h> +- +-typedef PyObject* (*to_pyobject_func) (gpointer data); +- +-#define APP_TYPE_INDICATOR APP_INDICATOR_TYPE +- +-void +-_appindicator_add_constants(PyObject *module, const gchar *strip_prefix) +-{ +-#ifdef VERSION +- PyModule_AddStringConstant(module, "__version__", VERSION); +-#endif +- pyg_enum_add(module, +- "IndicatorCategory", +- strip_prefix, +- APP_INDICATOR_TYPE_INDICATOR_CATEGORY); +- +- pyg_enum_add(module, +- "IndicatorStatus", +- strip_prefix, +- APP_INDICATOR_TYPE_INDICATOR_STATUS); +- +- if (PyErr_Occurred()) +- PyErr_Print(); +-} +-%% +-modulename appindicator +-%% +-import gobject.GObject as PyGObject_Type +-import gtk.Menu as PyGtkMenu_Type +diff --git a/bindings/python/appindicatormodule.c b/bindings/python/appindicatormodule.c +deleted file mode 100644 +index b66639c..0000000 +--- a/bindings/python/appindicatormodule.c ++++ /dev/null +@@ -1,49 +0,0 @@ +-/* +-Python bindings for libappindicator. +- +-Copyright 2009 Canonical Ltd. +- +-Authors: +- Eitan Isaacson <eitan(a)ascender.com> +- Neil Jagdish Patel <neil.patel(a)canonical.com> +- +-This program is free software: you can redistribute it and/or modify it +-under the terms of either or both of the following licenses: +- +-1) the GNU Lesser General Public License version 3, as published by the +-Free Software Foundation; and/or +-2) the GNU Lesser General Public License version 2.1, as published by +-the Free Software Foundation. +- +-This program is distributed in the hope that it will be useful, but +-WITHOUT ANY WARRANTY; without even the implied warranties of +-MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR +-PURPOSE. See the applicable version of the GNU Lesser General Public +-License for more details. +- +-You should have received a copy of both the GNU Lesser General Public +-License version 3 and version 2.1 along with this program. If not, see +-<http://www.gnu.org/licenses/> +-*/ +-#include <pygobject.h> +- +-void pyappindicator_register_classes (PyObject *d); +-extern PyMethodDef pyappindicator_functions[]; +- +-DL_EXPORT(void) +-init_appindicator(void) +-{ +- PyObject *m, *d; +- +- init_pygobject (); +- +- m = Py_InitModule ("_appindicator", pyappindicator_functions); +- d = PyModule_GetDict (m); +- +- pyappindicator_register_classes (d); +- +- _appindicator_add_constants (m, "APP_INDICATOR_"); +- if (PyErr_Occurred ()) { +- Py_FatalError ("can't initialise module appindicator"); +- } +-} +diff --git a/configure b/configure +index 5174b3f..8ff732c 100755 +--- a/configure ++++ b/configure +@@ -13703,363 +13703,6 @@ else + fi + + +-########################### +-# Python +-########################### +- +-PYGTK_REQUIRED=2.14.0 +-PYGOBJECT_REQUIRED=0.22 +- +- +- +- +- +- if test -n "$PYTHON"; then +- # If the user set $PYTHON, use it and don't search something else. +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.3.5" >&5 +-$as_echo_n "checking whether $PYTHON version >= 2.3.5... " >&6; } +- prog="import sys, string +-# split strings by '.' and convert to numeric. Append some zeros +-# because we need at least 4 digits for the hex conversion. +-minver = map(int, string.split('2.3.5', '.')) + [0, 0, 0] +-minverhex = 0 +-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i] +-sys.exit(sys.hexversion < minverhex)" +- if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5 +- ($PYTHON -c "$prog") >&5 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +-else +- as_fn_error $? "too old" "$LINENO" 5 +-fi +- am_display_PYTHON=$PYTHON +- else +- # Otherwise, try each interpreter until we find one that satisfies +- # VERSION. +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.3.5" >&5 +-$as_echo_n "checking for a Python interpreter with version >= 2.3.5... " >&6; } +-if ${am_cv_pathless_PYTHON+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- +- for am_cv_pathless_PYTHON in python python2 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do +- test "$am_cv_pathless_PYTHON" = none && break +- prog="import sys, string +-# split strings by '.' and convert to numeric. Append some zeros +-# because we need at least 4 digits for the hex conversion. +-minver = map(int, string.split('2.3.5', '.')) + [0, 0, 0] +-minverhex = 0 +-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i] +-sys.exit(sys.hexversion < minverhex)" +- if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5 +- ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then : +- break +-fi +- done +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 +-$as_echo "$am_cv_pathless_PYTHON" >&6; } +- # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. +- if test "$am_cv_pathless_PYTHON" = none; then +- PYTHON=: +- else +- # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. +-set dummy $am_cv_pathless_PYTHON; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_PYTHON+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- case $PYTHON in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-PYTHON=$ac_cv_path_PYTHON +-if test -n "$PYTHON"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +-$as_echo "$PYTHON" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- fi +- am_display_PYTHON=$am_cv_pathless_PYTHON +- fi +- +- +- if test "$PYTHON" = :; then +- as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 +- else +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 +-$as_echo_n "checking for $am_display_PYTHON version... " >&6; } +-if ${am_cv_python_version+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"` +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 +-$as_echo "$am_cv_python_version" >&6; } +- PYTHON_VERSION=$am_cv_python_version +- +- +- +- PYTHON_PREFIX='${prefix}' +- +- PYTHON_EXEC_PREFIX='${exec_prefix}' +- +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 +-$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } +-if ${am_cv_python_platform+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"` +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 +-$as_echo "$am_cv_python_platform" >&6; } +- PYTHON_PLATFORM=$am_cv_python_platform +- +- +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 +-$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } +-if ${am_cv_python_pythondir+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || +- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 +-$as_echo "$am_cv_python_pythondir" >&6; } +- pythondir=$am_cv_python_pythondir +- +- +- +- pkgpythondir=\${pythondir}/$PACKAGE +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 +-$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } +-if ${am_cv_python_pyexecdir+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || +- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"` +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 +-$as_echo "$am_cv_python_pyexecdir" >&6; } +- pyexecdir=$am_cv_python_pyexecdir +- +- +- +- pkgpyexecdir=\${pyexecdir}/$PACKAGE +- +- +- +- fi +- +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for headers required to compile python extensions" >&5 +-$as_echo_n "checking for headers required to compile python extensions... " >&6; } +-py_prefix=`$PYTHON -c "import sys; print sys.prefix"` +-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` +-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" +-if test "$py_prefix" != "$py_exec_prefix"; then +- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" +-fi +- +-save_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <Python.h> +-_ACEOF +-if ac_fn_c_try_cpp "$LINENO"; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 +-$as_echo "found" >&6; } +- +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +-$as_echo "not found" >&6; } +-as_fn_error $? "could not find Python headers" "$LINENO" 5 +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +-CPPFLAGS="$save_CPPFLAGS" +- +- +- +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPINDICATOR_PYTHON" >&5 +-$as_echo_n "checking for APPINDICATOR_PYTHON... " >&6; } +- +-if test -n "$APPINDICATOR_PYTHON_CFLAGS"; then +- pkg_cv_APPINDICATOR_PYTHON_CFLAGS="$APPINDICATOR_PYTHON_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" +- pygtk-2.0 >= \$PYGTK_REQUIRED +- gtk+-2.0 >= \$GTK_REQUIRED_VERSION +- pygobject-2.0 >= \$PYGOBJECT_REQUIRED +- \""; } >&5 +- ($PKG_CONFIG --exists --print-errors " +- pygtk-2.0 >= $PYGTK_REQUIRED +- gtk+-2.0 >= $GTK_REQUIRED_VERSION +- pygobject-2.0 >= $PYGOBJECT_REQUIRED +- ") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_APPINDICATOR_PYTHON_CFLAGS=`$PKG_CONFIG --cflags " +- pygtk-2.0 >= $PYGTK_REQUIRED +- gtk+-2.0 >= $GTK_REQUIRED_VERSION +- pygobject-2.0 >= $PYGOBJECT_REQUIRED +- " 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$APPINDICATOR_PYTHON_LIBS"; then +- pkg_cv_APPINDICATOR_PYTHON_LIBS="$APPINDICATOR_PYTHON_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" +- pygtk-2.0 >= \$PYGTK_REQUIRED +- gtk+-2.0 >= \$GTK_REQUIRED_VERSION +- pygobject-2.0 >= \$PYGOBJECT_REQUIRED +- \""; } >&5 +- ($PKG_CONFIG --exists --print-errors " +- pygtk-2.0 >= $PYGTK_REQUIRED +- gtk+-2.0 >= $GTK_REQUIRED_VERSION +- pygobject-2.0 >= $PYGOBJECT_REQUIRED +- ") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_APPINDICATOR_PYTHON_LIBS=`$PKG_CONFIG --libs " +- pygtk-2.0 >= $PYGTK_REQUIRED +- gtk+-2.0 >= $GTK_REQUIRED_VERSION +- pygobject-2.0 >= $PYGOBJECT_REQUIRED +- " 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- APPINDICATOR_PYTHON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " +- pygtk-2.0 >= $PYGTK_REQUIRED +- gtk+-2.0 >= $GTK_REQUIRED_VERSION +- pygobject-2.0 >= $PYGOBJECT_REQUIRED +- " 2>&1` +- else +- APPINDICATOR_PYTHON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " +- pygtk-2.0 >= $PYGTK_REQUIRED +- gtk+-2.0 >= $GTK_REQUIRED_VERSION +- pygobject-2.0 >= $PYGOBJECT_REQUIRED +- " 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$APPINDICATOR_PYTHON_PKG_ERRORS" >&5 +- +- as_fn_error $? "Package requirements ( +- pygtk-2.0 >= $PYGTK_REQUIRED +- gtk+-2.0 >= $GTK_REQUIRED_VERSION +- pygobject-2.0 >= $PYGOBJECT_REQUIRED +- ) were not met: +- +-$APPINDICATOR_PYTHON_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables APPINDICATOR_PYTHON_CFLAGS +-and APPINDICATOR_PYTHON_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details." "$LINENO" 5 +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables APPINDICATOR_PYTHON_CFLAGS +-and APPINDICATOR_PYTHON_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see <http://pkg-config.freedesktop.org/>. +-See \`config.log' for more details" "$LINENO" 5; } +-else +- APPINDICATOR_PYTHON_CFLAGS=$pkg_cv_APPINDICATOR_PYTHON_CFLAGS +- APPINDICATOR_PYTHON_LIBS=$pkg_cv_APPINDICATOR_PYTHON_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-fi +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pygtk defs" >&5 +-$as_echo_n "checking for pygtk defs... " >&6; } +-PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYGTK_DEFSDIR" >&5 +-$as_echo "$PYGTK_DEFSDIR" >&6; } +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pygtk codegen" >&5 +-$as_echo_n "checking for pygtk codegen... " >&6; } +-PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYGTK_CODEGEN" >&5 +-$as_echo "$PYGTK_CODEGEN" >&6; } + + ######################### + # Check if build tests +@@ -14358,7 +14001,7 @@ fi + # Files + ########################### + +-ac_config_files="$ac_config_files Makefile src/Makefile src/appindicator-0.1.pc src/appindicator3-0.1.pc bindings/Makefile bindings/python/Makefile bindings/python/appindicator.override bindings/vala/Makefile bindings/vala/examples/Makefile tests/Makefile example/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml docs/reference/libappindicator-docs.sgml" ++ac_config_files="$ac_config_files Makefile src/Makefile src/appindicator-0.1.pc src/appindicator3-0.1.pc bindings/Makefile bindings/vala/Makefile bindings/vala/examples/Makefile tests/Makefile example/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml docs/reference/libappindicator-docs.sgml" + + + if test "x$has_mono" = "xtrue" ; then +@@ -15437,8 +15080,6 @@ do + "src/appindicator-0.1.pc") CONFIG_FILES="$CONFIG_FILES src/appindicator-0.1.pc" ;; + "src/appindicator3-0.1.pc") CONFIG_FILES="$CONFIG_FILES src/appindicator3-0.1.pc" ;; + "bindings/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/Makefile" ;; +- "bindings/python/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/python/Makefile" ;; +- "bindings/python/appindicator.override") CONFIG_FILES="$CONFIG_FILES bindings/python/appindicator.override" ;; + "bindings/vala/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/vala/Makefile" ;; + "bindings/vala/examples/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/vala/examples/Makefile" ;; + "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; +diff --git a/configure.ac b/configure.ac +index ee03390..4713b22 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -181,33 +181,6 @@ AM_CONDITIONAL(BUILD_MONO_TEST, test x${have_nunit} = xyes) + with_localinstall="no" + AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no) + +-########################### +-# Python +-########################### +- +-PYGTK_REQUIRED=2.14.0 +-PYGOBJECT_REQUIRED=0.22 +- +-AM_PATH_PYTHON(2.3.5) +-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) +- +-PKG_CHECK_MODULES(APPINDICATOR_PYTHON, +- [ +- pygtk-2.0 >= $PYGTK_REQUIRED +- gtk+-2.0 >= $GTK_REQUIRED_VERSION +- pygobject-2.0 >= $PYGOBJECT_REQUIRED +- ]) +- +-AC_MSG_CHECKING(for pygtk defs) +-PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` +-AC_SUBST(PYGTK_DEFSDIR) +-AC_MSG_RESULT($PYGTK_DEFSDIR) +- +-AC_MSG_CHECKING(for pygtk codegen) +-PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" +-AC_SUBST(PYGTK_CODEGEN) +-AC_MSG_RESULT($PYGTK_CODEGEN) +- + ######################### + # Check if build tests + ######################### +@@ -239,8 +212,6 @@ src/Makefile + src/appindicator-0.1.pc + src/appindicator3-0.1.pc + bindings/Makefile +-bindings/python/Makefile +-bindings/python/appindicator.override + bindings/vala/Makefile + bindings/vala/examples/Makefile + tests/Makefile \ No newline at end of file ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -56,6 +56,8 @@ cleanup: - '*.la' modules: + - modules/libappindicator/libappindicator-gtk3-introspection-12.10.json + - name: python3-pyparsing buildsystem: simple build-commands: @@ -68,20 +70,20 @@ modules: - name: python3-packaging buildsystem: simple build-commands: - - pip3 install packaging-21.0-py3-none-any.whl + - pip3 install packaging-21.3-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/p/packaging/packaging-21.0-py3-… - sha256: c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14 + url: https://files.pythonhosted.org/packages/py3/p/packaging/packaging-21.3-py3-… + sha256: ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 - name: python3-pycparser buildsystem: simple build-commands: - - pip3 install pycparser-2.20-py2.py3-none-any.whl + - pip3 install pycparser-2.21-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/p/pycparser/pycparser-2.20-… - sha256: 7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705 + url: https://files.pythonhosted.org/packages/py2.py3/p/pycparser/pycparser-2.21-… + sha256: 8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 - name: python3-cffi buildsystem: simple @@ -89,8 +91,8 @@ modules: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/c/cffi/cffi-1.14.6.tar.gz - sha256: c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd + url: https://files.pythonhosted.org/packages/source/c/cffi/cffi-1.15.0.tar.gz + sha256: 920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954 - name: python3-asn1crypto buildsystem: simple @@ -104,42 +106,42 @@ modules: - name: python3-idna buildsystem: simple build-commands: - - pip3 install idna-3.2-py3-none-any.whl + - pip3 install idna-3.3-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/i/idna/idna-3.2-py3-none-any.whl - sha256: 14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a + url: https://files.pythonhosted.org/packages/py3/i/idna/idna-3.3-py3-none-any.whl + sha256: 84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff - name: python3-cryptography buildsystem: simple only-arches: - aarch64 build-commands: - - pip3 install cryptography-3.4.8-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl + - pip3 install cryptography-36.0.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-3.… - sha256: 34dae04a0dce5730d8eb7894eab617d8a70d0c97da76b905de9efb7128ad7085 + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-36… + sha256: 4c702855cd3174666ef0d2d13dcc879090aa9c6c38f5578896407a7028f75b9f - name: python3-cryptography buildsystem: simple only-arches: - x86_64 build-commands: - - pip3 install cryptography-3.4.8-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pip3 install cryptography-36.0.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-3.… - sha256: 1eb7bb0df6f6f583dd8e054689def236255161ebbcf62b226454ab9ec663746b + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-36… + sha256: d91bc9f535599bed58f6d2e21a2724cb0c3895bf41c6403fe881391d29096f1d - name: python3-pyopenssl buildsystem: simple build-commands: - - pip3 install pyOpenSSL-20.0.1-py2.py3-none-any.whl + - pip3 install pyOpenSSL-21.0.0-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/p/pyOpenSSL/pyOpenSSL-20.0.… - sha256: 818ae18e06922c066f777a33f1fca45786d85edfe71cd043de6379337a7f274b + url: https://files.pythonhosted.org/packages/py2.py3/p/pyOpenSSL/pyOpenSSL-21.0.… + sha256: 8935bd4920ab9abfebb07c41a4f58296407ed77f04bd1a92914044b848ba1ed6 - name: python3-dbus-python build-options: @@ -147,8 +149,8 @@ modules: PYTHON_VERSION: '3' sources: - type: archive - url: https://files.pythonhosted.org/packages/source/d/dbus-python/dbus-python-1.… - sha256: 11238f1d86c995d8aed2e22f04a1e3779f0d70e587caffeab4857f3c662ed5a4 + url: https://files.pythonhosted.org/packages/source/d/dbus-python/dbus-python-1.… + sha256: 92bdd1e68b45596c833307a5ff4b217ee6929a1502f5341bae28fd120acf7260 - name: python3-jeepney buildsystem: simple @@ -171,34 +173,34 @@ modules: - name: python3-zipp buildsystem: simple build-commands: - - pip3 install zipp-3.5.0-py3-none-any.whl + - pip3 install zipp-3.6.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.5.0-py3-none-any.… - sha256: 957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3 + url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.6.0-py3-none-any.… + sha256: 9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc # keyring dependency - name: python3-importlib-metadata buildsystem: simple build-commands: - - pip3 install importlib_metadata-4.8.1-py3-none-any.whl + - pip3 install importlib_metadata-4.8.2-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… - sha256: b618b6d2d5ffa2f16add5697cf57a46c76a56229b0ed1c438322e4e95645bd15 + url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… + sha256: 53ccfd5c134223e497627b9815d5030edf77d2ed573922f7a0b8f8bb81a1c100 - name: python3-keyring buildsystem: simple build-commands: - - pip3 install keyring-23.2.1-py3-none-any.whl + - pip3 install keyring-23.4.0-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.2.1-py3-no… - sha256: bd2145a237ed70c8ce72978b497619ddfcae640b6dcf494402d5143e37755c6e + url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.4.0-py3-no… + sha256: 3dc0f66062a4f8f6f2ce30d6a516e6e623e6c3c2e76864204ceaf64695408f07 - name: python3-css-parser buildsystem: simple @@ -234,8 +236,8 @@ modules: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/g/gssapi/gssapi-1.7.0.tar.gz - sha256: e7b8ae92033f9b487762f7dc7dbf55616b27cf767c1fc0126cdc88414df4111c + url: https://files.pythonhosted.org/packages/source/g/gssapi/gssapi-1.7.2.tar.gz + sha256: 748efbcf7cfb31183cd75e5314493e79fe3521b3ec00d090a77e23f7c75fa59d # GSound dependency - name: libcanberra @@ -272,6 +274,15 @@ modules: - type: patch path: farstream-make-4.3.patch + - name: python3-pillow + buildsystem: simple + build-commands: + - pip3 install . + sources: + - type: archive + url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-8.4.0.tar.gz + sha256: b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed + - name: python3-nbxmpp buildsystem: simple build-commands: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fdc4c7a2a4d66b11cbdb903500c810bc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fdc4c7a2a4d66b11cbdb903500c810bc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 725 commits: Start
by Philipp Hörist (＠lovetox) 04 Dec '21

04 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 14b28d4a by lovetox at 2021-12-02T21:42:40+01:00 Start - - - - - 4759c4c1 by lovetox at 2021-12-02T21:42:40+01:00 Add Workspace settings API - - - - - 4a510645 by lovetox at 2021-12-02T21:42:40+01:00 Store and Open chats - - - - - 9f69d4fa by lovetox at 2021-12-02T21:42:41+01:00 Add remove_chat() - - - - - bbb85cc7 by lovetox at 2021-12-02T21:42:41+01:00 Account Side Bar - - - - - 308f2b21 by lovetox at 2021-12-02T21:42:41+01:00 Add Workspace Side Bar - - - - - ddd249f3 by wurstsalat at 2021-12-02T21:42:41+01:00 ChatList: Add basic elements - - - - - 34c0bbe4 by wurstsalat at 2021-12-02T21:42:41+01:00 ChatListStack: Add Start Chat - - - - - f9c09a91 by wurstsalat at 2021-12-02T21:42:41+01:00 Add basic Sidebar styling - - - - - 5e8cbd91 by wurstsalat at 2021-12-02T21:42:41+01:00 Improve styling for Sidebar and ChatList - - - - - e6f77d4a by lovetox at 2021-12-02T21:42:41+01:00 Store chatlist on remove - - - - - 26ebe684 by lovetox at 2021-12-02T21:42:41+01:00 Add/Remove Workspaces - - - - - 9be500e2 by lovetox at 2021-12-02T21:42:41+01:00 Allow to add chats to different workspaces - - - - - 8778de7e by lovetox at 2021-12-02T21:42:41+01:00 Add transparent backgrounds - - - - - 68614602 by wurstsalat at 2021-12-02T21:42:41+01:00 AccountSideBar: Improve styling - - - - - 76c1f2c1 by wurstsalat at 2021-12-02T21:42:41+01:00 WorkspaceSidebar: Improve styling - - - - - 32335ab8 by lovetox at 2021-12-02T21:42:41+01:00 Improve left sidebar - - - - - 17a4b739 by lovetox at 2021-12-02T21:42:41+01:00 Improve CSS - - - - - d4feaa22 by lovetox at 2021-12-02T21:42:41+01:00 Dont fail when account is disabled - - - - - 0e52412a by wurstsalat at 2021-12-02T21:42:41+01:00 AvatarSelector: Add Load Image button - - - - - a3d0f572 by Daniel Brötzmann at 2021-12-02T21:42:41+01:00 Workspace: Add Workspace edit dialog - - - - - c8981fab by wurstsalat at 2021-12-02T21:42:41+01:00 Workspace: Add title and editing functionality - - - - - 336f6ad7 by wurstsalat at 2021-12-02T21:42:41+01:00 MainWindow: Add Paned for chat list and chat controls - - - - - 9aa252fe by lovetox at 2021-12-02T21:42:41+01:00 Store type for open chats - - - - - 2d0e4578 by lovetox at 2021-12-02T21:42:41+01:00 Store workspace dialog settings - - - - - 83e14f6b by lovetox at 2021-12-02T21:42:41+01:00 Fix adding new Workspace - - - - - b66a7d14 by lovetox at 2021-12-02T21:42:41+01:00 Fix selection bugs - - - - - 6bbf9ca3 by Daniel Brötzmann at 2021-12-02T21:42:41+01:00 ChatListStack: Wrap in ScrolledWindow - - - - - 5cfbc99f by lovetox at 2021-12-02T21:42:41+01:00 Move scrolled window into gui xml - - - - - 94c2ed07 by lovetox at 2021-12-02T21:42:41+01:00 Style chatlist - - - - - 1179ac2d by wurstsalat at 2021-12-02T21:42:41+01:00 ChatList: Styling - - - - - 311c96cf by wurstsalat at 2021-12-02T21:42:41+01:00 MainWindow: Styling - - - - - dd28c7d3 by wurstsalat at 2021-12-02T21:42:41+01:00 Accounts: Add basic account page - - - - - faf313b0 by lovetox at 2021-12-02T21:43:48+01:00 Refactor Groupchats - - - - - 7990ad79 by lovetox at 2021-12-02T21:43:51+01:00 Start Chat: Destroy after joining MUC - - - - - 9362a651 by lovetox at 2021-12-02T21:44:58+01:00 Disable Roster - - - - - e0d056d0 by lovetox at 2021-12-02T21:45:00+01:00 Make quit work - - - - - 3dc8664c by lovetox at 2021-12-02T21:45:00+01:00 Fix various things - - - - - 74b2f764 by Daniel Brötzmann at 2021-12-02T21:45:00+01:00 ChatList: Add friendly timestamps - - - - - 343c6dd4 by Daniel Brötzmann at 2021-12-02T21:45:00+01:00 ChatList: Unread counter styling - - - - - 1a5f4c64 by Daniel Brötzmann at 2021-12-02T21:45:00+01:00 ChatList: Group chat avatars and message lines - - - - - fe52d35b by Daniel Brötzmann at 2021-12-02T21:45:00+01:00 Paned: Improve ChatList resizing - - - - - cb6040e9 by Daniel Brötzmann at 2021-12-02T21:45:00+01:00 ChatList: Use groupchat name, improve ellipsizing - - - - - e103b093 by Daniel Brötzmann at 2021-12-02T21:45:00+01:00 ChatList: Add group chat nicks - - - - - b49ccec6 by lovetox at 2021-12-02T21:45:00+01:00 Remove unread_messages table - - - - - 09ac19e2 by lovetox at 2021-12-02T21:45:00+01:00 Add unread cache - - - - - ca09cf1e by lovetox at 2021-12-02T21:45:44+01:00 Add notifications - - - - - 851678a3 by Daniel Brötzmann at 2021-12-02T21:45:46+01:00 ChatList: Move ui to glade file - - - - - c7575c74 by Daniel Brötzmann at 2021-12-02T21:45:46+01:00 ChatList: Add RosterTooltip - - - - - 28bdd493 by lovetox at 2021-12-02T21:45:46+01:00 Move event handling to main - - - - - 2e415fd3 by lovetox at 2021-12-02T21:45:46+01:00 Reset unread counter - - - - - ae24a601 by wurstsalat at 2021-12-02T21:45:46+01:00 WorkspaceSidebar: Add unread counter - - - - - 85c503a3 by lovetox at 2021-12-02T21:45:46+01:00 Improve unread count - - - - - cc24785c by lovetox at 2021-12-02T21:45:46+01:00 Add unread count to workspace - - - - - 72ffb2dd by lovetox at 2021-12-02T21:45:46+01:00 Dont allow chats to be opened multiple times - - - - - 101e9836 by lovetox at 2021-12-02T21:45:46+01:00 Don’t notify on messages from ourself - - - - - 687e96c6 by lovetox at 2021-12-02T21:46:09+01:00 Use consistent jid attribute - - - - - 0baee844 by lovetox at 2021-12-02T21:46:11+01:00 Fix events - - - - - 29589110 by lovetox at 2021-12-02T21:46:11+01:00 Handle presence - - - - - f9c14234 by lovetox at 2021-12-02T21:46:11+01:00 Sort with activity - - - - - f64dc6c6 by lovetox at 2021-12-02T21:46:11+01:00 Save handle position - - - - - 57fe8737 by lovetox at 2021-12-02T21:46:11+01:00 Connect Menu actions - - - - - beb5d291 by lovetox at 2021-12-02T21:46:11+01:00 Bring back more actions - - - - - c3e9d8df by lovetox at 2021-12-02T21:46:11+01:00 Fix transients - - - - - 37d43264 by lovetox at 2021-12-02T21:46:11+01:00 Make Private Chat work - - - - - 625ff095 by Daniel Brötzmann at 2021-12-02T21:46:11+01:00 ChatList: Add avatar and name for PMs - - - - - 84dc90ab by Daniel Brötzmann at 2021-12-02T21:46:11+01:00 ChatList: Show indicator for group chats - - - - - 53acd60c by lovetox at 2021-12-02T21:46:11+01:00 New Contacts - - - - - 886242ee by wurstsalat at 2021-12-02T21:46:11+01:00 Add Workspace menu - - - - - c3e8fb00 by wurstsalat at 2021-12-02T21:46:11+01:00 WorkspaceSidebar: Add drag and drop - - - - - 8a94ce43 by wurstsalat at 2021-12-02T21:46:11+01:00 Add update_workspace method - - - - - 0b18337c by wurstsalat at 2021-12-02T21:46:11+01:00 ChatList: Set message nick, process message-sent event - - - - - 142549d0 by wurstsalat at 2021-12-02T21:46:11+01:00 ChatList: Update time, improve close button - - - - - 71f7339b by Daniel Brötzmann at 2021-12-02T21:46:11+01:00 ChatList: Add chatstate icon - - - - - 4259548b by wurstsalat at 2021-12-02T21:46:11+01:00 ChatList: Improve chatstate icon - - - - - c8971f55 by wurstsalat at 2021-12-02T21:46:11+01:00 ChatList: Add context menu and pinning - - - - - 5875a460 by wurstsalat at 2021-12-02T21:46:11+01:00 ChatList: Add basic list headers - - - - - 4d35da1c by wurstsalat at 2021-12-02T21:46:11+01:00 WorkspaceSidebar: Improve item highlighting - - - - - 5474c0ed by wurstsalat at 2021-12-02T21:46:11+01:00 ChatList: Add move to workspace feature - - - - - 4b02cd48 by wurstsalat at 2021-12-02T21:46:11+01:00 ChatList: Add placeholder - - - - - 6507c23c by wurstsalat at 2021-12-02T21:46:11+01:00 Various improvements - - - - - 0e3402f0 by wurstsalat at 2021-12-02T21:46:11+01:00 ChatListStack: Fix moving group chats - - - - - d337776f by Daniel Brötzmann at 2021-12-02T21:46:11+01:00 Store pinned chats - - - - - c5351756 by Daniel Brötzmann at 2021-12-02T21:46:11+01:00 ChatList: Improve sorting - - - - - 79722679 by wurstsalat at 2021-12-02T21:46:11+01:00 WorkspaceDialog: Improvements - - - - - 192da1fa by lovetox at 2021-12-02T21:46:11+01:00 Make contacts module work - - - - - b36ffca1 by lovetox at 2021-12-02T21:46:45+01:00 More contacts changes - - - - - 9993ba53 by lovetox at 2021-12-02T21:47:07+01:00 Roster: add iter_contacts() - - - - - 83c716c7 by lovetox at 2021-12-02T21:47:07+01:00 Fix receipt processing - - - - - db835f06 by lovetox at 2021-12-02T21:47:07+01:00 Fix subscription check - - - - - cb0efa96 by lovetox at 2021-12-02T21:47:07+01:00 Chatlist: Remove tooltip - - - - - 0c4991e5 by lovetox at 2021-12-02T21:47:07+01:00 Destroy roster correctly - - - - - 4350accb by lovetox at 2021-12-02T21:47:07+01:00 Move finalize check to app module - - - - - 3cf49f33 by lovetox at 2021-12-02T21:47:07+01:00 Settings: Add json encoder/decoder - - - - - 90122e6d by lovetox at 2021-12-02T21:47:07+01:00 Fix MUC rejoins - - - - - 2e44ac40 by lovetox at 2021-12-02T21:47:07+01:00 Refactor roster request code - - - - - 0994a59f by lovetox at 2021-12-02T21:47:07+01:00 Contacts: Fix access to roster attr - - - - - 902d62f9 by lovetox at 2021-12-02T21:47:07+01:00 Add room-left signal - - - - - a88f12bf by lovetox at 2021-12-02T21:47:07+01:00 Fix muc user avatar update - - - - - e05d012a by lovetox at 2021-12-02T21:47:07+01:00 Fix private chat - - - - - 16b80a75 by lovetox at 2021-12-02T21:47:07+01:00 Remove unused imports - - - - - 1abe3372 by lovetox at 2021-12-02T21:47:07+01:00 Remove unused events and methods - - - - - 8d34578d by lovetox at 2021-12-02T21:47:07+01:00 Fix status selector - - - - - d2cc3103 by Daniel Brötzmann at 2021-12-02T21:47:07+01:00 Profile: Fix missing client - - - - - 27b9ad0a by lovetox at 2021-12-02T21:47:07+01:00 Refactor Avatar clipping - - - - - 5ea6ccf7 by lovetox at 2021-12-02T21:47:07+01:00 Groupchat: Restore got_disconnected() - - - - - db6f07a6 by wurstsalat at 2021-12-02T21:47:07+01:00 Workspaces: Fix menu, store moved chats - - - - - 9a060c32 by wurstsalat at 2021-12-02T21:47:07+01:00 AccountPage: Add basic roster - - - - - 16261423 by wurstsalat at 2021-12-02T21:47:07+01:00 Roster: Improvements - - - - - a8050766 by Daniel Brötzmann at 2021-12-02T21:47:07+01:00 Improve AccountPage and Roster - - - - - 18b96cad by Daniel Brötzmann at 2021-12-02T21:47:07+01:00 ChatList: Improve popover menu - - - - - abdcee76 by lovetox at 2021-12-02T21:47:07+01:00 Fix Filter - - - - - 2d83f227 by wurstsalat at 2021-12-02T21:47:07+01:00 Roster: Add actions - - - - - f4497fa2 by lovetox at 2021-12-02T21:47:07+01:00 AddContact: Refactor - - - - - 3bc7d9ce by wurstsalat at 2021-12-02T21:47:07+01:00 Roster: Add filter menu, connect search - - - - - a84ca51e by lovetox at 2021-12-02T21:47:07+01:00 Work on Roster - - - - - ce394d8b by lovetox at 2021-12-02T21:47:07+01:00 Roster: Add events - - - - - 8eb3927f by lovetox at 2021-12-02T21:47:07+01:00 Roster: Refactor - - - - - 957c91a9 by wurstsalat at 2021-12-02T21:47:07+01:00 Roster: Implement filtering - - - - - 2201e850 by wurstsalat at 2021-12-02T21:47:07+01:00 Roster: Rename menu handlers - - - - - 04a678a4 by wurstsalat at 2021-12-02T21:47:07+01:00 Roster: Implement middle mouse click - - - - - 8d0995fe by wurstsalat at 2021-12-02T21:47:07+01:00 Roster: Open chat when activating row - - - - - 43b22604 by lovetox at 2021-12-02T21:47:07+01:00 Dont show empty groups when filtering - - - - - 9710c907 by wurstsalat at 2021-12-02T21:47:07+01:00 Roster: Implement drag and drop - - - - - 4a986378 by lovetox at 2021-12-02T21:47:07+01:00 Add high performance option for big rosters - - - - - 8d97d726 by lovetox at 2021-12-02T21:47:07+01:00 JSONEncoder/Decoder: handle set - - - - - ac313148 by lovetox at 2021-12-02T21:47:07+01:00 Roster: add group methods - - - - - 48adbd8c by lovetox at 2021-12-02T21:47:07+01:00 Make dnd functional - - - - - a4f2743e by lovetox at 2021-12-02T21:47:07+01:00 Roster: Fix removing contact - - - - - 13b608bb by lovetox at 2021-12-02T21:47:07+01:00 Refactor Blocking - - - - - 4405e7f8 by lovetox at 2021-12-02T21:47:07+01:00 Roster: Refactor - - - - - 613ff67e by lovetox at 2021-12-02T21:47:07+01:00 Roster: Fix reset - - - - - b05bdadb by lovetox at 2021-12-02T21:47:07+01:00 Remove unused import - - - - - 5599f970 by lovetox at 2021-12-02T21:47:31+01:00 Fix leaving muc - - - - - 1c540528 by lovetox at 2021-12-02T21:47:33+01:00 Add more leak checks - - - - - 4c930934 by lovetox at 2021-12-02T21:47:33+01:00 Save workspace order - - - - - fdb9aeb7 by lovetox at 2021-12-02T21:47:33+01:00 Fix saving MUC avatar - - - - - 491779f9 by lovetox at 2021-12-02T21:47:33+01:00 MUC refactor Get rid of manager - - - - - 3d577011 by lovetox at 2021-12-02T21:47:33+01:00 Add methods for accessing resources - - - - - 28d01bf3 by lovetox at 2021-12-02T21:47:33+01:00 Add get_show_circle() - - - - - 7e0c839e by lovetox at 2021-12-02T21:47:33+01:00 Raise cache size - - - - - a7044038 by wurstsalat at 2021-12-02T21:48:14+01:00 Tooltips: Remove NotificationAreaTooltip - - - - - d6cb5918 by wurstsalat at 2021-12-02T21:48:16+01:00 Tooltips: Refactor - - - - - f5e2583a by wurstsalat at 2021-12-02T21:48:16+01:00 RosterTooltip: Add idle time - - - - - d1e812ed by wurstsalat at 2021-12-02T21:48:16+01:00 RosterTooltip: Remove old idle time remnant - - - - - 8260aad1 by wurstsalat at 2021-12-02T21:48:16+01:00 ChatList: Add Start Chat placeholder - - - - - 23f15e88 by wurstsalat at 2021-12-02T21:48:16+01:00 Tooltips: Reduce icon sizes - - - - - 6699fbe5 by wurstsalat at 2021-12-02T21:48:16+01:00 ChatList: Increase list header spacing - - - - - c1df5b51 by Daniel Brötzmann at 2021-12-02T21:48:16+01:00 Main: Use popover menu - - - - - 8e1cfcae by Daniel Brötzmann at 2021-12-02T21:48:16+01:00 WorkspaceSidebar: Improve Add button styling - - - - - f1e4321b by Daniel Brötzmann at 2021-12-02T21:48:16+01:00 AccountSidebar: Improve icons - - - - - 841a2d69 by Daniel Brötzmann at 2021-12-02T21:48:16+01:00 Improve style for account identifier bar - - - - - 63ddf713 by Daniel Brötzmann at 2021-12-02T21:48:16+01:00 WorkspaceSidebar: Add name to tooltip - - - - - 707286c5 by Daniel Brötzmann at 2021-12-02T21:48:16+01:00 ChatList: Improve headers - - - - - de5b5c02 by Daniel Brötzmann at 2021-12-02T21:48:16+01:00 AccountPage: Add avatar and profile button - - - - - 259ff647 by Daniel Brötzmann at 2021-12-02T21:48:16+01:00 ChatList: Implement Add to roster menu entry - - - - - 3c8c0f83 by wurstsalat at 2021-12-02T21:48:16+01:00 StatusSelector: Use 'show circles' for icons - - - - - a7a5d4e0 by lovetox at 2021-12-02T21:48:16+01:00 Fix add to contact list - - - - - 0ccb84a5 by lovetox at 2021-12-02T21:48:16+01:00 Remove module mock - - - - - ab6cf574 by wurstsalat at 2021-12-02T21:48:16+01:00 WorkspaceSidebar: Attempt to fix icon position - - - - - 0e12f7f8 by lovetox at 2021-12-02T21:48:16+01:00 Fix GC menu - - - - - ca8b5774 by lovetox at 2021-12-02T21:48:16+01:00 add get_groups() - - - - - f767324f by lovetox at 2021-12-02T21:48:16+01:00 Add more group functions - - - - - 5e9d3c3f by lovetox at 2021-12-02T21:48:16+01:00 Fix rename group - - - - - c5f2b88f by Daniel Brötzmann at 2021-12-02T21:48:44+01:00 Rework ContactInfo dialog - - - - - 35135f29 by wurstsalat at 2021-12-02T21:48:46+01:00 Fix sending files from ChatControl menu - - - - - 4e8d7a05 by wurstsalat at 2021-12-02T21:48:46+01:00 ContactInfo: Handle timeout correctly - - - - - c2a655f2 by wurstsalat at 2021-12-02T21:49:24+01:00 Chat Controls: Simplify usage of client - - - - - 7bba5cf6 by wurstsalat at 2021-12-02T21:49:25+01:00 GroupChatInvite: Adapt to new contacts API - - - - - c3cebfc9 by lovetox at 2021-12-02T21:49:25+01:00 Simplify code - - - - - db4bf3a1 by lovetox at 2021-12-02T21:49:25+01:00 Get correct path - - - - - dab3bc82 by lovetox at 2021-12-02T21:49:25+01:00 App: Force GC before checking if object is finalized - - - - - 93dc50c4 by lovetox at 2021-12-02T21:49:25+01:00 Refactor EntityTime - - - - - 565f6012 by lovetox at 2021-12-02T21:49:25+01:00 Refactor ContactInfo - - - - - 683b9fe0 by lovetox at 2021-12-02T21:49:25+01:00 show chat stack page on select=True - - - - - 896b555a by wurstsalat at 2021-12-02T21:49:25+01:00 Add SubscriptionManager - - - - - 53c4cdd4 by lovetox at 2021-12-02T21:49:25+01:00 Remove obsolete methods - - - - - 9686b7b3 by lovetox at 2021-12-02T21:49:25+01:00 Fix PresenceShow comparison - - - - - ccb84a69 by wurstsalat at 2021-12-02T21:49:25+01:00 ContactInfo: Adapt to contacts who are not in roster - - - - - e59b7e0e by wurstsalat at 2021-12-02T21:49:25+01:00 NotificationManager: Show unsubscribed event - - - - - 647cb7b9 by lovetox at 2021-12-02T21:49:25+01:00 Set allow_reply_func - - - - - ebf04123 by lovetox at 2021-12-02T21:49:25+01:00 Convert JID - - - - - 33ebab1f by wurstsalat at 2021-12-02T21:49:25+01:00 GroupChatInvitation: Fix accepting invitation - - - - - 4682c962 by wurstsalat at 2021-12-02T21:49:25+01:00 AccountPage: Handle muc invite/decline - - - - - fce305c1 by lovetox at 2021-12-02T21:49:25+01:00 Refactor Presence module - - - - - da14615c by wurstsalat at 2021-12-02T21:49:26+01:00 NotificationManager: Improve display - - - - - e809bb4c by Daniel Brötzmann at 2021-12-02T21:49:26+01:00 CSS: Remove obsolete style - - - - - 9dd1dc89 by wurstsalat at 2021-12-02T21:49:26+01:00 New ConversationView - - - - - bb4873e2 by wurstsalat at 2021-12-02T21:49:26+01:00 ConversationTextview: Fix vertical size allocation - - - - - b6649d12 by wurstsalat at 2021-12-02T21:49:26+01:00 ConversationView: Remove additional nickname characters - - - - - d4e3bdc5 by lovetox at 2021-12-02T21:49:26+01:00 Lower hight of conversation rows - - - - - 0b7fab1a by wurstsalat at 2021-12-02T21:49:26+01:00 Add new feather-more-horizontal-symbolic icons - - - - - 619f0221 by lovetox at 2021-12-02T21:49:26+01:00 Better padding - - - - - caa2b119 by wurstsalat at 2021-12-02T21:49:26+01:00 SingleMessageWindow: Rewrite - - - - - c7679f1d by lovetox at 2021-12-02T21:49:26+01:00 Wrap menu button in eventbox - - - - - caa9540b by lovetox at 2021-12-02T21:49:26+01:00 add new timestamp setting - - - - - a4807f62 by lovetox at 2021-12-02T22:11:00+01:00 Group conversation code into own module - - - - - b6998e83 by Daniel Brötzmann at 2021-12-02T22:11:04+01:00 SingleMessageWindow: Remove obsolete config values - - - - - 9a8664e4 by wurstsalat at 2021-12-02T22:11:04+01:00 HistoryWindow: Use ConversationView - - - - - e75092f8 by lovetox at 2021-12-02T22:11:04+01:00 Refactor scrolling - - - - - 10844fc7 by lovetox at 2021-12-02T22:11:04+01:00 Add ScrolledView - - - - - e8d6b806 by lovetox at 2021-12-02T22:11:04+01:00 Fix history mode - - - - - e322b070 by lovetox at 2021-12-02T22:11:04+01:00 Fix completion state - - - - - 1c49aef3 by lovetox at 2021-12-02T22:11:04+01:00 Improve View sorting - - - - - 8134a335 by lovetox at 2021-12-02T22:11:04+01:00 Make read recipes work - - - - - 4e62fdbd by lovetox at 2021-12-02T22:11:04+01:00 Remove unused imports - - - - - ddb262ae by lovetox at 2021-12-02T22:11:04+01:00 Improve read marker - - - - - e2a2b2c6 by lovetox at 2021-12-02T22:11:04+01:00 show info messages - - - - - 246a3b3d by lovetox at 2021-12-02T22:11:04+01:00 Fix readmarker breaking merge - - - - - 8e3667f6 by wurstsalat at 2021-12-02T22:11:04+01:00 GTK Tests: Use ConversationView for XHTML test - - - - - 4c163c28 by wurstsalat at 2021-12-02T22:11:27+01:00 Remove obsolete conversation_textview.py - - - - - 3587c673 by lovetox at 2021-12-02T22:11:29+01:00 Prevent readmarker from showing until called - - - - - 937d7994 by lovetox at 2021-12-02T22:11:29+01:00 Rework Message Row - Add Styling - - - - - aa0e9281 by lovetox at 2021-12-02T22:11:29+01:00 Fix Info message - - - - - 0169903d by wurstsalat at 2021-12-02T22:11:30+01:00 QuoteWidget: Add styling - - - - - 213db8c9 by wurstsalat at 2021-12-02T22:11:30+01:00 PlainWidget: Strip text - - - - - 02851128 by wurstsalat at 2021-12-02T22:11:30+01:00 Add SearchView - - - - - e61ada30 by lovetox at 2021-12-02T22:11:30+01:00 Change Shortcut - - - - - 6075cd48 by lovetox at 2021-12-02T22:11:30+01:00 Remove MessageWindow - - - - - 3933f457 by lovetox at 2021-12-02T22:11:30+01:00 Remove Session Code - - - - - fe68beac by wurstsalat at 2021-12-02T22:11:30+01:00 CodeWidget: Add header and styling - - - - - b054c3e4 by lovetox at 2021-12-02T22:11:30+01:00 Refactor Observable - - - - - 176bd508 by lovetox at 2021-12-02T22:11:30+01:00 Add SimpleClientState - - - - - 37ae3dde by lovetox at 2021-12-02T22:11:30+01:00 Refactor active/inactive Control state - - - - - dc6ac2ad by lovetox at 2021-12-02T22:11:30+01:00 Fix some things - - - - - 7003a6d6 by lovetox at 2021-12-02T22:11:30+01:00 Make Correction Work again - - - - - 6d2d71c0 by lovetox at 2021-12-02T22:11:30+01:00 Handle disconnect and resume-failed inside modules - - - - - 82981df0 by wurstsalat at 2021-12-02T22:11:30+01:00 Add Jump to bottom button - - - - - 6f9b09d4 by lovetox at 2021-12-02T22:11:30+01:00 Fix Search - - - - - fa85d97e by lovetox at 2021-12-02T22:11:30+01:00 Move overlay to glade - - - - - fe7bd794 by lovetox at 2021-12-02T22:11:30+01:00 Add GroupchatState widget - - - - - 65ae78b3 by lovetox at 2021-12-02T22:11:30+01:00 Fix bugs when joining mucs - - - - - 7aa4d825 by wurstsalat at 2021-12-02T22:11:30+01:00 GroupchatState: Add styling - - - - - 892630bb by lovetox at 2021-12-02T22:15:55+01:00 Refactor accessing muc data in controls - - - - - a907edee by lovetox at 2021-12-02T22:15:58+01:00 More ChatControl changes - - - - - 09d50e70 by lovetox at 2021-12-02T22:15:58+01:00 Refactor Add Message - - - - - 2a05f702 by lovetox at 2021-12-02T22:15:58+01:00 More Control work - - - - - fc365a29 by lovetox at 2021-12-02T22:15:58+01:00 Refactor Main - - - - - 100ae021 by lovetox at 2021-12-02T22:15:58+01:00 Refactor ChatList - - - - - 387da33d by lovetox at 2021-12-02T22:15:58+01:00 Simplify init - - - - - 1942a423 by lovetox at 2021-12-02T22:15:58+01:00 Remove unused methods - - - - - e4cb5740 by lovetox at 2021-12-02T22:16:27+01:00 Remove old Roster code - - - - - 8873a130 by lovetox at 2021-12-02T22:16:29+01:00 Move Controls to GTK folder - - - - - 3bb13562 by lovetox at 2021-12-02T22:16:29+01:00 Remove old History Dialog - - - - - 82cedc97 by wurstsalat at 2021-12-02T22:16:29+01:00 MUCSubject: Add styling - - - - - 898a5ba7 by lovetox at 2021-12-02T22:16:29+01:00 Fix Enabling/Disabling Accounts - - - - - 5bd70028 by lovetox at 2021-12-02T22:16:29+01:00 Add MUCJoinLeft Row - - - - - 51ae7b7c by lovetox at 2021-12-02T22:16:29+01:00 Add SimpleLabel - - - - - 4681a4f6 by lovetox at 2021-12-02T22:16:29+01:00 Fix Label - - - - - ce002e02 by lovetox at 2021-12-02T22:16:29+01:00 Fix workspace label - - - - - 0ded5aee by lovetox at 2021-12-02T22:16:29+01:00 Update AccountBadge and Identifier - - - - - 475fe008 by wurstsalat at 2021-12-02T22:16:29+01:00 Add Info message styling - - - - - 7c39cdcc by lovetox at 2021-12-02T22:16:29+01:00 Add MucUserStatus row - - - - - a84955e2 by wurstsalat at 2021-12-02T22:16:29+01:00 MUCJoinLeft: Use brighter colors in dark mode - - - - - 6ec56a1e by wurstsalat at 2021-12-02T22:16:29+01:00 QuoteWidget: Fix deprecation warning - - - - - aedc06ae by wurstsalat at 2021-12-02T22:16:29+01:00 MUCUserStatus: Add styling - - - - - 3990d013 by lovetox at 2021-12-02T22:16:29+01:00 Add start of MessageLabel impl - - - - - c7a22fc1 by lovetox at 2021-12-02T22:16:29+01:00 Add Links to MessageLabel - - - - - cab1006d by lovetox at 2021-12-02T22:16:29+01:00 Reduce icon size - - - - - 1c3634ac by wurstsalat at 2021-12-02T22:16:29+01:00 GroupchatState: Improve layout - - - - - 2ad47cbe by wurstsalat at 2021-12-02T22:16:29+01:00 ChatRow: Fix newlines in last message - - - - - 774a7603 by wurstsalat at 2021-12-02T22:16:29+01:00 SearchView: Improve result display performance - - - - - a4853a79 by wurstsalat at 2021-12-02T22:16:29+01:00 Remove history remnants - - - - - bec845c6 by wurstsalat at 2021-12-02T22:16:29+01:00 Fix message Quote and Copy - - - - - 7afe8d4d by wurstsalat at 2021-12-02T22:16:29+01:00 SearchView: Simplify adding results - - - - - 477b960c by wurstsalat at 2021-12-02T22:16:29+01:00 CodeWidget: Add margins - - - - - 4643a8cf by wurstsalat at 2021-12-02T22:16:29+01:00 Remove minimize_on_* MUC settings - - - - - 75670b8b by wurstsalat at 2021-12-02T22:16:29+01:00 ChatStack: Add placeholder page - - - - - a2ba01d5 by wurstsalat at 2021-12-02T22:16:29+01:00 Add Note to myself feature - - - - - 246cea28 by wurstsalat at 2021-12-02T22:16:29+01:00 WorkspaceSidebar: Improve add button - - - - - 18d67fbc by wurstsalat at 2021-12-02T22:16:29+01:00 AccountSidebar: Add selection bar - - - - - c91ad788 by wurstsalat at 2021-12-02T22:16:29+01:00 StartChat: Add filter bar - - - - - 637004fc by wurstsalat at 2021-12-02T22:16:29+01:00 BaseControl: Grab focus after quoting - - - - - ddb506fe by wurstsalat at 2021-12-02T22:16:30+01:00 DOAP: Add XEP-ß393 - - - - - f514a350 by Daniel Brötzmann at 2021-12-02T22:16:30+01:00 Improve conversation widgets style - - - - - 73c1168e by Daniel Brötzmann at 2021-12-02T22:16:30+01:00 ChatPlaceholderBox: Dim Gajim icon - - - - - 94626749 by Daniel Brötzmann at 2021-12-02T22:16:30+01:00 GroupchatState: Improve styling - - - - - e921279b by Daniel Brötzmann at 2021-12-02T22:16:30+01:00 MUCUserStatus: Add styling for status message - - - - - b5a4ecda by wurstsalat at 2021-12-02T22:16:30+01:00 AddContact: Fix group selection - - - - - d091a539 by wurstsalat at 2021-12-02T22:16:30+01:00 CodeTextview: Set style scheme depending on Gajim theme - - - - - 76bc924a by wurstsalat at 2021-12-02T22:16:30+01:00 StartChat: Use ChatFilter widget - - - - - 26d40e04 by wurstsalat at 2021-12-02T22:16:30+01:00 Add FileTransferRow and handle HTTP Upload transfers - - - - - 313f17cd by wurstsalat at 2021-12-02T22:16:30+01:00 CodeWidget: Don’t override background color - - - - - d4deae7c by wurstsalat at 2021-12-02T22:16:30+01:00 Remove obsolete history files and settings - - - - - 12425bd1 by wurstsalat at 2021-12-02T22:16:30+01:00 Remove obsolete settings - - - - - 33aae660 by wurstsalat at 2021-12-02T22:16:30+01:00 Remove obosolete window size settings - - - - - 13b92080 by wurstsalat at 2021-12-02T22:16:30+01:00 ChatPage: Add ChatFilter - - - - - 6e7caeed by wurstsalat at 2021-12-02T22:16:30+01:00 ChatPage: Use revealer for ChatFilter - - - - - e4d57783 by wurstsalat at 2021-12-02T22:16:30+01:00 Add AppSideBar and AppPage - - - - - 27f4f66c by wurstsalat at 2021-12-02T22:16:30+01:00 StatusIcon: Fix roster references - - - - - 9f9ac07b by wurstsalat at 2021-12-02T22:16:30+01:00 StatusIcon: Remove unused method - - - - - 15eb2343 by lovetox at 2021-12-02T22:16:30+01:00 Fix choosing a different nick on second join - - - - - fdb4a4c0 by lovetox at 2021-12-02T22:16:30+01:00 GroupchatRoster: Don’t fail showing menu - - - - - 3406fb97 by wurstsalat at 2021-12-02T22:16:30+01:00 AppSideBar: Add background for icon - - - - - 6d75b8df by wurstsalat at 2021-12-02T22:16:30+01:00 StatusSelector: Add account parameter - - - - - 9ee520b6 by wurstsalat at 2021-12-02T22:16:30+01:00 StatusIcon: Update icon on show - - - - - bab3082d by wurstsalat at 2021-12-02T22:16:30+01:00 GroupchatState: Fix content color for dark/light theme - - - - - 425180a2 by wurstsalat at 2021-12-02T22:17:18+01:00 StatusIcon: Integrate AppIndicator - - - - - 581697c4 by wurstsalat at 2021-12-02T22:17:20+01:00 Open new chats with bare jid - - - - - 6cdf5943 by wurstsalat at 2021-12-02T22:17:20+01:00 StatusChange: Stop timeout on destroy - - - - - acd7e645 by wurstsalat at 2021-12-02T22:17:20+01:00 StatusIcon: Improve behaviour - - - - - b8012ab8 by lovetox at 2021-12-02T22:17:20+01:00 Diplay name of domain jids correctly - - - - - 2eccf9a6 by lovetox at 2021-12-02T22:17:20+01:00 Fix Status Message Dialog - - - - - 8b2207d8 by wurstsalat at 2021-12-02T22:17:20+01:00 Add StatusMessageSelector - - - - - 0ae186b5 by wurstsalat at 2021-12-02T22:17:55+01:00 Remove StatusChange window - - - - - 0f3b1473 by wurstsalat at 2021-12-02T22:17:57+01:00 Set icon for main window - - - - - 91af9c02 by wurstsalat at 2021-12-02T22:17:57+01:00 Set default icon for windows - - - - - d2a4d0f4 by wurstsalat at 2021-12-02T22:17:57+01:00 StatusIcon: Remove status change remnant - - - - - c518f82d by wurstsalat at 2021-12-02T22:17:57+01:00 Integrate URL Image Preview plugin - - - - - a1a6f672 by wurstsalat at 2021-12-02T22:17:57+01:00 Preferences: Add File Preview settings - - - - - e37420bc by wurstsalat at 2021-12-02T22:17:57+01:00 Preview: Improvements - - - - - a0918b17 by wurstsalat at 2021-12-02T22:17:57+01:00 SearchView: Search within active accounts only - - - - - 6f980193 by wurstsalat at 2021-12-02T22:17:57+01:00 ConversationView: Fix imports - - - - - 502174e8 by wurstsalat at 2021-12-02T22:17:57+01:00 BaseControl: Remove unused method - - - - - d79bc6b5 by wurstsalat at 2021-12-02T22:17:57+01:00 Preview: Improve labels - - - - - fd0d2fca by wurstsalat at 2021-12-02T22:17:57+01:00 AudioWidget: Add logging - - - - - 810da567 by wurstsalat at 2021-12-02T22:17:57+01:00 ChatFilter: Reduce icon size - - - - - bd096c93 by wurstsalat at 2021-12-02T22:17:57+01:00 Workspaces: Simplify edit and remove - - - - - fe904f8c by wurstsalat at 2021-12-02T22:17:57+01:00 Remove history_mode argument - - - - - 818d914e by lovetox at 2021-12-02T22:17:57+01:00 Fix read markers in groupchat - - - - - c33bdb13 by wurstsalat at 2021-12-02T22:17:57+01:00 ConversationView: Implement cleanup mechanism - - - - - 59c5b414 by wurstsalat at 2021-12-02T22:17:57+01:00 GroupchatControl: Fix aborting join - - - - - 4994d34e by wurstsalat at 2021-12-02T22:17:57+01:00 ChatList: Indicate if last message was a file - - - - - 7b3b8e77 by wurstsalat at 2021-12-02T22:17:57+01:00 Preview: Fix initial button state after sending file - - - - - 4a7a023c by wurstsalat at 2021-12-02T22:17:57+01:00 MessageRow: Implement MUC highlight - - - - - 3b424563 by wurstsalat at 2021-12-02T22:17:57+01:00 MessageRow: Refactor arguments - - - - - 49804ff6 by wurstsalat at 2021-12-02T22:17:57+01:00 BaseControl: Remove unused argument in add_message - - - - - 0ec42c18 by wurstsalat at 2021-12-02T22:17:57+01:00 AudioWidget: Display minutes and seconds correctly - - - - - 72dfb078 by lovetox at 2021-12-02T22:17:57+01:00 Contacts: Add get_disco() - - - - - 62149d38 by wurstsalat at 2021-12-02T22:17:57+01:00 Preview: Consider public/private MUCs - - - - - e65a21c9 by wurstsalat at 2021-12-02T22:17:57+01:00 Preview: Mute logging for netloc discovery - - - - - 01d5ec73 by wurstsalat at 2021-12-02T22:17:57+01:00 Improve conversation scrolling and jump to end button - - - - - 740b8091 by wurstsalat at 2021-12-02T22:17:57+01:00 ChatControl: Scroll to end when sending a message - - - - - 84ef31f8 by wurstsalat at 2021-12-02T22:17:57+01:00 MUCSubject: Don’t escape subject text - - - - - 8b609ab5 by wurstsalat at 2021-12-02T22:17:57+01:00 MessageRow: Simplify nick colors - - - - - 9f25b1e3 by wurstsalat at 2021-12-02T22:17:57+01:00 Preview: Catch errors when closing pixbuf loader - - - - - 45850514 by wurstsalat at 2021-12-02T22:17:58+01:00 Workspaces: Add image avatars - - - - - 325b47c1 by wurstsalat at 2021-12-02T22:17:58+01:00 Startup: Show AccountWizzard if no account available - - - - - e038985b by wurstsalat at 2021-12-02T22:17:58+01:00 Ellipsize nickname in ChatList and ConversationView - - - - - d62880e3 by wurstsalat at 2021-12-02T22:17:58+01:00 MessageRow: Improve detecting own nickname - - - - - b85a56d0 by wurstsalat at 2021-12-02T22:17:58+01:00 Settings: Fix initial workspace and migration - - - - - 34d02bd5 by wurstsalat at 2021-12-02T22:17:58+01:00 ScrolledView: Improvements - - - - - 15b10e61 by wurstsalat at 2021-12-02T22:17:58+01:00 SearchView: Improve behavior when unselecting chat - - - - - 84be5038 by wurstsalat at 2021-12-02T22:17:58+01:00 Append group chat name in PM conversation - - - - - 6deefa17 by lovetox at 2021-12-02T22:17:58+01:00 Discover real jid correctly - - - - - 011290dc by wurstsalat at 2021-12-02T22:17:58+01:00 Group Chat: Fixes for direct messages - - - - - 8708cc81 by wurstsalat at 2021-12-02T22:17:58+01:00 Groupchat Invitation: Add info message correctly - - - - - c8061284 by wurstsalat at 2021-12-02T22:17:58+01:00 NotificationListbox: Improve style - - - - - 61b28007 by wurstsalat at 2021-12-02T22:17:58+01:00 InvivationReceivedRow: Fix getting avatar - - - - - 65faa250 by wurstsalat at 2021-12-02T22:17:58+01:00 Fix declined MUC invitations - - - - - 90d8f048 by lovetox at 2021-12-02T22:17:58+01:00 Fix groupchat creation - - - - - ad889873 by lovetox at 2021-12-02T22:17:58+01:00 Fix destroying MUCs - - - - - f7f4f854 by lovetox at 2021-12-02T22:17:58+01:00 Fix closing the control - - - - - eedc71c9 by wurstsalat at 2021-12-02T22:17:58+01:00 NotificationManager: Fix getting group chat name - - - - - 839f8171 by lovetox at 2021-12-02T22:17:58+01:00 Fix HistorySync - - - - - dd0772d2 by wurstsalat at 2021-12-02T22:17:58+01:00 NotificationManager: Improvements - - - - - d7100a0d by wurstsalat at 2021-12-02T22:17:58+01:00 Improve MUC highlight colors - - - - - 45c1d63e by wurstsalat at 2021-12-02T22:17:58+01:00 SearchView: Disable text selection for result rows - - - - - fbbf0e43 by wurstsalat at 2021-12-02T22:17:58+01:00 Temporarily disable update_text_tags - - - - - 8b0a7425 by wurstsalat at 2021-12-02T22:17:58+01:00 Show Forget Group Chat button only if it's bookmarked - - - - - e958bf43 by wurstsalat at 2021-12-02T22:17:58+01:00 ChatList: Update group chat name after renaming - - - - - 7498155f by wurstsalat at 2021-12-02T22:17:58+01:00 Interface: Remove show_groupchat - - - - - 1465f807 by wurstsalat at 2021-12-02T22:17:58+01:00 Interface: Fix some events - - - - - 3ef41208 by wurstsalat at 2021-12-02T22:17:58+01:00 Fix HTTP Upload tranfsers - - - - - 418d81df by wurstsalat at 2021-12-02T22:17:58+01:00 Contacts: Add back can_notify - - - - - 8b6803a6 by wurstsalat at 2021-12-02T22:19:15+01:00 Events: Linting - - - - - 3beef5be by wurstsalat at 2021-12-02T22:19:16+01:00 Events: Remove unused method - - - - - 7254819c by wurstsalat at 2021-12-02T22:19:16+01:00 ChatControl: Remove group chat invitations from infobar - - - - - 1782d6f2 by wurstsalat at 2021-12-02T22:19:16+01:00 Interface: Remove unused method - - - - - 29fd10a0 by wurstsalat at 2021-12-02T22:19:16+01:00 JingleIncoming: Use event.jid for notifications - - - - - deee8cd1 by wurstsalat at 2021-12-02T22:19:16+01:00 Interface: Linting - - - - - 362c1155 by wurstsalat at 2021-12-02T22:19:16+01:00 Interface: Adapt add_event and handle_event - - - - - 19fff442 by wurstsalat at 2021-12-02T22:19:16+01:00 Interface: Reorder functions and methods - - - - - 36cb241a by wurstsalat at 2021-12-02T22:19:16+01:00 BaseControl: Send chat marker if we're following the chat - - - - - 92edea50 by wurstsalat at 2021-12-02T22:19:16+01:00 ChatMarkers: Fix markers for PMs - - - - - 7683f1ae by wurstsalat at 2021-12-02T22:19:16+01:00 Refactor MUC highlighting - - - - - af6a9117 by wurstsalat at 2021-12-02T22:19:16+01:00 Bring back message notifications - - - - - ce7d328e by wurstsalat at 2021-12-02T22:19:16+01:00 ChatControl: Fix banner spacing for chatstates - - - - - 2f0ddd40 by wurstsalat at 2021-12-02T22:19:16+01:00 BaseControl: Add message event on new message - - - - - a73cab0e by wurstsalat at 2021-12-02T22:19:16+01:00 Events: Remove obsolete UnsubscribedEvent - - - - - 12be6737 by wurstsalat at 2021-12-02T22:19:16+01:00 Events: Remove obsolete SubscriptionRequestEvent - - - - - 11d24690 by wurstsalat at 2021-12-02T22:19:17+01:00 Events: Remove obsolete GcInvitationEvent - - - - - 5699a177 by wurstsalat at 2021-12-02T22:20:02+01:00 Events: Cleanup chat message events - - - - - 40c757fb by wurstsalat at 2021-12-02T22:20:04+01:00 App: Remove obsolete get_groupchat_control - - - - - bb34535c by wurstsalat at 2021-12-02T22:20:04+01:00 Fix Read Markers - - - - - 04a8919c by wurstsalat at 2021-12-02T22:20:04+01:00 Settings: Fix Control handling - - - - - 7775d788 by wurstsalat at 2021-12-02T22:20:04+01:00 Settings: Remove mergeaccounts - - - - - 2cf75c3f by wurstsalat at 2021-12-02T22:20:04+01:00 Preferences: Remove window layout settings - - - - - ed863ca1 by wurstsalat at 2021-12-02T22:20:04+01:00 Preferences: Remove obsolete roster specific settings - - - - - b78bca13 by wurstsalat at 2021-12-02T22:20:04+01:00 ConversationView: Add Call row - - - - - 2ab60d73 by wurstsalat at 2021-12-02T22:20:04+01:00 Refactor Jingle AV into separate widget - - - - - 6a710f47 by wurstsalat at 2021-12-02T22:20:04+01:00 App: Remove unused methods - - - - - d75e5f1a by wurstsalat at 2021-12-02T22:20:04+01:00 Connection Handlers Events: Cleanup and linting - - - - - 97b7fb58 by wurstsalat at 2021-12-02T22:20:04+01:00 Notifications: Use new contacts API for avatar - - - - - 7f29c702 by wurstsalat at 2021-12-02T22:20:05+01:00 RosterItemExchange: FIrst fixes - - - - - fb8a1607 by wurstsalat at 2021-12-02T22:20:05+01:00 ManageSounds: Remove unused sound events - - - - - b85a82ca by wurstsalat at 2021-12-02T22:20:05+01:00 PrivateChatControl: Linting - - - - - 0fd08663 by wurstsalat at 2021-12-02T22:20:05+01:00 GroupChatControl: Remove focus_line_out, linting - - - - - efce47c9 by wurstsalat at 2021-12-02T22:20:05+01:00 ChatControl: Remove roster reference, linting - - - - - 1b5d083b by wurstsalat at 2021-12-02T22:20:05+01:00 BaseControl: Fix PM jingle file transfer warning, linting - - - - - d5b20e07 by lovetox at 2021-12-02T22:20:05+01:00 Contacts: Improve supports() - - - - - 21ca3d06 by wurstsalat at 2021-12-02T22:20:05+01:00 ChatControl: Update actions on presence update - - - - - d6cc9c4a by lovetox at 2021-12-02T22:20:05+01:00 Fix caps update - - - - - dc5a23be by wurstsalat at 2021-12-02T22:20:05+01:00 CallWidget: Ignore jingle file requests - - - - - 76938202 by wurstsalat at 2021-12-02T22:20:05+01:00 Tooltips: Fix FileTransfersTooltip - - - - - 153ceafa by wurstsalat at 2021-12-02T22:20:05+01:00 JingleSession: Don't rely on 'initiator' in session-initiate - - - - - 36c07704 by wurstsalat at 2021-12-02T22:20:05+01:00 Add ResourceSelector widget - - - - - 73a767be by wurstsalat at 2021-12-02T22:20:05+01:00 Interface: Adapt to Contact changes - - - - - e12ebd98 by wurstsalat at 2021-12-02T22:20:05+01:00 Jingle: Remove PM file transfers - - - - - 5273f33f by wurstsalat at 2021-12-02T22:20:05+01:00 Jingle File Transfer: Adapt to Contact changes - - - - - 83e8420c by wurstsalat at 2021-12-02T22:20:05+01:00 ConversationRow: Improve timestamp margin - - - - - 770f58fe by wurstsalat at 2021-12-02T22:20:05+01:00 ChatList: Improve close button margins and transition - - - - - 5a3ade47 by wurstsalat at 2021-12-02T22:20:05+01:00 Fix synchronising contacts - - - - - 341b4683 by wurstsalat at 2021-12-02T22:20:05+01:00 Move TransformChatToMUC to AdhocMUC and adapt to Gajim changes - - - - - 5832e5a2 by wurstsalat at 2021-12-02T22:20:05+01:00 GTK GUI Helpers: Remove unused methods - - - - - 95d22ff6 by wurstsalat at 2021-12-02T22:20:05+01:00 Remove contact context menu - - - - - 4929675c by wurstsalat at 2021-12-02T22:20:05+01:00 BaseControl: Remove obsolete file transfer code - - - - - dc3668ab by wurstsalat at 2021-12-02T22:20:05+01:00 GUI Menu Builder: Add TODOs, remove obsolete code - - - - - 46a38263 by wurstsalat at 2021-12-02T22:20:05+01:00 RosterItemExchange: Fix roster actions - - - - - b771170c by wurstsalat at 2021-12-02T22:20:05+01:00 AdhocMUC: Fixes - - - - - d924a618 by wurstsalat at 2021-12-02T22:20:05+01:00 Add back chat selection via Ctrl(+Shft)+Tab - - - - - 3008be23 by wurstsalat at 2021-12-02T22:20:05+01:00 Fix sending chatstates for window motion-notify-event - - - - - eb8f32be by wurstsalat at 2021-12-02T22:20:05+01:00 Main: Fix chat window actions (close/switch tab) - - - - - 861565aa by wurstsalat at 2021-12-02T22:20:40+01:00 Add back restoring window position, size, visibility - - - - - 3fb609e5 by wurstsalat at 2021-12-02T22:20:42+01:00 Add back X button and taskbar behavior - - - - - 51534cf6 by wurstsalat at 2021-12-02T22:20:42+01:00 Settings: Remove Tab related settings - - - - - f632d061 by wurstsalat at 2021-12-02T22:20:42+01:00 Preferences: Improve status settings (and naming) - - - - - da9366f5 by wurstsalat at 2021-12-02T22:20:42+01:00 Disable Metacontacts by default - - - - - ea3f01b9 by wurstsalat at 2021-12-02T22:20:42+01:00 Settings: Remove 'Show chatstate in tabs' - - - - - d6c483b9 by wurstsalat at 2021-12-02T22:20:42+01:00 Settings: Remove remember_opened_chat_controls - - - - - a8d6cfaf by wurstsalat at 2021-12-02T22:20:42+01:00 Settings: Remove show_contacts_number - - - - - 9fd4bc86 by wurstsalat at 2021-12-02T22:20:42+01:00 Settings: Remove ctrl_tab_go_to_next_composing - - - - - 051286c2 by wurstsalat at 2021-12-02T22:20:42+01:00 ConversationView: Add back chat_merge_consecutive_nickname setting - - - - - a168946e by wurstsalat at 2021-12-02T22:20:42+01:00 Settings: Remove max_conversation_lines - - - - - 1035c5c1 by wurstsalat at 2021-12-02T22:20:42+01:00 GroupChatSettings: Add description for print_status - - - - - fd6edf7d by wurstsalat at 2021-12-02T22:20:42+01:00 Roster: Improve Transport handling - - - - - e22f1fa7 by wurstsalat at 2021-12-02T22:20:42+01:00 GUI Menu Builder: Improve imports - - - - - e6d7bd78 by wurstsalat at 2021-12-02T22:20:42+01:00 Gateway: Fix removing gateway - - - - - 70dd2bb3 by wurstsalat at 2021-12-02T22:20:42+01:00 XMLConsole: Add Disco Info preset - - - - - e54771be by wurstsalat at 2021-12-02T22:20:42+01:00 Discovery: Fix disco_contact - - - - - c8e3dc86 by wurstsalat at 2021-12-02T22:20:42+01:00 Transports: Improve detection and avatars - - - - - e37ff78c by wurstsalat at 2021-12-02T22:20:42+01:00 GroupchatJoin: Fix joining a chat - - - - - eea7b3a2 by wurstsalat at 2021-12-02T22:21:23+01:00 AddContact: Use assistant - - - - - da4f3ffe by wurstsalat at 2021-12-02T22:21:28+01:00 AddContact: Consider subscription-required - - - - - 2e376aa1 by wurstsalat at 2021-12-02T22:21:28+01:00 GroupChatInfoScrolled: Style improvements - - - - - 0fe23a98 by wurstsalat at 2021-12-02T22:21:28+01:00 AddContact: Improve gateway register/command flow - - - - - de1189c3 by wurstsalat at 2021-12-02T22:21:28+01:00 ServiceRegistration: Add line wrap for error text - - - - - f167687c by wurstsalat at 2021-12-02T22:21:28+01:00 AddContact: Consider other services - - - - - e847825a by wurstsalat at 2021-12-02T22:21:28+01:00 AddContact: Improve gateway name/type handling - - - - - 14d7ec80 by wurstsalat at 2021-12-02T22:21:28+01:00 ContactInfo: Use 'Share Status' in label - - - - - 30a18d6f by wurstsalat at 2021-12-02T22:21:28+01:00 AddContact: App action improvements - - - - - 1becd11b by wurstsalat at 2021-12-02T22:21:28+01:00 AddContact: Fix account handling - - - - - 9ddbfd2e by wurstsalat at 2021-12-02T22:21:28+01:00 Roster: Improve gateway menu - - - - - 8bb66976 by wurstsalat at 2021-12-02T22:21:28+01:00 Interface: Replace 'show_or_join_groupchat' - - - - - 71fb6dfe by wurstsalat at 2021-12-02T22:21:28+01:00 AddContact: Make jid public for window management - - - - - 069fa198 by wurstsalat at 2021-12-02T22:21:28+01:00 ChatList: Update unread count when removing row - - - - - 21efef98 by wurstsalat at 2021-12-02T22:21:28+01:00 ServiceRegistration: Use window const - - - - - 24ff307c by wurstsalat at 2021-12-02T22:21:28+01:00 Settings: Remove use_transports_iconsets - - - - - fa32c703 by wurstsalat at 2021-12-02T22:21:28+01:00 Helpers: Remove obsolete get_icon_name_to_show - - - - - 7d046909 by wurstsalat at 2021-12-02T22:21:28+01:00 Remove remnants of minimizable controls - - - - - cffd524c by wurstsalat at 2021-12-02T22:21:28+01:00 Chat Controls: Remove contact drag and drop for now - - - - - fc50eb94 by wurstsalat at 2021-12-02T22:21:28+01:00 Interface: Remove roster remnants - - - - - 030a35fc by wurstsalat at 2021-12-02T22:21:28+01:00 Helpers: Remove obsolete methods - - - - - d18dc2c2 by wurstsalat at 2021-12-02T22:21:28+01:00 Helpers: Fix ignore_contact - - - - - 27de264b by wurstsalat at 2021-12-02T22:21:28+01:00 ServiceDiscoveryWindow: Fix detecting gateway - - - - - 2d11fe3a by wurstsalat at 2021-12-02T22:21:28+01:00 ZeroconfVcardWindow: Move to gtk folder - - - - - 4d85e28c by wurstsalat at 2021-12-02T22:21:28+01:00 Remove Zeroconf context menu All options this menu offers would fit on an account page - - - - - 8e14ebc4 by wurstsalat at 2021-12-02T22:21:28+01:00 App menu: Remove 'Show Roster' and 'Show Transports' - - - - - bc18a831 by wurstsalat at 2021-12-02T22:21:28+01:00 Accounts: Add option for publishing current Media Playback - - - - - 8e9e6b9d by wurstsalat at 2021-12-02T22:21:28+01:00 Interface: Disable publishing location permanently - - - - - f8aef41e by wurstsalat at 2021-12-02T22:21:28+01:00 Remove obsolete account_context_menu.ui - - - - - c7e7bf2c by wurstsalat at 2021-12-02T22:23:01+01:00 StartChat: Discover new chat type automatically - - - - - f4502e2e by wurstsalat at 2021-12-02T22:23:02+01:00 Remove obsolete roster_window.ui - - - - - f2b21e4f by wurstsalat at 2021-12-02T22:23:02+01:00 StartChat: Add disco timeout and handle disconnected account - - - - - aad69ab4 by wurstsalat at 2021-12-02T22:23:02+01:00 StartChat: Rename new row to 'Start New Chat' - - - - - ae4d64ca by wurstsalat at 2021-12-02T22:23:02+01:00 Interface: (Re)Introduce start_chat_from_jid - - - - - 932647f2 by wurstsalat at 2021-12-02T22:23:02+01:00 StartChat: Improve no disco info handling - - - - - f50f5b18 by wurstsalat at 2021-12-02T22:23:02+01:00 StartChat: Fix bad indentation - - - - - 8a7aef90 by wurstsalat at 2021-12-02T22:23:02+01:00 GajimRemote: Adapt to changes in contact API - - - - - e3d29d4a by wurstsalat at 2021-12-02T22:23:02+01:00 CommandSystem: Adapt to new contacts API - - - - - ee90aac9 by wurstsalat at 2021-12-02T22:23:42+01:00 Interface: Cleanup, add TODOs - - - - - 8587575c by wurstsalat at 2021-12-02T22:23:44+01:00 AppActions: Remove reference to msg_win_mgr - - - - - 69eca1de by wurstsalat at 2021-12-02T22:23:44+01:00 PrivateControl: Remove refenrece to old contacts API - - - - - b44f209f by wurstsalat at 2021-12-02T22:23:44+01:00 Ping: Remove reference to old contacts API - - - - - 84cbfc97 by wurstsalat at 2021-12-02T22:23:44+01:00 Bytestream: Remove reference to old contacts API - - - - - 80bf3088 by wurstsalat at 2021-12-02T22:23:44+01:00 ChatCommandProcessor: Remove reference to old contacts API - - - - - 9f0df459 by wurstsalat at 2021-12-02T22:23:44+01:00 Remove old roster references - - - - - e1f76cf3 by wurstsalat at 2021-12-02T22:23:44+01:00 SynchronizeAccounts: Rewrite dialog - - - - - 03cbab7d by wurstsalat at 2021-12-02T22:23:44+01:00 Interface: Remove obsolete instances - - - - - 5e6806da by wurstsalat at 2021-12-02T22:23:44+01:00 AdhocMUC: Rework - - - - - 3b4956e5 by wurstsalat at 2021-12-02T22:23:44+01:00 SearchView: Connect edge-reached signal - - - - - 28cb24a7 by wurstsalat at 2021-12-02T22:23:44+01:00 Add setting for XEP-0258 Security Labels - - - - - fa88f819 by wurstsalat at 2021-12-02T22:23:44+01:00 Interface: Fix handling message URIs without message - - - - - 3f570cf1 by wurstsalat at 2021-12-02T22:23:44+01:00 Remove obsolete ConversationTextview - - - - - cc8427a1 by wurstsalat at 2021-12-02T22:23:44+01:00 MessageTextview: Fix context menu and clean up handlers - - - - - a597d7ca by wurstsalat at 2021-12-02T22:23:44+01:00 Sidebar: Use selection sidebar throughout all sidebar elements - - - - - d6906f18 by wurstsalat at 2021-12-02T22:23:44+01:00 Events: Retract events when disabling account - - - - - d58634f8 by wurstsalat at 2021-12-02T22:23:44+01:00 SearchView: Imrprove Revealer behavior - - - - - 81b2f711 by wurstsalat at 2021-12-02T22:23:44+01:00 Events: Actually retract events when disabling account - - - - - f6a8f5a2 by wurstsalat at 2021-12-02T22:23:44+01:00 Interface: Remove obsolete handle_event_roster_info - - - - - 00f4f7ce by wurstsalat at 2021-12-02T22:23:44+01:00 Remove obsolete instances - - - - - 75b24baf by wurstsalat at 2021-12-02T22:23:44+01:00 Interface: Code linting - - - - - c44590f1 by wurstsalat at 2021-12-02T22:23:44+01:00 Preferences: Move 'sort by show' to roster menu - - - - - 3164e32f by wurstsalat at 2021-12-02T22:23:44+01:00 Settings: Remove show_{mood,tune,location,activity}_in_roster They are still shown in the chat control banner - - - - - 6371c04c by wurstsalat at 2021-12-02T22:23:44+01:00 App: Remove get_name_from_jid - - - - - 555e4c77 by wurstsalat at 2021-12-02T22:24:07+01:00 App: Remove get_our_jids - - - - - 95e97e49 by wurstsalat at 2021-12-02T22:24:09+01:00 App: Remove get_resource_from_jid - - - - - a4d5dfd3 by wurstsalat at 2021-12-02T22:24:09+01:00 App: Remove get_name_and_server_from_jid - - - - - 556e868f by wurstsalat at 2021-12-02T22:24:09+01:00 App: Remove get_nick_from_jid - - - - - 06031b7a by wurstsalat at 2021-12-02T22:24:09+01:00 App: Remove get_an_id - - - - - 5bbcb73b by wurstsalat at 2021-12-02T22:24:09+01:00 Dialogs: Remove obsolete TimeoutWindow - - - - - dd01b403 by wurstsalat at 2021-12-02T22:24:09+01:00 gtk_gui_helpers: Remove duplicate scale_with_ratio - - - - - 464230e3 by wurstsalat at 2021-12-02T22:24:09+01:00 gtk_gui_helpers: Move pixbuf helpers to util - - - - - 364efd90 by wurstsalat at 2021-12-02T22:24:09+01:00 Remove gtk_gui_helpers Functions were either obsolete, or have been moved to common/helpers or gtk/util - - - - - 2bafc7cb by wurstsalat at 2021-12-02T22:24:09+01:00 Preferences: Remove iconset setting - - - - - 12a6bb32 by wurstsalat at 2021-12-02T22:24:09+01:00 Settings: Remove show_avatars_in_roster - - - - - 1f9b63f4 by wurstsalat at 2021-12-02T22:24:09+01:00 Settings: Remove avatar_position_in_roster - - - - - 5b28a0d9 by wurstsalat at 2021-12-02T22:24:09+01:00 Settings: Remove roster_on_the_right - - - - - 47831771 by wurstsalat at 2021-12-02T22:24:09+01:00 Settings: Add show_notifications_away - - - - - f21fc89a by wurstsalat at 2021-12-02T22:24:47+01:00 Events: Remove systray dependency StatusIcon now connects to unread counter - - - - - 8bd97852 by wurstsalat at 2021-12-02T22:24:48+01:00 ChatControl: Remove unused variable - - - - - 01a9816e by wurstsalat at 2021-12-02T22:24:48+01:00 Jingle File Transfer: Rework GUI handling - - - - - 4f74c740 by wurstsalat at 2021-12-02T22:24:48+01:00 StatusIcon: Fix update_icon - - - - - 55a02053 by wurstsalat at 2021-12-02T22:24:48+01:00 Events: Remove file transfer events - - - - - db9ec3e8 by wurstsalat at 2021-12-02T22:24:48+01:00 ChatControl: Remove info bar - - - - - aed4406d by wurstsalat at 2021-12-02T22:24:48+01:00 Settings: Remove autopopup* - - - - - 3bf0bc04 by wurstsalat at 2021-12-02T22:24:48+01:00 GroupChatInfo: Reduce displayed address length - - - - - 5f38ab54 by wurstsalat at 2021-12-02T22:24:48+01:00 Rework 'mark as read' mechanism - - - - - 7384267a by wurstsalat at 2021-12-02T22:24:48+01:00 Chat Markers: Fix read state sync - - - - - d72a6bf9 by wurstsalat at 2021-12-02T22:24:48+01:00 Events: Remove usage of chat message events - - - - - 05ab2e10 by wurstsalat at 2021-12-02T22:24:48+01:00 Remove obsolete common/events.py - - - - - 42498c14 by wurstsalat at 2021-12-02T22:24:48+01:00 Main Window: Simplify _on_window_delete() - - - - - 633b4c61 by wurstsalat at 2021-12-02T22:24:48+01:00 Remove obsolete app.last_message_time - - - - - fa1c1218 by wurstsalat at 2021-12-02T22:24:48+01:00 Notifications: Simplify message notifications - - - - - 8655e98c by wurstsalat at 2021-12-02T22:24:48+01:00 Rework notification system - - - - - 3c755dea by wurstsalat at 2021-12-02T22:24:48+01:00 Themes: Fix highlight on mention for light/dark theme - - - - - 7c6b732a by wurstsalat at 2021-12-02T22:24:48+01:00 Themes: Adapt search highlight color for light/dark theme - - - - - c0714230 by wurstsalat at 2021-12-02T22:24:48+01:00 Don't fail if sound event is None - - - - - 92dfb700 by wurstsalat at 2021-12-02T22:24:48+01:00 ConversationView: Add message merge rule for encryption - - - - - 3a3240ea by wurstsalat at 2021-12-02T22:24:48+01:00 ConversationView: Add border radius to conversation rows - - - - - 38fb55e7 by wurstsalat at 2021-12-02T22:24:48+01:00 Remove 'Show next pending event' desktop action - - - - - 34e8c564 by wurstsalat at 2021-12-02T22:24:48+01:00 ChatControl: Fix processing PMs - - - - - 0336d2eb by wurstsalat at 2021-12-02T22:24:48+01:00 Main: Don’t open control for chatstates etc. - - - - - b8df3dc9 by wurstsalat at 2021-12-02T22:24:48+01:00 NotificationManager: Fix tray notifications - - - - - dfc7cd15 by wurstsalat at 2021-12-02T22:24:48+01:00 Notifications: Fix getting icon - - - - - e4688ab4 by wurstsalat at 2021-12-02T22:24:48+01:00 Tooltips: Add gui extension point for contact resources - - - - - feaa1c6d by wurstsalat at 2021-12-02T22:24:48+01:00 GCTooltip: Remove show - - - - - 4166a638 by wurstsalat at 2021-12-02T22:24:48+01:00 Groupchat: Implement click avatar to mention - - - - - 385fef5f by wurstsalat at 2021-12-02T22:24:48+01:00 AddContact: Always show Add button - - - - - d64b39da by wurstsalat at 2021-12-02T22:24:48+01:00 Main: Use first workspace for adding chat if nothing selected - - - - - 38902082 by wurstsalat at 2021-12-02T22:24:48+01:00 JumpToEndButton: Don't show_all when restoring window - - - - - 38a52df4 by wurstsalat at 2021-12-02T22:24:48+01:00 GroupchatState: Don't show_all when restoring window - - - - - 0d75825f by wurstsalat at 2021-12-02T22:24:48+01:00 ChatList: PM improvements - - - - - 3b4e06ad by wurstsalat at 2021-12-02T22:24:48+01:00 ChatListStack: Fix moving chats - - - - - f81c9086 by wurstsalat at 2021-12-02T22:24:48+01:00 ChatList: Fix search for Note to myself - - - - - c60303ee by wurstsalat at 2021-12-02T22:24:48+01:00 Status widgets: Don’t fail on deactivating account - - - - - 70941dda by wurstsalat at 2021-12-02T22:24:48+01:00 ReadMarkerRow: Update on nickname change - - - - - 0232aaca by wurstsalat at 2021-12-02T22:24:48+01:00 ChatList: Improve sorting - - - - - 1a10f99f by wurstsalat at 2021-12-02T22:24:48+01:00 Notification: Use better fallback icon - - - - - e596fb25 by wurstsalat at 2021-12-02T22:24:48+01:00 StatusIcon: Use new icon for pending events - - - - - 346b485c by wurstsalat at 2021-12-02T22:24:48+01:00 Notifications: Allow plugins to suppress notifications - - - - - 3a3db61b by wurstsalat at 2021-12-02T22:24:48+01:00 Fix Command System output - - - - - 5fd57043 by wurstsalat at 2021-12-02T22:24:48+01:00 Remove obsolete NotificationEvent - - - - - 0ea14f1d by wurstsalat at 2021-12-02T22:24:48+01:00 GroupchatControl: Remove old Contact remnant - - - - - aa805726 by wurstsalat at 2021-12-02T22:24:48+01:00 ConversationView: Improve Command Output - - - - - 32d07374 by wtas at 2021-12-02T22:24:48+01:00 Fix display bug and clean up code - - - - - 81422d72 by wtas at 2021-12-02T22:24:48+01:00 SearchView: Implement search filters - - - - - b9ed97e4 by wurstsalat at 2021-12-02T22:24:48+01:00 CSS: Remove row backdrop transition (performance) - - - - - 94a01aea by wurstsalat at 2021-12-02T22:24:48+01:00 StatusIcon: Remove superfluous show_all - - - - - c6f4eb10 by wurstsalat at 2021-12-02T22:24:49+01:00 ChatList: Use MAM timestamp for MAM messages - - - - - 17f1b127 by wurstsalat at 2021-12-02T22:24:49+01:00 ChatList: Don't use idle_add for set_message_text - - - - - cf3ca811 by wurstsalat at 2021-12-02T22:24:49+01:00 Rework Password dialog - - - - - ddca1a2c by André Apitzsch at 2021-12-02T22:24:49+01:00 KEYRING_AVAILABLE: Only depend on selected backend Passwords can only be stored if the selected backend is recommended. - - - - - 390c99f9 by André Apitzsch at 2021-12-02T22:24:49+01:00 Enable "save password" only if password is storable - - - - - 0fd464e7 by wurstsalat at 2021-12-02T22:24:49+01:00 ConversationView: Show read marker row when loading from DB - - - - - 9ce1fa4b by wurstsalat at 2021-12-02T22:24:49+01:00 ChatStack: Reset ConversationView when switching Control - - - - - 28294ff5 by wurstsalat at 2021-12-02T22:24:49+01:00 ConversationView: Read marker improvements - - - - - 647e6fdc by wurstsalat at 2021-12-02T22:24:49+01:00 ChatStack: Reset active control when removing it - - - - - 7e6d71c3 by wurstsalat at 2021-12-02T22:24:49+01:00 Jingle File Transfers: Store and load transfer events from DB - - - - - 4f1080e4 by wurstsalat at 2021-12-02T22:24:49+01:00 Interface: Use present_with_time to show main window - - - - - 245472a7 by wurstsalat at 2021-12-02T22:24:49+01:00 Workspace: Add removal confirmation - - - - - 07a60d43 by wurstsalat at 2021-12-02T22:24:49+01:00 ChatList: Show move to workspace only if we have more than one - - - - - fd807706 by wurstsalat at 2021-12-02T22:24:49+01:00 AV: Fix notification - - - - - 531aee6b by wurstsalat at 2021-12-02T22:24:49+01:00 Calls: Store and load events from DB - - - - - fda2b592 by wurstsalat at 2021-12-02T22:24:49+01:00 Control: Reset active control when unselecting chat - - - - - a959c129 by wurstsalat at 2021-12-02T22:24:49+01:00 CallRow: Update row correctly - - - - - 725cef60 by wurstsalat at 2021-12-02T22:24:49+01:00 Revert "Control: Reset active control when unselecting chat" This reverts commit d4f2d9f4843e7c1adf175fe32509e14010e48df1. - - - - - d94a2bd0 by wurstsalat at 2021-12-02T22:24:49+01:00 CallRow: Reset session after update - - - - - 0fc6090d by wurstsalat at 2021-12-02T22:24:49+01:00 Differentiate between incoming/outgoing file transfers/calls - - - - - 4047f431 by wurstsalat at 2021-12-02T22:24:49+01:00 Remove remnant of ShowNextPendingEvent action - - - - - e7809ba2 by wurstsalat at 2021-12-02T22:24:49+01:00 FileTransferJingleRow: Display receiver/sender meta data - - - - - 303e58d1 by wurstsalat at 2021-12-02T22:24:49+01:00 CallRow: Display receiver/sender meta data - - - - - 8ade79ff by wurstsalat at 2021-12-02T22:24:49+01:00 ChatList: Handle incoming calls and jingle file transfer requests - - - - - aaddeded by wurstsalat at 2021-12-02T22:24:49+01:00 Set chatstate when selecting chats - - - - - cd8d870a by lovetox at 2021-12-02T22:24:49+01:00 Fix Import - - - - - 7277c5f3 by wurstsalat at 2021-12-02T22:24:49+01:00 Theme: Improve chatlist for both light and dark themes - - - - - c15a8f3a by wurstsalat at 2021-12-02T22:24:49+01:00 ChatList: Unread counter improvements - - - - - 21ac21e9 by wurstsalat at 2021-12-02T22:24:49+01:00 Imrpove Note to myself feature - - - - - 7bf7e01f by wurstsalat at 2021-12-02T22:24:49+01:00 ChatList: Don't update time if there is no valid timestamp - - - - - f0214295 by wurstsalat at 2021-12-02T22:26:43+01:00 GroupChat: Add check for IRC - - - - - b48db8fe by wurstsalat at 2021-12-02T22:26:50+01:00 Avatar: Fix non-square images - - - - - b5f531a4 by wurstsalat at 2021-12-02T22:26:50+01:00 ChatList: Properly split newlines - - - - - 9d12b13d by wurstsalat at 2021-12-02T22:26:50+01:00 Util: Typing - - - - - 2a4b4699 by wurstsalat at 2021-12-02T22:26:50+01:00 PreviewHelpers: Typing - - - - - db4e5830 by wurstsalat at 2021-12-02T22:26:50+01:00 Gajim: Fix typo in _install_signal_handlers - - - - - 6de1bb6a by wurstsalat at 2021-12-02T22:26:50+01:00 Theming: Fix setting Conversation color - - - - - 9c3cc3b2 by wurstsalat at 2021-12-02T22:26:50+01:00 Theming: Remove gajim-{incoming,outgoing}-message-text - - - - - 8de53ae5 by wurstsalat at 2021-12-02T22:26:50+01:00 Themes: Adapt roster styling - - - - - 8e6fca4d by wurstsalat at 2021-12-02T22:26:50+01:00 Themes: Rename options - - - - - 6e6a4b5f by wurstsalat at 2021-12-02T22:26:50+01:00 Themes: Remove chatstate colors - - - - - 49a8c306 by wurstsalat at 2021-12-02T22:26:50+01:00 Themes: Remove contact connected/disconnected color - - - - - 973c0d41 by wurstsalat at 2021-12-02T22:26:50+01:00 Themes: Remove tab-*muc-msg color - - - - - 14fe8c2b by wurstsalat at 2021-12-02T22:26:50+01:00 Themes: Reorder style options - - - - - 19fa3bc8 by wurstsalat at 2021-12-02T22:26:50+01:00 Refactor 'Actions for' context menu - - - - - 4788f79c by wurstsalat at 2021-12-02T22:26:50+01:00 Menu Builder: Use f-strings - - - - - 540f6190 by wurstsalat at 2021-12-02T22:26:50+01:00 Menu Builder: Typing - - - - - 33cf4b40 by wurstsalat at 2021-12-02T22:26:50+01:00 URI: Use NamedTuple - - - - - 362b8862 by wurstsalat at 2021-12-02T22:26:50+01:00 Helpers: Typing - - - - - 30c57855 by wurstsalat at 2021-12-02T22:26:50+01:00 Util: Typing - - - - - c5781fdb by wurstsalat at 2021-12-02T22:26:50+01:00 Menu Builder: Typing - - - - - 0594e8a3 by wurstsalat at 2021-12-02T22:26:50+01:00 Preview Helpers: Typing - - - - - 3d1626df by wurstsalat at 2021-12-02T22:26:50+01:00 Preview Helpers: Typing - - - - - 1bf31a5a by wurstsalat at 2021-12-02T22:26:50+01:00 Preview: Typing - - - - - 9c4f79a0 by wurstsalat at 2021-12-02T22:26:50+01:00 Conversation: Use Gtk.TextView on Windows, else Gtk.Label - - - - - 62cb7894 by wurstsalat at 2021-12-02T22:26:50+01:00 PlainWidget: Typing - - - - - a37d1c62 by wurstsalat at 2021-12-02T22:26:50+01:00 Add GtkSource4 dependency - - - - - ca8b680b by wurstsalat at 2021-12-02T22:26:50+01:00 GroupchatControl: Improve Kick/Ban - - - - - dcdc06fa by wurstsalat at 2021-12-02T22:26:50+01:00 Add XEP-0425: Message Moderation - - - - - 6014f574 by wurstsalat at 2021-12-02T22:26:50+01:00 BaseControl: Linting - - - - - cf3ed099 by wurstsalat at 2021-12-02T22:26:50+01:00 Remove unused subject arg from add_message - - - - - 9d98bb1f by wurstsalat at 2021-12-02T22:26:50+01:00 EmojiChooser: Don’t show_all show_all() pops up the Popover when starting Gajim on Windows - - - - - c5dcf2a7 by wurstsalat at 2021-12-02T22:26:50+01:00 Search: Fix missing stanza_id while adding messages - - - - - 79f7d396 by wurstsalat at 2021-12-02T22:26:50+01:00 ChatList: Set stanza_id correctly when receiving MAM messages - - - - - 217a8c8c by wurstsalat at 2021-12-02T22:26:50+01:00 Don't fail if active workspace is None - - - - - 54c5b24c by wurstsalat at 2021-12-02T22:26:50+01:00 Notifications: Suppress for MAM messages - - - - - f0b6d27a by wurstsalat at 2021-12-02T22:26:50+01:00 StatusSelector: Determine show correctly for account - - - - - 767cd908 by wurstsalat at 2021-12-02T22:26:50+01:00 StartChat: Add 'Forget this Group Chat' menu action - - - - - dd2d0f32 by wurstsalat at 2021-12-02T22:26:50+01:00 StartChat: Remove history when forgetting group chat - - - - - e2beeb4e by wurstsalat at 2021-12-02T22:26:50+01:00 App menu: Remove show-offline/show-active - - - - - dc4850a4 by wurstsalat at 2021-12-02T22:26:50+01:00 Account: Make Login setting accessible Sensitive text is not clickable, which leads to confusion - - - - - 605f7f5a by wurstsalat at 2021-12-02T22:26:50+01:00 ChatList: Don’t fail on missing stanza_id - - - - - 46559841 by wurstsalat at 2021-12-02T22:26:51+01:00 WorkspaceSidebar: Set Scrolled background to transparent - - - - - 101d7b99 by wurstsalat at 2021-12-02T22:26:51+01:00 Notifications: Display file type and file name - - - - - a5432364 by wurstsalat at 2021-12-02T22:26:51+01:00 PreviewManager: Rename get_previewable - - - - - 8f0091b0 by wurstsalat at 2021-12-02T22:26:51+01:00 Allow multiple corrections of last message - - - - - 1e2f7e4b by wurstsalat at 2021-12-02T22:26:51+01:00 ChatList: Typing - - - - - 6b95fea2 by wurstsalat at 2021-12-02T22:26:51+01:00 ChatListStack: Typing - - - - - 085cb434 by wurstsalat at 2021-12-02T22:26:51+01:00 ChatPage: Typing - - - - - e21258d7 by wurstsalat at 2021-12-02T22:26:51+01:00 MainStack: Typing - - - - - f2b9015d by wurstsalat at 2021-12-02T22:26:51+01:00 Main: Typing - - - - - 503b522b by wurstsalat at 2021-12-02T22:26:51+01:00 Respect types for app.window methods - - - - - 95c6364e by wurstsalat at 2021-12-02T22:26:51+01:00 Add typing for getting Controls - - - - - 5f82858a by wurstsalat at 2021-12-02T22:26:51+01:00 Settings: Add missing return types - - - - - a8548946 by wurstsalat at 2021-12-02T22:26:51+01:00 AddContact: Typing - - - - - 90571b35 by wurstsalat at 2021-12-02T22:26:51+01:00 Add message to Control if it's loaded This avoids messages not being added to a conversation when switching to another workspace, then switching back to the same chat. - - - - - 800c07d7 by wurstsalat at 2021-12-02T22:26:51+01:00 Preview: Typing - - - - - 75a973d8 by wurstsalat at 2021-12-02T22:26:51+01:00 Remote: Add TODO - - - - - 00bda00a by wurstsalat at 2021-12-02T22:26:51+01:00 Store message corrections in database Original text is preserved in additional_data, message text is overwritten with corrected text. - - - - - 95ed3a6a by wurstsalat at 2021-12-02T22:26:51+01:00 StatusIcon: Make use of libappindicator configurable - - - - - 3d31a4b9 by wurstsalat at 2021-12-02T22:26:51+01:00 ScrolledView: Typing - - - - - 8fbc9840 by wurstsalat at 2021-12-02T22:26:51+01:00 Types: Add ConversationRowType - - - - - e7c77ab5 by wurstsalat at 2021-12-02T22:26:51+01:00 Conversation Rows: Typing - - - - - d9c3b905 by wurstsalat at 2021-12-02T22:26:51+01:00 ConversationView: Typing - - - - - f7afe346 by wurstsalat at 2021-12-02T22:26:51+01:00 Conversation Widgets: Typing - - - - - b8502dda by wurstsalat at 2021-12-02T22:26:51+01:00 Chat Controls: Use ControlType for typing - - - - - db90d04c by wurstsalat at 2021-12-02T22:26:51+01:00 AccountPage: Typing - - - - - f5707683 by wurstsalat at 2021-12-02T22:26:51+01:00 AccountSideBar: Typing - - - - - 4684789e by wurstsalat at 2021-12-02T22:26:51+01:00 Helpers: Fix missing import + linting - - - - - 71ab68d8 by wurstsalat at 2021-12-02T22:26:51+01:00 CodeWidget: Fix missing imports - - - - - fea0ab0f by wurstsalat at 2021-12-02T22:26:51+01:00 Types: Prevent circular imports - - - - - e233c628 by wurstsalat at 2021-12-02T22:26:51+01:00 MessageRow: Fix unknown type - - - - - d328e4df by wurstsalat at 2021-12-02T22:26:51+01:00 QuoteWidget: Remove typing - - - - - 4b339f4b by wurstsalat at 2021-12-02T22:26:51+01:00 ResourceSelector: Typing - - - - - 18d1c1e8 by wurstsalat at 2021-12-02T22:26:51+01:00 WorkspaceDialog: Typing - - - - - 1d47ae24 by wurstsalat at 2021-12-02T22:26:51+01:00 AvatarSelector: Typing - - - - - 4bc8ee57 by wurstsalat at 2021-12-02T22:26:51+01:00 Chat Controls: Use f-strings - - - - - 76ae9e22 by wurstsalat at 2021-12-02T22:26:51+01:00 Use Direction Enum for selection next chat - - - - - 94387f54 by wurstsalat at 2021-12-02T22:26:51+01:00 BaseControl: Typing - - - - - fa24df99 by wurstsalat at 2021-12-02T22:26:51+01:00 ChatControl: Typing - - - - - 16fa203b by wurstsalat at 2021-12-02T22:26:51+01:00 PrivateChatControl: Typring - - - - - eecb996d by wurstsalat at 2021-12-02T22:26:51+01:00 GroupchatControl: Typing - - - - - c7ba4273 by wurstsalat at 2021-12-02T22:26:51+01:00 BaseControl: Remove obsolete method - - - - - 18db7f21 by wurstsalat at 2021-12-02T22:26:51+01:00 Windows build: Add gstreamer deps - - - - - 039b52c7 by wurstsalat at 2021-12-02T22:26:51+01:00 Uninstaller: Wait for user to quit Gajim - - - - - f1644304 by wurstsalat at 2021-12-02T22:26:51+01:00 Base: Remove type checking for Gspell for now - - - - - 1c848972 by wurstsalat at 2021-12-02T22:26:51+01:00 MessageInputTextView: Typing - - - - - 31025609 by wurstsalat at 2021-12-02T22:26:51+01:00 Dialogs: Typing - - - - - c1d40556 by wurstsalat at 2021-12-02T22:26:51+01:00 Move CertificateDialog - - - - - 02ee6a8e by wurstsalat at 2021-12-02T22:26:51+01:00 Readme: Update dependencies - - - - - 4e419eb4 by wurstsalat at 2021-12-02T22:26:51+01:00 Windows Build: Remove obsolete URL Image Preview plugin - - - - - c6edc3b0 by wurstsalat at 2021-12-02T22:26:51+01:00 Main: Linting - - - - - 67425a3b by wurstsalat at 2021-12-02T22:29:15+01:00 AccountWizard: Typing - - - - - 9e7e4cbb by wurstsalat at 2021-12-02T22:29:18+01:00 SSLErrorDialog: Typing - - - - - 6dfc4020 by wurstsalat at 2021-12-02T22:29:18+01:00 CreateGroupchatWindow: Typing - - - - - 10f9e898 by wurstsalat at 2021-12-02T22:29:18+01:00 Interface: Typing - - - - - b586588b by wurstsalat at 2021-12-02T22:29:18+01:00 Avatar: Add convert_to_greyscale - - - - - ce8caba3 by wurstsalat at 2021-12-02T22:29:18+01:00 Main: Add header - - - - - 56de0b27 by wurstsalat at 2021-12-02T22:29:18+01:00 Add silent unread markers - - - - - 68a34ac3 by wurstsalat at 2021-12-02T22:29:18+01:00 Improve unread counter behavior - - - - - 3ddbf386 by wurstsalat at 2021-12-02T22:29:18+01:00 Fix issue with activating window - - - - - 535ffa30 by wurstsalat at 2021-12-02T22:29:18+01:00 Installer: Automatically detect and offer to 'upgrade' previous version - - - - - 70456758 by wurstsalat at 2021-12-02T22:29:18+01:00 Portable Installer: Improve cleanup - - - - - 1c17a621 by lovetox at 2021-12-02T22:29:18+01:00 Fix get_active_accounts() - - - - - 07c8c6b3 by lovetox at 2021-12-02T22:29:18+01:00 Fix add_contact() - - - - - a816184b by wurstsalat at 2021-12-02T22:29:18+01:00 Fix Add contact for Chatlist and MUC roster - - - - - 796182e4 by Daniel Brötzmann at 2021-12-02T22:29:18+01:00 GroupchatRoster: Correctly get real jid for menu - - - - - e48851b4 by wurstsalat at 2021-12-02T22:29:18+01:00 ContactInfo: Add JID label - - - - - ac89c4f4 by wurstsalat at 2021-12-02T22:29:18+01:00 VCardGrid: Don’t set min width for scrolled textview This avoids an un-centered layout of widgets - - - - - 43d2e6a2 by wurstsalat at 2021-12-02T22:29:18+01:00 AppPage: Improve layout - - - - - 71e31093 by wurstsalat at 2021-12-02T22:29:18+01:00 Actions: Remove move-tab-{up,down} - - - - - 446d2de4 by wurstsalat at 2021-12-02T22:29:18+01:00 Shortcuts: Remove obsolete shortcuts - - - - - 49523c73 by lovetox at 2021-12-02T22:38:15+01:00 Fix unused imports - - - - - d006a722 by lovetox at 2021-12-02T22:44:07+01:00 Adpat to refactored code - - - - - 80117dc6 by lovetox at 2021-12-02T23:54:40+01:00 Remove old contacts module - - - - - a49544fb by lovetox at 2021-12-02T23:54:49+01:00 Remove metacontacts implementation - - - - - 9c0376d7 by lovetox at 2021-12-02T23:54:49+01:00 Fix linting errors - - - - - d64e2b83 by wurstsalat at 2021-12-03T21:54:57+01:00 ChatList: Mark chat as non-silent if mentioned - - - - - 94a22d4a by wurstsalat at 2021-12-03T21:54:57+01:00 Notifications: Issue notification if silent but mentioned - - - - - c998fadb by wurstsalat at 2021-12-03T21:57:54+01:00 Require correct version of GtkSource - - - - - 6e608ce7 by wurstsalat at 2021-12-03T23:28:10+01:00 ChatList: Fix unread count for single chat - - - - - 540d2996 by lovetox at 2021-12-04T15:34:24+01:00 Fix tests Remove all broken tests - - - - - c7396358 by lovetox at 2021-12-04T16:12:04+01:00 Fix comment typos - - - - - acd15d2d by lovetox at 2021-12-04T20:38:37+01:00 ConfigPaths: Improve type annotations - - - - - 45b15ad1 by lovetox at 2021-12-04T20:39:02+01:00 Update mypy.ini - - - - - 484bd682 by lovetox at 2021-12-04T21:30:21+01:00 Preview: Improve type annotations - - - - - 15 changed files: - README.md - data/gajim.doap - data/org.gajim.Gajim.desktop.in - gajim/app_actions.py - gajim/application.py - − gajim/chat_control.py - gajim/command_system/implementation/middleware.py - gajim/command_system/implementation/standard.py - gajim/common/app.py - gajim/common/client.py - gajim/common/config.py - gajim/common/configpaths.py - − gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/const.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8dc8cfbfa8d4ddf111c68495febb91a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8dc8cfbfa8d4ddf111c68495febb91a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Preview: Improve type annotations
by Philipp Hörist (＠lovetox) 04 Dec '21

04 Dec '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 484bd682 by lovetox at 2021-12-04T21:30:21+01:00 Preview: Improve type annotations - - - - - 2 changed files: - gajim/common/preview.py - gajim/common/preview_helpers.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -308,6 +308,7 @@ def _on_orig_load_finished(self, def _on_thumb_load_finished(data: Optional[bytes], error: Gio.AsyncResult, preview: Preview) -> None: + if preview.thumb_path is None or preview.orig_path is None: return @@ -326,6 +327,11 @@ def _on_thumb_load_finished(data: Optional[bytes], preview.thumb_path.name, err) return + + if pixbuf is None: + log.error('Unable to load pixbuf') + return + preview.update_widget(data=pixbuf) def download_content(self, @@ -461,4 +467,9 @@ def _on_thumb_write_finished(_result: bool, preview.thumb_path.name, err) return + + if pixbuf is None: + log.error('Unable to load pixbuf') + return + preview.update_widget(data=pixbuf) ===================================== gajim/common/preview_helpers.py ===================================== @@ -13,9 +13,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from typing import Any -from typing import Dict -from typing import List -from typing import Tuple +from typing import NamedTuple from typing import Optional from typing import Union @@ -25,7 +23,6 @@ import hashlib import mimetypes from io import BytesIO -from collections import namedtuple from pathlib import Path from urllib.parse import urlparse from urllib.parse import unquote @@ -47,11 +44,16 @@ log = logging.getLogger('gajim.c.preview_helpers') -Coords = namedtuple('Coords', 'location lat lon') +class Coords(NamedTuple): + location: str + lat: str + lon: str -def resize_gif(image: Image.Image, output_file: BytesIO, - resize_to: Tuple[int, int]) -> None: + +def resize_gif(image: Image.Image, + output_file: BytesIO, + resize_to: tuple[int, int]) -> None: frames, result = extract_and_resize_frames(image, resize_to) frames[0].save(output_file, @@ -63,7 +65,7 @@ def resize_gif(image: Image.Image, output_file: BytesIO, loop=1000) -def analyse_image(image: Image.Image) -> Tuple[Image.Image, Dict[str, Any]]: +def analyse_image(image: Image.Image) -> tuple[Image.Image, dict[str, Any]]: ''' Pre-process pass over the image to determine the mode (full or additive). Necessary as assessing single frames isn't reliable. Need to know the mode @@ -91,8 +93,10 @@ def analyse_image(image: Image.Image) -> Tuple[Image.Image, Dict[str, Any]]: return image, result -def extract_and_resize_frames(image: Image.Image, resize_to: Tuple[int, int] - ) -> Tuple[List[Image.Image], Dict[str, Any]]: +def extract_and_resize_frames(image: Image.Image, + resize_to: tuple[int, int] + ) -> tuple[list[Image.Image], dict[str, Any]]: + image, result = analyse_image(image) i = 0 @@ -148,10 +152,13 @@ def create_thumbnail_with_pixbuf(data: bytes, size: int) -> Optional[bytes]: loader.write(data) loader.close() except GLib.Error as error: - log.warning('making pixbuf failed: %s', error) + log.warning('Loading pixbuf failed: %s', error) return None pixbuf = loader.get_pixbuf() + if pixbuf is None: + log.warning('Loading pixbuf failed') + return None if size > pixbuf.get_width() and size > pixbuf.get_height(): return data @@ -160,6 +167,10 @@ def create_thumbnail_with_pixbuf(data: bytes, size: int) -> Optional[bytes]: thumbnail = pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.BILINEAR) + if thumbnail is None: + log.warning('scale_simple() returned None') + return None + try: _error, bytes_ = thumbnail.save_to_bufferv('png', [], []) except GLib.Error as err: @@ -205,7 +216,7 @@ def create_thumbnail_with_pil(data: bytes, size: int) -> Optional[bytes]: return bytes_ -def get_thumbnail_size(pixbuf: GdkPixbuf.Pixbuf, size: int) -> Tuple[int, int]: +def get_thumbnail_size(pixbuf: GdkPixbuf.Pixbuf, size: int) -> tuple[int, int]: # Calculates the new thumbnail size while preserving the aspect ratio image_width = pixbuf.get_width() image_height = pixbuf.get_height() @@ -222,7 +233,7 @@ def get_thumbnail_size(pixbuf: GdkPixbuf.Pixbuf, size: int) -> Tuple[int, int]: return image_width, image_height -def pixbuf_from_data(data: bytes) -> GdkPixbuf.Pixbuf: +def pixbuf_from_data(data: bytes) -> Optional[GdkPixbuf.Pixbuf]: loader = GdkPixbuf.PixbufLoader() try: loader.write(data) @@ -244,14 +255,22 @@ def pixbuf_from_data(data: bytes) -> GdkPixbuf.Pixbuf: input_file.close() return pixbuf - return loader.get_pixbuf().apply_embedded_orientation() + pixbuf = loader.get_pixbuf() + if pixbuf is None: + return None + + pixbuf = pixbuf.apply_embedded_orientation() + if pixbuf is None: + return pixbuf + return pixbuf -def parse_fragment(fragment: str) -> Tuple[bytes, bytes]: - if not fragment: + +def parse_fragment(fragment_string: str) -> tuple[bytes, bytes]: + if not fragment_string: raise ValueError('Invalid fragment') - fragment = binascii.unhexlify(fragment) + fragment = binascii.unhexlify(fragment_string) size = len(fragment) # Clients started out with using a 16 byte IV but long term # want to switch to the more performant 12 byte IV @@ -268,8 +287,12 @@ def parse_fragment(fragment: str) -> Tuple[bytes, bytes]: return key, iv -def get_image_paths(uri: str, urlparts: ParseResult, size: int, orig_dir: Path, - thumb_dir: Path) -> Tuple[Path, Path]: +def get_image_paths(uri: str, + urlparts: ParseResult, + size: int, + orig_dir: Path, + thumb_dir: Path) -> tuple[Path, Path]: + path = Path(unquote(urlparts.path)) web_stem = path.stem extension = path.suffix @@ -355,8 +378,8 @@ def contains_audio_streams(file_path: Path) -> bool: return has_audio -def get_previewable_mime_types(): - previewable_mime_types = set() +def get_previewable_mime_types() -> tuple[str, ...]: + previewable_mime_types: set[str] = set() for fmt in GdkPixbuf.Pixbuf.get_formats(): for mime_type in fmt.get_mime_types(): previewable_mime_types.add(mime_type.lower()) @@ -384,7 +407,7 @@ def guess_mime_type(file_path: Union[Path, str], def guess_simple_file_type(file_path: str, data: Optional[bytes] = None - ) -> Tuple[Gio.Icon, str]: + ) -> tuple[Gio.Icon, str]: mime_type = guess_mime_type(file_path, data) icon = get_icon_for_mime_type(mime_type) if file_path.startswith('geo:'): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/484bd6823b7da6667a6da2f6a92c41b8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/484bd6823b7da6667a6da2f6a92c41b8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: ConfigPaths: Improve type annotations
by Philipp Hörist (＠lovetox) 04 Dec '21

04 Dec '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: acd15d2d by lovetox at 2021-12-04T20:38:37+01:00 ConfigPaths: Improve type annotations - - - - - 45b15ad1 by lovetox at 2021-12-04T20:39:02+01:00 Update mypy.ini - - - - - 2 changed files: - gajim/common/configpaths.py - mypy.ini Changes: ===================================== gajim/common/configpaths.py ===================================== @@ -19,11 +19,9 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from typing import Dict # pylint: disable=unused-import -from typing import List from typing import Generator -from typing import Optional # pylint: disable=unused-import -from typing import Tuple +from typing import Optional +from typing import Union from typing import cast import os @@ -36,7 +34,8 @@ import gajim from gajim.common.i18n import _ -from gajim.common.const import PathType, PathLocation +from gajim.common.const import PathType +from gajim.common.const import PathLocation from gajim.common.types import PathTuple @@ -44,7 +43,7 @@ def get(key: str) -> Path: return _paths[key] -def get_plugin_dirs() -> List[Path]: +def get_plugin_dirs() -> list[Path]: if gajim.IS_FLATPAK: return [Path(_paths['PLUGINS_BASE']), Path('/app/plugins')] @@ -102,10 +101,10 @@ def create_paths() -> None: class ConfigPaths: def __init__(self) -> None: - self._paths = {} # type: Dict[str, PathTuple] + self._paths: dict[str, PathTuple] = {} self.profile = '' self.profile_separation = False - self.custom_config_root = None # type: Optional[Path] + self.custom_config_root: Optional[Path] = None if os.name == 'nt': if gajim.IS_PORTABLE: @@ -146,7 +145,7 @@ def __getitem__(self, key: str) -> Path: return self.data_root / path return path - def items(self) -> Generator[Tuple[str, PathTuple], None, None]: + def items(self) -> Generator[tuple[str, PathTuple], None, None]: for key, value in self._paths.items(): yield (key, value) @@ -160,10 +159,13 @@ def _prepare(self, path: Path, unique: bool) -> Path: def add(self, name: str, - path: Path, - location: PathLocation = None, - path_type: PathType = None, + path: Union[Path, str], + location: Optional[PathLocation] = None, + path_type: Optional[PathType] = None, unique: bool = False) -> None: + + path = Path(path) + if location is not None: path = self._prepare(path, unique) self._paths[name] = (location, path, path_type) ===================================== mypy.ini ===================================== @@ -4,12 +4,6 @@ warn_unused_configs = True disallow_incomplete_defs = True allow_redefinition = True -[mypy-nbxmpp.*] -ignore_missing_imports = True - -[mypy-gi.*] -ignore_missing_imports = True - [mypy-dbus.*] ignore_missing_imports = True View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c739635879455c497c0ab64c9d923fe… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c739635879455c497c0ab64c9d923fe… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix comment typos
by Philipp Hörist (＠lovetox) 04 Dec '21

04 Dec '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: c7396358 by lovetox at 2021-12-04T16:12:04+01:00 Fix comment typos - - - - - 6 changed files: - gajim/common/preview_helpers.py - gajim/common/styling.py - gajim/data/style/gajim.css - gajim/gtk/chat_page.py - gajim/gtk/conversation/scrolled.py - gajim/gtk/preview.py Changes: ===================================== gajim/common/preview_helpers.py ===================================== @@ -254,7 +254,7 @@ def parse_fragment(fragment: str) -> Tuple[bytes, bytes]: fragment = binascii.unhexlify(fragment) size = len(fragment) # Clients started out with using a 16 byte IV but long term - # want to swtich to the more performant 12 byte IV + # want to switch to the more performant 12 byte IV # We have to support both if size == 48: key = fragment[16:] ===================================== gajim/common/styling.py ===================================== @@ -332,7 +332,7 @@ def _is_valid_span_end(line, index): ''' https://xmpp.org/extensions/xep-0393.html#span - ... and the closing styling directive MUST NOT be preceeded + ... and the closing styling directive MUST NOT be preceded by a whitespace character ... ''' ===================================== gajim/data/style/gajim.css ===================================== @@ -406,7 +406,7 @@ .header-box-first label { padding: 0px 18px 6px 18px; } -/* Seach view */ +/* Search view */ .search-view { padding: 12px; border-left: 1px solid @borders; ===================================== gajim/gtk/chat_page.py ===================================== @@ -216,7 +216,7 @@ def add_chat_for_workspace(self, self._chat_stack.add_group_chat(account, jid) elif type_ == 'pm': if not self._startup_finished: - # TODO: Currently we cant load private chats at start + # TODO: Currently we can’t load private chats at start # because the Contacts dont exist yet return self._chat_stack.add_private_chat(account, jid) ===================================== gajim/gtk/conversation/scrolled.py ===================================== @@ -134,7 +134,7 @@ def _on_adj_value_changed(self, adj, *args): if self._request_history_at_upper == adj.get_upper(): # Abort here if we already did a history request and the upper # did not change. This can happen if we scroll very fast and the - # value changes while the request has not been fullfilled. + # value changes while the request has not been fulfilled. return self._request_history_at_upper = None ===================================== gajim/gtk/preview.py ===================================== @@ -233,7 +233,7 @@ def _on_content_button_clicked(self, _button): def _on_button_press_event(self, _button, event): if event.type == Gdk.EventType.BUTTON_PRESS and event.button == 3: - # Right klick + # Right click menu = self._get_context_menu() menu.popup_at_pointer(event) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c739635879455c497c0ab64c9d923feb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c739635879455c497c0ab64c9d923feb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix tests
by Philipp Hörist (＠lovetox) 04 Dec '21

04 Dec '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 540d2996 by lovetox at 2021-12-04T15:34:24+01:00 Fix tests Remove all broken tests - - - - - 17 changed files: - − test/broken/integration/test_gui_event_integration.py - − test/broken/integration/test_roster.py - − test/broken/test_pluginmanager.py - − test/broken/unit/test_jingle.py - − test/broken/unit/test_sessions.py - − test/broken/unit/test_socks5.py - − test/lib/__init__.py - − test/lib/data.py - − test/lib/gajim_mocks.py - − test/lib/mock.py - − test/lib/notify.py - test/no_gui/__init__.py - test/no_gui/unit/test_nick_completion.py → test/no_gui/test_nick_completion.py - test/no_gui/test_styling.py - − test/no_gui/unit/__init__.py - − test/unit/__init__.py - − test/unit/test_gui_interface.py Changes: ===================================== test/broken/integration/test_gui_event_integration.py deleted ===================================== @@ -1,220 +0,0 @@ -''' -Tests for the miscellaneous functions scattered throughout gajim/gajim.py -''' -import unittest - -import lib -lib.setup_env() - -import nbxmpp - -from gajim.common import gajim -from gajim.common import contacts as contacts_module -from gajim.common import caps_cache -from gajim.gajim import Interface - -from gajim_mocks import * -gajim.logger = MockLogger() - -Interface() - -import time -from data import * - -from gajim import roster_window -from gajim import plugins - -class TestStatusChange(unittest.TestCase): - '''tests gajim.py's incredibly complex presence handling''' - - def setUp(self): - - gajim.connections = {} - gajim.contacts = contacts_module.LegacyContactsAPI() - gajim.interface.roster = roster_window.RosterWindow() - gajim.plugin_manager = plugins.PluginManager() - gajim.logger = MockLogger() - caps_cache.initialize(gajim.logger) - - for acc in contacts: - gajim.connections[acc] = MockConnection(acc) - - gajim.interface.roster.fill_contacts_and_groups_dicts(contacts[acc], - acc) - gajim.interface.roster.add_account(acc) - gajim.interface.roster.add_account_contacts(acc) - - self.assertEqual(0, len(notify.notifications)) - - def tearDown(self): - notify.notifications = [] - for acc in contacts: - gajim.connections[acc].cleanup() - - def contact_comes_online(self, account, jid, resource, prio, - should_popup=True): - '''a remote contact comes online''' - xml = """<presence from='%s/%s' id='123'><priority>%s</priority> - <c node='http://gajim.org' ver='pRCD6cgQ4SDqNMCjdhRV6TECx5o=' - hash='sha-1' xmlns='http://jabber.org/protocol/caps'/> - <status>I'm back!</status> - </presence> - """ % (jid, resource, prio) - msg = nbxmpp.protocol.Presence(node=nbxmpp.simplexml.XML2Node(xml)) - gajim.connections[account]._presenceCB(None, msg) - - contact = None - for c in gajim.contacts.get_contacts(account, jid): - if c.resource == resource: - contact = c - break - - self.assertEqual('online', contact.show) - self.assertEqual("I'm back!", contact.status) - self.assertEqual(prio, contact.priority) - - # the most recent notification is that the contact connected - if should_popup: - self.assertEqual('Contact Signed In', - notify.notifications[-1].popup_event_type) - else: - self.assertEqual('', notify.notifications[-1].popup_event_type) - - def contact_goes_offline(self, account, jid, resource, prio, - still_exists = True): - '''a remote contact goes offline.''' - xml = """<presence type='unavailable' from='%s/%s' id='123'> - <priority>%s</priority> - <c node='http://gajim.org' ver='pRCD6cgQ4SDqNMCjdhRV6TECx5o=' - hash='sha-1' xmlns='http://jabber.org/protocol/caps'/> - <status>Goodbye!</status> - </presence> - """ % (jid, resource, prio) - msg = nbxmpp.protocol.Presence(node=nbxmpp.simplexml.XML2Node(xml)) - gajim.connections[account]._presenceCB(None, msg) - - contact = None - for c in gajim.contacts.get_contacts(account, jid): - if c.resource == resource: - contact = c - break - - if not still_exists: - self.assertTrue(contact is None) - return - - self.assertEqual('offline', contact.show) - self.assertEqual('Goodbye!', contact.status) - self.assertEqual(prio, contact.priority) - - self.assertEqual('Contact Signed Out', - notify.notifications[-1].popup_event_type) - - def user_starts_chatting(self, jid, account, resource=None): - '''the user opens a chat window and starts talking''' - ctrl = MockChatControl(jid, account) - win = MockWindow() - win.new_tab(ctrl) - gajim.interface.msg_win_mgr._windows['test'] = win - - if resource: - jid = jid + '/' + resource - - # a basic session is started - session = gajim.connections[account1].make_new_session(jid, - '01234567890abcdef', cls=MockSession) - ctrl.set_session(session) - - return ctrl - - def user_starts_esession(self, jid, resource, account): - '''the user opens a chat window and starts an encrypted session''' - ctrl = self.user_starts_chatting(jid, account, resource) - ctrl.session.status = 'active' - ctrl.session.enable_encryption = True - - return ctrl - - def test_contact_comes_online(self): - jid = 'default1(a)gajim.org' - - # contact is offline initially - contacts = gajim.contacts.get_contacts(account1, jid) - self.assertEqual(1, len(contacts)) - self.assertEqual('offline', contacts[0].show) - self.assertEqual('', contacts[0].status) - - self.contact_comes_online(account1, jid, 'lowprio', 1) - - def test_contact_goes_offline(self): - jid = 'default1(a)gajim.org' - - self.contact_comes_online(account1, jid, 'lowprio', 1) - - ctrl = self.user_starts_chatting(jid, account1) - orig_sess = ctrl.session - - self.contact_goes_offline(account1, jid, 'lowprio', 1) - - # session hasn't changed since we were talking to the bare jid - self.assertEqual(orig_sess, ctrl.session) - - def test_two_resources_higher_comes_online(self): - jid = 'default1(a)gajim.org' - - self.contact_comes_online(account1, jid, 'lowprio', 1) - - ctrl = self.user_starts_chatting(jid, account1) - - self.contact_comes_online(account1, jid, 'highprio', 50, - should_popup=False) - - # old session was dropped - self.assertEqual(None, ctrl.session) - - def test_two_resources_higher_goes_offline(self): - jid = 'default1(a)gajim.org' - - self.contact_comes_online(account1, jid, 'lowprio', 1) - self.contact_comes_online(account1, jid, 'highprio', 50, - should_popup=False) - - ctrl = self.user_starts_chatting(jid, account1) - - self.contact_goes_offline(account1, jid, 'highprio', 50, - still_exists=False) - - # old session was dropped - self.assertEqual(None, ctrl.session) - - def test_two_resources_higher_comes_online_with_esession(self): - jid = 'default1(a)gajim.org' - - self.contact_comes_online(account1, jid, 'lowprio', 1) - - ctrl = self.user_starts_esession(jid, 'lowprio', account1) - - self.contact_comes_online(account1, jid, 'highprio', 50, - should_popup=False) - - # session was associated with the low priority full jid, so it should - # have been removed from the control - self.assertEqual(None, ctrl.session) - - def test_two_resources_higher_goes_offline_with_esession(self): - jid = 'default1(a)gajim.org' - - self.contact_comes_online(account1, jid, 'lowprio', 1) - self.contact_comes_online(account1, jid, 'highprio', 50) - - ctrl = self.user_starts_esession(jid, 'highprio', account1) - - self.contact_goes_offline(account1, jid, 'highprio', 50, - still_exists=False) - - # session was associated with the high priority full jid, so it should - # have been removed from the control - self.assertEqual(None, ctrl.session) - -if __name__ == '__main__': - unittest.main() ===================================== test/broken/integration/test_roster.py deleted ===================================== @@ -1,211 +0,0 @@ -import unittest - -import lib -lib.setup_env() - -from data import * - -from gajim_mocks import * - -from gajim.common import app -from gajim.common import contacts as contacts_module -from gajim import roster_window - -app.get_jid_from_account = lambda acc: 'myjid@' + acc - - -class TestRosterWindow(unittest.TestCase): - - def setUp(self): - app.interface = MockInterface() - - self.C_NAME = roster_window.Column.NAME - self.C_TYPE = roster_window.Column.TYPE - self.C_JID = roster_window.Column.JID - self.C_ACCOUNT = roster_window.Column.ACCOUNT - - # Add after creating RosterWindow - # We want to test the filling explicitly - app.contacts = contacts_module.LegacyContactsAPI() - app.connections = {} - self.roster = roster_window.RosterWindow(app.app) - - for acc in contacts: - app.connections[acc] = MockConnection(acc) - app.contacts.add_account(acc) - - def tearDown(self): - self.roster.window.destroy() - # Clean main loop - from gi.repository import GLib - mc = GLib.main_context_default() - while mc.pending(): - mc.iteration() - - ### Custom assertions - def assert_all_contacts_are_in_roster(self, acc): - for jid in contacts[acc]: - self.assert_contact_is_in_roster(jid, acc) - - def assert_contact_is_in_roster(self, jid, account): - contacts = app.contacts.get_contacts(account, jid) - # check for all resources - for contact in contacts: - iters = self.roster._get_contact_iter(jid, account, - model=self.roster.model) - - if jid != app.get_jid_from_account(account): - # We don't care for groups of SelfContact - self.assertTrue(len(iters) == len(contact.get_shown_groups()), - msg='Contact is not in all his groups') - - # Are we big brother? - bb_jid = None - bb_account = None - family = app.contacts.get_metacontacts_family(account, jid) - if family: - nearby_family, bb_jid, bb_account = \ - self.roster._get_nearby_family_and_big_brother(family, account) - - is_in_nearby_family = (jid, account) in ( - (data['jid'], data['account']) for data in nearby_family) - self.assertTrue(is_in_nearby_family, - msg='Contact not in his own nearby family') - - is_big_brother = (bb_jid, bb_account) == (jid, account) - - # check for each group tag - for titerC in iters: - self.assertTrue(self.roster.model.iter_is_valid(titerC), - msg='Contact iter invalid') - - c_model = self.roster.model[titerC] - # name can be stricked if contact or group is blocked -# self.assertEqual(contact.get_shown_name(), c_model[self.C_NAME], -# msg='Contact name missmatch') - self.assertEqual(contact.jid, c_model[self.C_JID], - msg='Jid missmatch') - - if not self.roster.regroup: - self.assertEqual(account, c_model[self.C_ACCOUNT], - msg='Account missmatch') - - # Check for correct nesting - parent_iter = self.roster.model.iter_parent(titerC) - p_model = self.roster.model[parent_iter] - if family: - if is_big_brother: - self.assertTrue(p_model[self.C_TYPE] == 'group', - msg='Big Brother is not on top') - else: - self.assertTrue(p_model[self.C_TYPE] == 'contact', - msg='Little Brother brother has no BigB') - else: - if jid == app.get_jid_from_account(account): - self.assertTrue(p_model[self.C_TYPE] == 'account', - msg='SelfContact is not on top') - else: - self.assertTrue(p_model[self.C_TYPE] == 'group', - msg='Contact not found in a group') - - def assert_group_is_in_roster(self, group, account): - #TODO - pass - - def assert_account_is_in_roster(self, acc): - titerA = self.roster._get_account_iter(acc, model=self.roster.model) - self.assertTrue(self.roster.model.iter_is_valid(titerA), - msg='Account iter is invalid') - - acc_model = self.roster.model[titerA] - self.assertEqual(acc_model[self.C_TYPE], 'account', - msg='No account found') - - if not self.roster.regroup: - self.assertEqual(acc_model[self.C_ACCOUNT], acc, - msg='Account not found') - - self_jid = app.get_jid_from_account(acc) - self.assertEqual(acc_model[self.C_JID], self_jid, - msg='Account JID not found in account row') - - def assert_model_is_in_sync(self): - #TODO: check that iter_n_children returns the correct numbers - pass - - # tests - def test_fill_contacts_and_groups_dicts(self): - for acc in contacts: - self.roster.fill_contacts_and_groups_dicts(contacts[acc], acc) - - for jid in contacts[acc]: - instances = app.contacts.get_contacts(acc, jid) - - # Created a contact for each single jid? - self.assertTrue(len(instances) == 1) - - # Contacts kept their info - contact = instances[0] - self.assertEqual(sorted(contact.groups), sorted(contacts[acc][jid]['groups']), - msg='Group Missmatch') - - groups = contacts[acc][jid]['groups'] or ['General',] - - def test_fill_roster_model(self): - for acc in contacts: - self.roster.fill_contacts_and_groups_dicts(contacts[acc], acc) - - self.roster.add_account(acc) - self.assert_account_is_in_roster(acc) - - self.roster.add_account_contacts(acc) - self.assert_all_contacts_are_in_roster(acc) - - self.assert_model_is_in_sync() - - -class TestRosterWindowRegrouped(TestRosterWindow): - - def setUp(self): - app.settings.set('mergeaccounts', True) - TestRosterWindow.setUp(self) - - def test_toggle_regroup(self): - self.roster.regroup = not self.roster.regroup - self.roster.setup_and_draw_roster() - self.roster.regroup = not self.roster.regroup - self.roster.setup_and_draw_roster() - - -class TestRosterWindowMetaContacts(TestRosterWindowRegrouped): - - def test_receive_metacontact_data(self): - for complete_data in metacontact_data: - t_acc = complete_data[0]['account'] - t_jid = complete_data[0]['jid'] - data = complete_data[1:] - for brother in data: - acc = brother['account'] - jid = brother['jid'] - app.contacts.add_metacontact(t_acc, t_jid, acc, jid) - self.roster.setup_and_draw_roster() - - def test_connect_new_metacontact(self): - self.test_fill_roster_model() - - jid = 'coolstuff(a)gajim.org' - contact = app.contacts.create_contact(jid, account1) - app.contacts.add_contact(account1, contact) - self.roster.add_contact(jid, account1) - self.roster.chg_contact_status(contact, 'offline', '', account1) - - app.contacts.add_metacontact(account1, 'samejid(a)gajim.org', - account1, jid) - self.roster.chg_contact_status(contact, 'online', '', account1) - - self.assert_model_is_in_sync() - - - -if __name__ == '__main__': - unittest.main() ===================================== test/broken/test_pluginmanager.py deleted ===================================== @@ -1,89 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -''' -Testing PluginManager class. - -:author: Mateusz Biliński <mateusz(a)bilinski.it> -:since: 05/30/2008 -:copyright: Copyright (2008) Mateusz Biliński <mateusz(a)bilinski.it> -:license: GPL -''' - -import sys -import os -import unittest - -gajim_root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..') -sys.path.append(gajim_root + '/gajim') - -# a temporary version of ~/.gajim for testing -configdir = gajim_root + '/test/tmp' - -import time - -# define _ for i18n -import builtins -builtins._ = lambda x: x - -# wipe config directory -import os -if os.path.isdir(configdir): - import shutil - shutil.rmtree(configdir) - -os.mkdir(configdir) - -from gajim.common import configpaths -configpaths.set_config_root(configdir) -configpaths.init() - -# for some reason common.app needs to be imported before xmpppy? - -configpaths.override_path('DATA', gajim_root + '/gajim/data') - -# name to use for the test account -account_name = 'test' - -from plugins import PluginManager - -class PluginManagerTestCase(unittest.TestCase): - def setUp(self): - self.pluginmanager = PluginManager() - - def tearDown(self): - pass - - def test_01_Singleton(self): - """ 1. Checking whether PluginManger class is singleton. """ - self.pluginmanager.test_arg = 1 - secondPluginManager = PluginManager() - - self.assertEqual(id(secondPluginManager), id(self.pluginmanager), - 'Different IDs in references to PluginManager objects (not a singleton)') - self.assertEqual(secondPluginManager.test_arg, 1, - 'References point to different PluginManager objects (not a singleton') - -def suite(): - suite = unittest.TestLoader().loadTestsFromTestCase(PluginManagerTestCase) - return suite - -if __name__=='__main__': - runner = unittest.TextTestRunner() - test_suite = suite() - runner.run(test_suite) ===================================== test/broken/unit/test_jingle.py deleted ===================================== @@ -1,156 +0,0 @@ -''' -Tests for dispatcher.py -''' -import unittest - -import lib -lib.setup_env() - -from mock import Mock - - -from nbxmpp import dispatcher -from nbxmpp.namespaces import Namespace - -from gajim.common.protocol.bytestream import ConnectionIBBytestream -from gajim.common.protocol.bytestream import ConnectionSocks5Bytestream -from gajim.common.jingle import ConnectionJingle -from gajim.common import app -from gajim.common.socks5 import SocksQueue - - -session_init = ''' -<iq xmlns="jabber:client" to="jingleft(a)thiessen.im/Gajim" type="set" id="43"> -<jingle xmlns="urn:xmpp:jingle:1" action="session-initiate" initiator="jtest(a)thiessen.im/Gajim" sid="38"> -<content name="fileWL1Y2JIPTM5RAD68" creator="initiator"> -<security xmlns="urn:xmpp:jingle:security:xtls:0"> -<method name="x509" /> -</security> -<description xmlns="urn:xmpp:jingle:apps:file-transfer:1"> -<offer> -<file xmlns="http://jabber.org/protocol/si/profile/file-transfer" name="to" size="2273"> -<desc /> -</file> -</offer> -</description> -<transport xmlns="urn:xmpp:jingle:transports:s5b:1" sid="39"> -<candidate jid="jtest(a)thiessen.im/Gajim" cid="40" priority="8257536" host="192.168.2.100" type="direct" port="28011" /> -<candidate jid="proxy.thiessen.im" cid="41" priority="655360" host="192.168.2.100" type="proxy" port="5000" /> -<candidate jid="proxy.jabbim.cz" cid="42" priority="655360" host="192.168.2.100" type="proxy" port="7777" /> -</transport> -</content> -</jingle> -</iq> - ''' - - -transport_info = ''' -<iq from='jtest(a)thiessen.im/Gajim' - id='hjdi8' - to='jingleft(a)thiessen.im/Gajim' - type='set'> - <jingle xmlns='urn:xmpp:jingle:1' - action='transport-info' - initiator='jtest(a)thiessen.im/Gajim' - sid='38'> - <content creator='initiator' name='fileWL1Y2JIPTM5RAD68'> - <transport xmlns='urn:xmpp:jingle:transports:s5b:1' - sid='vj3hs98y'> - <candidate-used cid='hr65dqyd'/> - </transport> - </content> - </jingle> -</iq> - -''' - -class Connection(Mock, ConnectionJingle, ConnectionSocks5Bytestream, - ConnectionIBBytestream): - - def __init__(self): - Mock.__init__(self) - ConnectionJingle.__init__(self) - ConnectionSocks5Bytestream.__init__(self) - ConnectionIBBytestream.__init__(self) - self.connected = 2 # This tells gajim we are connected - - def send(self, stanza=None, when=None): - # Called when gajim wants to send something - print(str(stanza)) - - -class TestJingle(unittest.TestCase): - - def setUp(self): - self.dispatcher = dispatcher.XMPPDispatcher() - app.nec = Mock() - app.socks5queue = SocksQueue(Mock()) - # Setup mock client - self.client = Connection() - self.client.__str__ = lambda: 'Mock' # FIXME: why do I need this one? - self.client._caller = Connection() - self.client.defaultNamespace = Namespace.CLIENT - self.client.Connection = Connection() # mock transport - self.con = self.client.Connection - self.con.server_resource = None - self.con.connection = Connection() - - ''' - Fake file_props when we receive a file. Gajim creates a file_props - out of a FileRequestReceive event and from then on it changes in - a lot of places. It is easier to just copy it in here. - If the session_initiate stanza changes, this also must change. - ''' - self.receive_file = {'stream-methods': - 'http://jabber.org/protocol/bytestreams', - 'sender': 'jtest(a)thiessen.im/Gajim', - 'file-name': 'test_received_file', - 'request-id': '43', 'sid': '39', - 'session-sid': '38', 'session-type': 'jingle', - 'transfered_size': [], 'receiver': - 'jingleft(a)thiessen.im/Gajim', 'desc': '', - 'size': '2273', 'type': 'r', - 'streamhosts': [{'initiator': - 'jtest(a)thiessen.im/Gajim', - 'target': 'jingleft(a)thiessen.im/Gajim', - 'cid': '41', 'state': 0, 'host': '192.168.2.100', - 'type': 'direct', 'port': '28011'}, - {'initiator': 'jtest(a)thiessen.im/Gajim', - 'target': 'jingleft(a)thiessen.im/Gajim', - 'cid': '42', 'state': 0, 'host': '192.168.2.100', - 'type': 'proxy', 'port': '5000'}], - 'name': 'to'} - - def tearDown(self): - # Unplug if needed - if hasattr(self.dispatcher, '_owner'): - self.dispatcher.PlugOut() - - def _simulate_connect(self): - self.dispatcher.PlugIn(self.client) # client is owner - # Simulate that we have established a connection - self.dispatcher.StreamInit() - self.dispatcher.ProcessNonBlocking("<stream:stream xmlns:stream='http://etherx.jabber.org/streams' xmlns='jabber:client'>") - - def _simulate_jingle_session(self): - - self.dispatcher.RegisterHandler('iq', self.con._JingleCB, 'set', - Namespace.JINGLE) - self.dispatcher.ProcessNonBlocking(session_init) - session = list(self.con._sessions.values())[0] # The only session we have - jft = list(session.contents.values())[0] # jingleFT object - jft.file_props = self.receive_file # We plug file_props manually - # The user accepts to receive the file - # we have to manually simulate this behavior - session.approve_session() - self.con.send_file_approval(self.receive_file) - - self.dispatcher.ProcessNonBlocking(transport_info) - - def test_jingle_session(self): - self._simulate_connect() - self._simulate_jingle_session() - - -if __name__ == '__main__': - unittest.main() ===================================== test/broken/unit/test_sessions.py deleted ===================================== @@ -1,167 +0,0 @@ -import unittest - -import lib -lib.setup_env() - -import notify -import nbxmpp - -from gajim.common import app -from gajim.common import nec -from gajim.common import ged -from gajim.common.nec import NetworkEvent - -from gajim.session import ChatControlSession -from gajim.roster_window import RosterWindow - -from gajim_mocks import * -from data import account1 - -app.interface = MockInterface() - - -# name to use for the test account -account_name = account1 - - -class TestChatControlSession(unittest.TestCase): - ''' Testclass for session.py ''' - - @classmethod - def setUpClass(cls): - app.nec = nec.NetworkEventsController() - cls.conn = MockConnection(account_name, {'send_stanza': None}) - app.logger = MockLogger() - app.default_session_type = ChatControlSession - - def setUp(self): - app.notification = notify.Notification() - - # no notifications have been sent - self.assertEqual(0, len(notify.notifications)) - - def tearDown(self): - app.notification.clean() - - def receive_chat_msg(self, jid, msgtxt): - '''simulate receiving a chat message from jid''' - msg = nbxmpp.Message() - msg.setBody(msgtxt) - msg.setType('chat') - - xml = """<message from='%s' id='1' type='chat'><body>%s</body> - <thread>123</thread></message>""" % (jid, msgtxt) - stanza = nbxmpp.protocol.Message(node=nbxmpp.simplexml.XML2Node(xml)) - self.conn._messageCB(None, stanza) - - # ----- custom assertions ----- - def assert_new_message_notification(self): - '''a new_message notification has been sent''' - self.assertEqual(1, len(notify.notifications)) - notif = notify.notifications[-1] - self.assertEqual('New Message', notif.popup_event_type) - - def assert_first_message_notification(self): - '''this message was treated as a first message''' - self.assert_new_message_notification() - notif = notify.notifications[-1] - first = notif.first_unread - self.assertTrue(first, - 'message should have been treated as a first message') - - def assert_not_first_message_notification(self): - '''this message was not treated as a first message''' - self.assert_new_message_notification() - notif = notify.notifications[-1] - first = notif.first_unread - self.assertTrue(not first, - 'message was unexpectedly treated as a first message') - - # ----- tests ----- - def test_receive_1nocontrol(self): - '''test receiving a message in a blank state''' - jid = 'bct(a)necronomicorp.com' - fjid = 'bct(a)necronomicorp.com/Gajim' - msgtxt = 'testing one' - - self.receive_chat_msg(fjid, msgtxt) - - # session is created - self.assertTrue((jid in self.conn.sessions) and ( - '123' in self.conn.sessions[jid]), 'session is not created') - sess = self.conn.sessions[jid]['123'] - - # message was logged - calls = app.storage.archive.mockGetNamedCalls('insert_into_logs') - self.assertEqual(1, len(calls)) - - # no ChatControl was open and autopopup was off - # so the message goes into the event queue - self.assertEqual(1, len(app.events.get_events(account_name))) - - self.assert_first_message_notification() - - # no control is attached to the session - self.assertEqual(None, sess.control) - - def test_receive_2already_has_control(self): - '''test receiving a message with a session already attached to a - control''' - jid = 'bct(a)necronomicorp.com' - fjid = 'bct(a)necronomicorp.com/Gajim' - msgtxt = 'testing two' - app.interface.roster = RosterWindow(app.app) - - sess = self.conn.sessions[jid]['123'] - sess.control = MockChatControl(fjid, account_name) - - self.receive_chat_msg(fjid, msgtxt) - - # message was logged - calls = app.storage.archive.mockGetNamedCalls('insert_into_logs') - self.assertEqual(2, len(calls)) - - # the message does not go into the event queue - self.assertEqual(1, len(app.events.get_events(account_name))) - - self.assert_not_first_message_notification() - - # message was printed to the control - calls = sess.control.mockGetNamedCalls('print_conversation') - self.assertEqual(1, len(calls)) - app.interface.roster.window.destroy() - - #def test_received_3orphaned_control(self): - #'''test receiving a message when a control that doesn't have a session - #attached exists''' - - #jid = 'bct(a)necronomicorp.com' - #fjid = jid + '/Gajim' - #msgtxt = 'testing three' - - #ctrl = MockChatControl(jid, account_name) - #gajim.interface.msg_win_mgr = Mock({'get_control': ctrl}) - #gajim.interface.msg_win_mgr.mockSetExpectation('get_control', - #expectParams(jid, account_name)) - - #self.receive_chat_msg(fjid, msgtxt) - - ## message was logged - #calls = gajim.logger.mockGetNamedCalls('insert_into_logs') - #self.assertEqual(1, len(calls)) - - ## the message does not go into the event queue - #self.assertEqual(0, len(gajim.events.get_events(account_name))) - - #self.assert_not_first_message_notification() - - ## this session is now attached to that control - #self.assertEqual(self.sess, ctrl.session) - #self.assertEqual(ctrl, self.sess.control, 'foo') - - ## message was printed to the control - #calls = ctrl.mockGetNamedCalls('print_conversation') - #self.assertEqual(1, len(calls)) - -if __name__ == '__main__': - unittest.main() ===================================== test/broken/unit/test_socks5.py deleted ===================================== @@ -1,172 +0,0 @@ -''' -Tests for dispatcher.py -''' -import unittest - -import lib -lib.setup_env() - -from mock import Mock -import sys -import socket - -from gajim.common.socks5 import * -from gajim.common import jingle_xtls - -class fake_sock(Mock): - def __init__(self, sockobj): - Mock.__init__(self) - - self.sockobj = sockobj - - - def setup_stream(self): - sha1 = self.sockobj._get_sha1_auth() - - self.incoming = [] - self.incoming.append(self.sockobj._get_auth_response()) - self.incoming.append(self.sockobj._get_request_buff(sha1, 0x00)) - self.outgoing = [] - self.outgoing.append(self.sockobj._get_auth_buff()) - self.outgoing.append(self.sockobj._get_request_buff(sha1)) - - def switch_stream(self): - # Roles are reversed, client will be expecting server stream - # and server will be expecting client stream - - temp = self.incoming - self.incoming = self.outgoing - self.outgoing = temp - - def _recv(self, foo): - return self.incoming.pop(0) - - def _send(self, data): - # This method is surrounded by a try block, - # we can't use assert here - - if data != self.outgoing[0]: - print('FAILED SENDING TEST') - self.outgoing.pop(0) - -class fake_idlequeue(Mock): - - def __init__(self): - Mock.__init__(self) - - def plug_idle(self, obj, writable=True, readable=True): - - if readable: - obj.pollin() - if writable: - obj.pollout() - -class TestSocks5(unittest.TestCase): - ''' - Test class for Socks5 - ''' - def setUp(self): - streamhost = { 'host': None, - 'port': 1, - 'initiator' : None, - 'target' : None} - queue = Mock() - queue.file_props = {} - #self.sockobj = Socks5Receiver(fake_idlequeue(), streamhost, None) - self.sockobj = Socks5Sender(fake_idlequeue(), None, 'server', Mock() , - None, None, True, file_props={}) - sock = fake_sock(self.sockobj) - self.sockobj._sock = sock - self.sockobj._recv = sock._recv - self.sockobj._send = sock._send - self.sockobj.state = 1 - self.sockobj.connected = True - self.sockobj.pollend = self._pollend - - # Something that the receiver needs - #self.sockobj.file_props['type'] = 'r' - - # Something that the sender needs - self.sockobj.file_props = {} - self.sockobj.file_props['type'] = 'r' - self.sockobj.file_props['paused'] = '' - self.sockobj.queue = Mock() - self.sockobj.queue.process_result = self._pollend - - def _pollend(self, foo = None, duu = None): - # This is a disconnect function - sys.exit("end of the road") - - def _check_inout(self): - # Check if there isn't anything else to receive or send - sock = self.sockobj._sock - assert(sock.incoming == []) - assert(sock.outgoing == []) - - def test_connection_server(self): - return - mocksock = self.sockobj._sock - mocksock.setup_stream() - #self.sockobj._sock.switch_stream() - s = socket.socket(2, 1, 6) - server = ('127.0.0.1', 28000) - - s.connect(server) - - s.send(mocksock.outgoing.pop(0)) - self.assertEqual(s.recv(64), mocksock.incoming.pop(0)) - - s.send(mocksock.outgoing.pop(0)) - self.assertEqual(s.recv(64), mocksock.incoming.pop(0)) - - def test_connection_client(self): - - - mocksock = self.sockobj._sock - mocksock.setup_stream() - mocksock.switch_stream() - s = socket.socket(10, 1, 6) - - - s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - s.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) - s.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) - - netadd = ('::', 28000, 0, 0) - s.bind(netadd) - s.listen(socket.SOMAXCONN) - (s, address) = s.accept() - - - self.assertEqual(s.recv(64), mocksock.incoming.pop(0)) - s.send(mocksock.outgoing.pop(0)) - - buff = s.recv(64) - inco = mocksock.incoming.pop(0) - #self.assertEqual(s.recv(64), mocksock.incoming.pop(0)) - s.send(mocksock.outgoing.pop(0)) - - def test_client_negoc(self): - return - self.sockobj._sock.setup_stream() - try: - self.sockobj.pollout() - except SystemExit: - pass - - self._check_inout() - - def test_server_negoc(self): - return - self.sockobj._sock.setup_stream() - self.sockobj._sock.switch_stream() - try: - self.sockobj.idlequeue.plug_idle(self.sockobj, False, True) - except SystemExit: - pass - self._check_inout() - - -if __name__ == '__main__': - - unittest.main() ===================================== test/lib/__init__.py deleted ===================================== @@ -1,46 +0,0 @@ -import os - -from tempfile import gettempdir - -# a temporary version of ~/.gajim for testing -configdir = os.path.join(gettempdir(), 'gajim') -os.makedirs(configdir, exist_ok=True) - -# plugins config dir -pluginsconfigdir = configdir + '/pluginsconfig' -# theme config directory -themedir = configdir + '/theme' - -# define _ for i18n -import builtins -builtins._ = lambda x: x - -from gajim.common.contacts import LegacyContactsAPI - -def setup_env(use_x=True): - # wipe config directory - if os.path.isdir(configdir): - import shutil - shutil.rmtree(configdir) - - os.mkdir(configdir) - os.mkdir(pluginsconfigdir) - os.mkdir(themedir) - - from gajim.common import configpaths - configpaths.set_config_root(configdir) - configpaths.init() - - # for some reason gajim.common.app needs to be imported before xmpppy? - from gajim.common import app - - import logging - logging.basicConfig() - - app.use_x = use_x - app.contacts = LegacyContactsAPI() - app.connections = {} - - if use_x: - from gajim.application import GajimApplication - app.app = GajimApplication() ===================================== test/lib/data.py deleted ===================================== @@ -1,77 +0,0 @@ -# -*- coding: utf-8 -*- -account1 = 'acc1' -account2 = 'Cool"chârßéµö' -account3 = 'dingdong.org' - -contacts = {} -contacts[account1] = { - 'myjid@'+account1: { - 'ask': None, 'groups': [], 'name': None, 'resources': {}, - 'subscription': 'both'}, - 'default1(a)gajim.org': { - 'ask': None, 'groups': [], 'name': None, 'resources': {}, - 'subscription': 'both'}, - 'default2(a)gajim.org': { - 'ask': None, 'groups': ['GroupA',], 'name': None, 'resources': {}, - 'subscription': 'both'}, - 'Cool"chârßéµö(a)gajim.org': { - 'ask': None, 'groups': ['<Cool"chârßéµö', 'GroupB'], - 'name': None, 'resources': {}, 'subscription': 'both'}, - 'samejid(a)gajim.org': { - 'ask': None, 'groups': ['GroupA',], 'name': None, 'resources': {}, - 'subscription': 'both'} -} -contacts[account2] = { - 'myjid@'+account2: { - 'ask': None, 'groups': [], 'name': None, 'resources': {}, - 'subscription': 'both'}, - 'default3(a)gajim.org': { - 'ask': None, 'groups': ['GroupC',], 'name': None, 'resources': {}, - 'subscription': 'both'}, - 'asksubfrom(a)gajim.org': { - 'ask': 'subscribe', 'groups': ['GroupA',], 'name': None, - 'resources': {}, 'subscription': 'from'}, - 'subto(a)gajim.org': { - 'ask': None, 'groups': ['GroupB'], 'name': None, 'resources': {}, - 'subscription': 'to'}, - 'samejid(a)gajim.org': { - 'ask': None, 'groups': ['GroupA', 'GroupB'], 'name': None, - 'resources': {}, 'subscription': 'both'} -} -contacts[account3] = { - #'guypsych0\\40h.com(a)msn.dingdong.org': { - # 'ask': None, 'groups': [], 'name': None, 'resources': {}, - # 'subscription': 'both'}, - 'guypsych0%h.com(a)msn.delx.cjb.net': { - 'ask': 'subscribe', 'groups': [], 'name': None, - 'resources': {}, 'subscription': 'from'}, - #'guypsych0%h.com(a)msn.jabber.wiretrip.org': { - # 'ask': None, 'groups': [], 'name': None, 'resources': {}, - # 'subscription': 'to'}, - #'guypsycho\\40g.com(a)gtalk.dingdong.org': { - # 'ask': None, 'groups': [], 'name': None, - # 'resources': {}, 'subscription': 'both'} -} - -# We have contacts that are not in roster but only specified in the metadata -metacontact_data = [ - [{'account': account3, - 'jid': 'guypsych0\\40h.com(a)msn.dingdong.org', - 'order': 0}, - {'account': account3, - 'jid': 'guypsych0%h.com(a)msn.delx.cjb.net', - 'order': 0}, - {'account': account3, - 'jid': 'guypsych0%h.com(a)msn.jabber.wiretrip.org', - 'order': 0}, - {'account': account3, - 'jid': 'guypsycho\\40g.com(a)gtalk.dingdong.org', - 'order': 0}], - - [{'account': account1, - 'jid': 'samejid(a)gajim.org', - 'order': 0}, - {'account': account2, - 'jid': 'samejid(a)gajim.org', - 'order': 0}] - ] ===================================== test/lib/gajim_mocks.py deleted ===================================== @@ -1,140 +0,0 @@ -''' -Module with dummy classes for Gajim specific unit testing -''' - -from .mock import Mock -from gajim.common import app -from gajim.common import ged - -from gajim.common.connection_handlers import ConnectionHandlers - -class MockConnection(Mock, ConnectionHandlers): - def __init__(self, account, *args): - Mock.__init__(self, *args) - - self.connection = Mock() - - self.name = account - - ConnectionHandlers.__init__(self) - - self.connected = 2 - self.pep = {} - self.sessions = {} - self.server_resource = 'Gajim' - - app.interface.instances[account] = { - 'infos': {}, - 'disco': {} - } - app.interface.minimized_controls[account] = {} - app.contacts.add_account(account) - app.groups[account] = {} - app.gc_connected[account] = {} - app.automatic_rooms[account] = {} - app.newly_added[account] = [] - app.to_be_removed[account] = [] - app.nicks[account] = app.settings.get_account_setting(account, 'name') - app.block_signed_in_notifications[account] = True - - app.connections[account] = self - -class MockWindow(Mock): - def __init__(self, *args): - Mock.__init__(self, *args) - self.window = Mock() - self._controls = {} - - def get_control(self, jid, account): - try: - return self._controls[account][jid] - except KeyError: - return None - - def has_control(self, jid, acct): - return self.get_control(jid, acct) is not None - - def new_tab(self, ctrl): - account = ctrl.account - jid = ctrl.jid - - if account not in self._controls: - self._controls[account] = {} - - if jid not in self._controls[account]: - self._controls[account][jid] = {} - - self._controls[account][jid] = ctrl - - def __nonzero__(self): - return True - -class MockChatControl(Mock): - def __init__(self, jid, account, *args): - Mock.__init__(self, *args) - - self.jid = jid - self.account = account - - self.parent_win = MockWindow({'get_active_control': self}) - self.session = None - - def set_session(self, sess): - self.session = sess - - def __nonzero__(self): - return True - - def __eq__(self, other): - return self is other - - -class MockInterface(Mock): - def __init__(self, *args): - Mock.__init__(self, *args) - app.interface = self - self.msg_win_mgr = Mock() - self.roster = Mock() - app.ged = ged.GlobalEventsDispatcher() - from gajim import plugins - app.plugin_manager = plugins.PluginManager() - - self.instances = {} - self.minimized_controls = {} - - -class MockLogger(Mock): - def __init__(self): - Mock.__init__(self, {'insert_into_logs': None, - 'get_transports_type': {}}) - self.cur = Mock() - - -class MockContact(Mock): - def __nonzero__(self): - return True - - -import random - -class MockSession(Mock): - def __init__(self, conn, jid, thread_id, type_): - Mock.__init__(self) - - self.conn = conn - self.jid = jid - self.type_ = type_ - self.thread_id = thread_id - self.resource = '' - - if not self.thread_id: - self.thread_id = '%0x' % random.randint(0, 10000) - - def __repr__(self): - return '<MockSession %s>' % self.thread_id - - def __nonzero__(self): - return True - - def __eq__(self, other): - return self is other ===================================== test/lib/mock.py deleted ===================================== @@ -1,466 +0,0 @@ -# -# (c) Dave Kirby 2001 - 2005 -# mock(a)thedeveloperscoach.com -# -# Original call interceptor and call assertion code by Phil Dawes (pdawes(a)users.sourceforge.net) -# Call interceptor code enhanced by Bruce Cropley (cropleyb(a)yahoo.com.au) -# -# This Python module and associated files are released under the FreeBSD -# license. Essentially, you can do what you like with it except pretend you wrote -# it yourself. -# -# -# Copyright (c) 2005, Dave Kirby -# Copyright (c) 2009, Yann Leboulanger -# -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# * Neither the name of this library nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# mock(a)thedeveloperscoach.com - - -""" -Mock object library for Python. Mock objects can be used when unit testing -to remove a dependency on another production class. They are typically used -when the dependency would either pull in lots of other classes, or -significantly slow down the execution of the test. -They are also used to create exceptional conditions that cannot otherwise -be easily triggered in the class under test. -""" - -__version__ = "0.1.0" - -# Added in Python 2.1 -import inspect -import re - -class MockInterfaceError(Exception): - pass - -class Mock(object): - """ - The Mock class emulates any other class for testing purposes. - All method calls are stored for later examination. - """ - - def __init__(self, returnValues=None, realClass=None): - """ - The Mock class constructor takes a dictionary of method names and - the values they return. Methods that are not in the returnValues - dictionary will return None. - You may also supply a class whose interface is being mocked. - All calls will be checked to see if they appear in the original - interface. Any calls to methods not appearing in the real class - will raise a MockInterfaceError. Any calls that would fail due to - non-matching parameter lists will also raise a MockInterfaceError. - Both of these help to prevent the Mock class getting out of sync - with the class it is Mocking. - """ - self.mockCalledMethods = {} - self.mockAllCalledMethods = [] - self.mockReturnValues = returnValues or {} - self.mockExpectations = {} - self.realClass = realClass - self.realClassMethods = None - if realClass: - self.realClassMethods = dict(inspect.getmembers(realClass, inspect.isroutine)) - for retMethod in self.mockReturnValues.keys(): - if retMethod not in self.realClassMethods: - raise MockInterfaceError("Return value supplied for method '%s' that was not in the original class" % retMethod) - self._setupSubclassMethodInterceptors() - - def _setupSubclassMethodInterceptors(self): - methods = inspect.getmembers(self.realClass, inspect.isroutine) - baseMethods = dict(inspect.getmembers(Mock, inspect.ismethod)) - for m in methods: - name = m[0] - # Don't record calls to methods of Mock base class. - if not name in baseMethods: - self.__dict__[name] = MockCallable(name, self, handcrafted=True) - - def get_module(self, name): - return Mock() - - def __getattr__(self, name): - return MockCallable(name, self) - - def mockAddReturnValues(self, **methodReturnValues ): - self.mockReturnValues.update(methodReturnValues) - - def mockSetExpectation(self, name, testFn, after=0, until=0): - self.mockExpectations.setdefault(name, []).append((testFn, after, until)) - - def _checkInterfaceCall(self, name, callParams, callKwParams): - """ - Check that a call to a method of the given name to the original - class with the given parameters would not fail. If it would fail, - raise a MockInterfaceError. - Based on the Python 2.3.3 Reference Manual section 5.3.4: Calls. - """ - if self.realClassMethods is None: - return - if name not in self.realClassMethods: - return - - func = self.realClassMethods[name] - try: - args, varargs, varkw, defaults = inspect.getargspec(func) - except TypeError: - # func is not a Python function. It is probably a builtin, - # such as __repr__ or __coerce__. TODO: Checking? - # For now assume params are OK. - return - - # callParams doesn't include self; args does include self. - numPosCallParams = 1 + len(callParams) - - if numPosCallParams > len(args) and not varargs: - raise MockInterfaceError("Original %s() takes at most %s arguments (%s given)" % - (name, len(args), numPosCallParams)) - - # Get the number of positional arguments that appear in the call, - # also check for duplicate parameters and unknown parameters - numPosSeen = _getNumPosSeenAndCheck(numPosCallParams, callKwParams, args, varkw) - - lenArgsNoDefaults = len(args) - len(defaults or []) - if numPosSeen < lenArgsNoDefaults: - raise MockInterfaceError("Original %s() takes at least %s arguments (%s given)" % (name, lenArgsNoDefaults, numPosSeen)) - - def mockGetAllCalls(self): - """ - Return a list of MockCall objects, - representing all the methods in the order they were called. - """ - return self.mockAllCalledMethods - getAllCalls = mockGetAllCalls # deprecated - kept for backward compatibility - - def mockGetNamedCalls(self, methodName): - """ - Return a list of MockCall objects, - representing all the calls to the named method in the order they were called. - """ - return self.mockCalledMethods.get(methodName, []) - getNamedCalls = mockGetNamedCalls # deprecated - kept for backward compatibility - - def mockCheckCall(self, index, name, *args, **kwargs): - '''test that the index-th call had the specified name and parameters''' - call = self.mockAllCalledMethods[index] - assert name == call.getName(), "%r != %r" % (name, call.getName()) - call.checkArgs(*args, **kwargs) - - -def _getNumPosSeenAndCheck(numPosCallParams, callKwParams, args, varkw): - """ - Positional arguments can appear as call parameters either named as - a named (keyword) parameter, or just as a value to be matched by - position. Count the positional arguments that are given by either - keyword or position, and check for duplicate specifications. - Also check for arguments specified by keyword that do not appear - in the method's parameter list. - """ - posSeen = {} - for arg in args[:numPosCallParams]: - posSeen[arg] = True - for kwp in callKwParams: - if kwp in posSeen: - raise MockInterfaceError("%s appears as both a positional and named parameter." % kwp) - if kwp in args: - posSeen[kwp] = True - elif not varkw: - raise MockInterfaceError("Original method does not have a parameter '%s'" % kwp) - return len(posSeen) - -class MockCall: - """ - MockCall records the name and parameters of a call to an instance - of a Mock class. Instances of MockCall are created by the Mock class, - but can be inspected later as part of the test. - """ - def __init__(self, name, params, kwparams ): - self.name = name - self.params = params - self.kwparams = kwparams - - def checkArgs(self, *args, **kwargs): - assert args == self.params, "%r != %r" % (args, self.params) - assert kwargs == self.kwparams, "%r != %r" % (kwargs, self.kwparams) - - def getParam( self, n ): - if isinstance(n, int): - return self.params[n] - elif isinstance(n, str): - return self.kwparams[n] - else: - raise IndexError('illegal index type for getParam') - - def getNumParams(self): - return len(self.params) - - def getNumKwParams(self): - return len(self.kwparams) - - def getName(self): - return self.name - - #pretty-print the method call - def __str__(self): - s = self.name + "(" - sep = '' - for p in self.params: - s = s + sep + repr(p) - sep = ', ' - items = sorted(self.kwparams.items()) - for k, v in items: - s = s + sep + k + '=' + repr(v) - sep = ', ' - s = s + ')' - return s - def __repr__(self): - return self.__str__() - -class MockCallable: - """ - Intercepts the call and records it, then delegates to either the mock's - dictionary of mock return values that was passed in to the constructor, - or a handcrafted method of a Mock subclass. - """ - def __init__(self, name, mock, handcrafted=False): - self.name = name - self.mock = mock - self.handcrafted = handcrafted - - def __call__(self, *params, **kwparams): - self.mock._checkInterfaceCall(self.name, params, kwparams) - thisCall = self.recordCall(params, kwparams) - self.checkExpectations(thisCall, params, kwparams) - return self.makeCall(params, kwparams) - - def recordCall(self, params, kwparams): - """ - Record the MockCall in an ordered list of all calls, and an ordered - list of calls for that method name. - """ - thisCall = MockCall(self.name, params, kwparams) - calls = self.mock.mockCalledMethods.setdefault(self.name, []) - calls.append(thisCall) - self.mock.mockAllCalledMethods.append(thisCall) - return thisCall - - def makeCall(self, params, kwparams): - if self.handcrafted: - allPosParams = (self.mock,) + params - func = _findFunc(self.mock.realClass, self.name) - if not func: - raise NotImplementedError - return func(*allPosParams, **kwparams) - else: - returnVal = self.mock.mockReturnValues.get(self.name) - if isinstance(returnVal, ReturnValuesBase): - returnVal = returnVal.next() - return returnVal - - def checkExpectations(self, thisCall, params, kwparams): - if self.name in self.mock.mockExpectations: - callsMade = len(self.mock.mockCalledMethods[self.name]) - for (expectation, after, until) in self.mock.mockExpectations[self.name]: - if callsMade > after and (until==0 or callsMade < until): - assert expectation(self.mock, thisCall, len(self.mock.mockAllCalledMethods)-1), 'Expectation failed: '+str(thisCall) - - -def _findFunc(cl, name): - """ Depth first search for a method with a given name. """ - if name in cl.__dict__: - return cl.__dict__[name] - for base in cl.__bases__: - func = _findFunc(base, name) - if func: - return func - return None - - - -class ReturnValuesBase: - def next(self): - try: - return self.iter.next() - except StopIteration: - raise AssertionError("No more return values") - def __iter__(self): - return self - -class ReturnValues(ReturnValuesBase): - def __init__(self, *values): - self.iter = iter(values) - - -class ReturnIterator(ReturnValuesBase): - def __init__(self, iterator): - self.iter = iter(iterator) - - -def expectParams(*params, **keywords): - '''check that the callObj is called with specified params and keywords - ''' - def fn(mockObj, callObj, idx): - return callObj.params == params and callObj.kwparams == keywords - return fn - - -def expectAfter(*methods): - '''check that the function is only called after all the functions in 'methods' - ''' - def fn(mockObj, callObj, idx): - calledMethods = [method.getName() for method in mockObj.mockGetAllCalls()] - #skip last entry, since that is the current call - calledMethods = calledMethods[:-1] - for method in methods: - if method not in calledMethods: - return False - return True - return fn - -def expectException(exception, *args, **kwargs): - ''' raise an exception when the method is called - ''' - def fn(mockObj, callObj, idx): - raise exception(*args, **kwargs) - return fn - - -def expectParam(paramIdx, cond): - '''check that the callObj is called with parameter specified by paramIdx (a position index or keyword) - fulfills the condition specified by cond. - cond is a function that takes a single argument, the value to test. - ''' - def fn(mockObj, callObj, idx): - param = callObj.getParam(paramIdx) - return cond(param) - return fn - -def EQ(value): - def testFn(param): - return param == value - return testFn - -def NE(value): - def testFn(param): - return param != value - return testFn - -def GT(value): - def testFn(param): - return param > value - return testFn - -def LT(value): - def testFn(param): - return param < value - return testFn - -def GE(value): - def testFn(param): - return param >= value - return testFn - -def LE(value): - def testFn(param): - return param <= value - return testFn - -def AND(*condlist): - def testFn(param): - for cond in condlist: - if not cond(param): - return False - return True - return testFn - -def OR(*condlist): - def testFn(param): - for cond in condlist: - if cond(param): - return True - return False - return testFn - -def NOT(cond): - def testFn(param): - return not cond(param) - return testFn - -def MATCHES(regex, *args, **kwargs): - compiled_regex = re.compile(regex, *args, **kwargs) - def testFn(param): - return compiled_regex.match(param) is not None - return testFn - -def SEQ(*sequence): - iterator = iter(sequence) - def testFn(param): - try: - cond = iterator.next() - except StopIteration: - raise AssertionError('SEQ exhausted') - return cond(param) - return testFn - -def IS(instance): - def testFn(param): - return param is instance - return testFn - -def ISINSTANCE(class_): - def testFn(param): - return isinstance(param, class_) - return testFn - -def ISSUBCLASS(class_): - def testFn(param): - return issubclass(param, class_) - return testFn - -def CONTAINS(val): - def testFn(param): - return val in param - return testFn - -def IN(container): - def testFn(param): - return param in container - return testFn - -def HASATTR(attr): - def testFn(param): - return hasattr(param, attr) - return testFn - -def HASMETHOD(method): - def testFn(param): - return hasattr(param, method) and callable(getattr(param, method)) - return testFn - -CALLABLE = callable ===================================== test/lib/notify.py deleted ===================================== @@ -1,28 +0,0 @@ -# mock notify module - -from gajim.common import app -from gajim.common import ged - -notifications = [] - -class Notification: - def _nec_notification(self, obj): - global notifications - notifications.append(obj) - - def clean(self): - global notifications - notifications = [] - app.ged.remove_event_handler('notification', ged.GUI2, - self._nec_notification) - - def __init__(self): - app.ged.register_event_handler('notification', ged.GUI2, - self._nec_notification) - - -def notify(event, jid, account, parameters, advanced_notif_num = None): - notifications.append((event, jid, account, parameters, advanced_notif_num)) - -def get_advanced_notification(event, account, contact): - return None ===================================== test/no_gui/__init__.py ===================================== @@ -0,0 +1,11 @@ +import gi + +def require_versions(): + gi.require_versions({'Gdk': '3.0', + 'GLib': '2.0', + 'Gio': '2.0', + 'Gtk': '3.0', + 'GObject': '2.0', + 'Pango': '1.0'}) + +require_versions() ===================================== test/no_gui/unit/test_nick_completion.py → test/no_gui/test_nick_completion.py ===================================== ===================================== test/no_gui/test_styling.py ===================================== @@ -8,8 +8,8 @@ from gajim.common.styling import StrongSpan from gajim.common.styling import EmphasisSpan from gajim.common.styling import StrikeSpan -from gajim.common.styling import Url -from gajim.common.styling import URL_RX +from gajim.common.styling import Uri +from gajim.common.styling import URI_RX from gajim.common.styling import ADDRESS_RX @@ -135,7 +135,7 @@ 'pre block with closing': { 'input': '```\npre *fmt* ```\n```\nplain', 'tokens': [ - PreBlock(start=0, end=22, text='```\npre *fmt* ```\n```\n', spans=[]), + PreBlock(start=0, end=22, text='```\npre *fmt* ```\n```\n'), PlainBlock(start=22, end=27, text='plain', spans=[]) ] }, @@ -143,7 +143,7 @@ 'pre block EOF': { 'input': '````\na\n```', 'tokens': [ - PreBlock(start=0, end=10, text='````\na\n```', spans=[]) + PreBlock(start=0, end=10, text='````\na\n```') ] }, @@ -164,7 +164,7 @@ 'single level block quote': { 'input': '> quoted\nnot quoted', 'tokens': [ - QuoteBlock(start=0, end=10, text='> quoted\n', spans=[], blocks=[ + QuoteBlock(start=0, end=10, text='> quoted\n', blocks=[ PlainBlock(start=0, end=8, text=' quoted\n', spans=[]) ]), PlainBlock(start=10, end=20, text='not quoted', spans=[]) @@ -174,9 +174,9 @@ 'multi level block quote': { 'input': '> quoted\n>> quote > 2\n>quote 1\n\nnot quoted', 'tokens': [ - QuoteBlock(start=0, end=34, text='> quoted\n>> quote > 2\n>quote 1\n', spans=[], blocks=[ + QuoteBlock(start=0, end=34, text='> quoted\n>> quote > 2\n>quote 1\n', blocks=[ PlainBlock(start=0, end=8, text=' quoted\n', spans=[]), - QuoteBlock(start=8, end=22, text='> quote > 2\n', spans=[], blocks=[ + QuoteBlock(start=8, end=22, text='> quote > 2\n', blocks=[ PlainBlock(start=0, end=12, text=' quote > 2\n', spans=[]) ]), PlainBlock(start=22, end=30, text='quote 1\n', spans=[]) @@ -188,15 +188,15 @@ 'quote start then EOF': { 'input': '> ', 'tokens': [ - QuoteBlock(start=0, end=2, text='> ', spans=[], blocks=[]) + QuoteBlock(start=0, end=2, text='> ', blocks=[]) ] }, 'quote with children': { 'input': '> ```\n> pre\n> ```\n> not pre', 'tokens': [ - QuoteBlock(start=0, end=27, text='> ```\n> pre\n> ```\n> not pre', spans=[], blocks=[ - PreBlock(start=0, end=12, text='```\npre\n```\n', spans=[]), + QuoteBlock(start=0, end=27, text='> ```\n> pre\n> ```\n> not pre', blocks=[ + PreBlock(start=0, end=12, text='```\npre\n```\n'), PlainBlock(start=12, end=19, text='not pre', spans=[]) ]) ] @@ -205,8 +205,8 @@ 'pre end of parent': { 'input': '> ``` \n> pre\nplain', 'tokens': [ - QuoteBlock(start=0, end=13, text='> ``` \n> pre\n', spans=[], blocks=[ - PreBlock(start=0, end=9, text='``` \npre\n', spans=[]) + QuoteBlock(start=0, end=13, text='> ``` \n> pre\n', blocks=[ + PreBlock(start=0, end=9, text='``` \npre\n') ]), PlainBlock(start=13, end=18, text='plain', spans=[]) ] @@ -223,7 +223,7 @@ 'input': 'some kind of link http://foo.com/blah_blah', 'tokens': [ PlainBlock(start=0, end=42, text='some kind of link http://foo.com/blah_blah', spans=[], uris=[ - Url(start=18, end=42, text='http://foo.com/blah_blah') + Uri(start=18, end=42, text='http://foo.com/blah_blah') ]) ] }, @@ -232,7 +232,7 @@ 'input': 'some kind of link http://foo.com/blah_blah,', 'tokens': [ PlainBlock(start=0, end=43, text='some kind of link http://foo.com/blah_blah,', spans=[], uris=[ - Url(start=18, end=42, text='http://foo.com/blah_blah') + Uri(start=18, end=42, text='http://foo.com/blah_blah') ]) ] }, @@ -243,7 +243,7 @@ PlainBlock(start=0, end=44, text='some *kind* of link http://foo.com/blah_blah', spans=[ StrongSpan(start=5, end=11, text='*kind*') ], uris=[ - Url(start=20, end=44, text='http://foo.com/blah_blah') + Uri(start=20, end=44, text='http://foo.com/blah_blah') ]) ] }, @@ -316,7 +316,7 @@ def test_styling(self): def test_urls(self): for url in URLS: - match = URL_RX.search(url) + match = URI_RX.search(url) self.assertIsNotNone(match) start = match.start() end = match.end() @@ -332,7 +332,7 @@ def test_emails(self): def test_url_with_text(self): for text, result in URL_WITH_TEXT: - match = URL_RX.search(text) + match = URI_RX.search(text) self.assertIsNotNone(match) start = match.start() end = match.end() ===================================== test/no_gui/unit/__init__.py deleted ===================================== @@ -1,5 +0,0 @@ -''' - -This package just contains plain unit tests - -''' ===================================== test/unit/__init__.py deleted ===================================== @@ -1,5 +0,0 @@ -''' - -This package just contains plain unit tests - -''' ===================================== test/unit/test_gui_interface.py deleted ===================================== @@ -1,32 +0,0 @@ -''' -Some diverse tests covering functionality in the GUI Interface class. -''' -import unittest - -import gajim.gui -gajim.gui.init('gtk') - -from test import lib -lib.setup_env() - -from gajim.common import logging_helpers -logging_helpers.set_quiet() - -from gajim.common import app - -from gajim.gui_interface import Interface - -from gi.repository import GLib - -class TestInterface(unittest.TestCase): - - def test_instantiation(self): - ''' Test that we can proper initialize and do not fail on globals ''' - def close_app(): - app.app.quit() - GLib.idle_add(close_app) - app.app.run() - - -if __name__ == "__main__": - unittest.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/540d29968e4dcfcb0ab19a713a6d6435… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/540d29968e4dcfcb0ab19a713a6d6435… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ChatList: Fix unread count for single chat
by Daniel Brötzmann (＠wurstsalat) 03 Dec '21

03 Dec '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 6e608ce7 by wurstsalat at 2021-12-03T23:28:10+01:00 ChatList: Fix unread count for single chat - - - - - 1 changed file: - gajim/gtk/chat_list.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -688,13 +688,14 @@ def add_unread(self, text: str) -> None: self._update_unread() self.get_parent().emit_unread_changed() - needs_highlight = message_needs_highlight( - text, - self.contact.nickname, - self._client.get_own_jid().bare) - if needs_highlight: - self._ui.unread_label.get_style_context().remove_class( - 'unread-counter-silent') + if self.contact.is_groupchat: + needs_highlight = message_needs_highlight( + text, + self.contact.nickname, + self._client.get_own_jid().bare) + if needs_highlight: + self._ui.unread_label.get_style_context().remove_class( + 'unread-counter-silent') def reset_unread(self) -> None: self._unread_count = 0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6e608ce7b8498a43b9f3956d55148a43… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6e608ce7b8498a43b9f3956d55148a43… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits