[Pkg-cli-apps-commits] [SCM] smuxi branch, master, updated. debian/0.7.2.1-2-3-g8e6bf6b
Mirco Bauer
meebey at meebey.net
Wed Jul 28 02:22:50 UTC 2010
The following commit has been merged in the master branch:
commit 37b22cbd2a15274d4404d714984e2f84fb08d802
Author: Mirco Bauer <meebey at meebey.net>
Date: Wed Jul 28 03:42:08 2010 +0200
Imported Upstream version 0.7.2.2
diff --git a/configure b/configure
index a8e0da6..4641dd5 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for smuxi 0.7.2.1.
+# Generated by GNU Autoconf 2.65 for smuxi 0.7.2.2.
#
# Report bugs to <http://www.smuxi.org/issues/new>.
#
@@ -552,8 +552,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='smuxi'
PACKAGE_TARNAME='smuxi'
-PACKAGE_VERSION='0.7.2.1'
-PACKAGE_STRING='smuxi 0.7.2.1'
+PACKAGE_VERSION='0.7.2.2'
+PACKAGE_STRING='smuxi 0.7.2.2'
PACKAGE_BUGREPORT='http://www.smuxi.org/issues/new'
PACKAGE_URL=''
@@ -1368,7 +1368,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures smuxi 0.7.2.1 to adapt to many kinds of systems.
+\`configure' configures smuxi 0.7.2.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1438,7 +1438,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of smuxi 0.7.2.1:";;
+ short | recursive ) echo "Configuration of smuxi 0.7.2.2:";;
esac
cat <<\_ACEOF
@@ -1596,7 +1596,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-smuxi configure 0.7.2.1
+smuxi configure 0.7.2.2
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1843,7 +1843,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by smuxi $as_me 0.7.2.1, which was
+It was created by smuxi $as_me 0.7.2.2, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2654,7 +2654,7 @@ fi
# Define the identity of the package.
PACKAGE='smuxi'
- VERSION='0.7.2.1'
+ VERSION='0.7.2.2'
cat >>confdefs.h <<_ACEOF
@@ -9025,7 +9025,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by smuxi $as_me 0.7.2.1, which was
+This file was extended by smuxi $as_me 0.7.2.2, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -9082,7 +9082,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-smuxi config.status 0.7.2.1
+smuxi config.status 0.7.2.2
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 1e12cb8..78c4c41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.54])
-AC_INIT([smuxi], [0.7.2.1], [http://www.smuxi.org/issues/new])
+AC_INIT([smuxi], [0.7.2.2], [http://www.smuxi.org/issues/new])
# using the --foreign option makes automake less strict about GNU policy
AC_CONFIG_MACRO_DIR([.])
AM_INIT_AUTOMAKE([foreign])
diff --git a/src/AssemblyVersion.cs b/src/AssemblyVersion.cs
index d47a27b..8c1f161 100644
--- a/src/AssemblyVersion.cs
+++ b/src/AssemblyVersion.cs
@@ -36,5 +36,5 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("0.7.2.1")]
+[assembly: AssemblyVersion("0.7.2.2")]
diff --git a/src/Common/Pattern.cs b/src/Common/Pattern.cs
index f822beb..f175db6 100644
--- a/src/Common/Pattern.cs
+++ b/src/Common/Pattern.cs
@@ -76,8 +76,9 @@ namespace Smuxi.Common
return false;
}
- return !input.StartsWith("*") && !input.EndsWith("*") &&
- !(input.StartsWith("/") && input.EndsWith("/"));
+ return input.StartsWith("*") || input.EndsWith("*") ||
+ (input.Length >= 2 &&
+ input.StartsWith("/") && input.EndsWith("/"));
}
}
}
diff --git a/src/Engine/Config/Config.cs b/src/Engine/Config/Config.cs
index ae967b3..debbd6b 100644
--- a/src/Engine/Config/Config.cs
+++ b/src/Engine/Config/Config.cs
@@ -289,7 +289,7 @@ namespace Smuxi.Engine
"IRC/irc.oftc.net",
"IRC/irc.gimp.org",
"IRC/irc.efnet.org",
- "IRC/irc.ircnet.com",
+ "IRC/irc.ircnet.org",
"IRC/irc.freenode.net"
});
diff --git a/src/Engine/Config/UserConfig.cs b/src/Engine/Config/UserConfig.cs
index 2f32531..c252419 100644
--- a/src/Engine/Config/UserConfig.cs
+++ b/src/Engine/Config/UserConfig.cs
@@ -27,6 +27,7 @@
*/
using System;
+using System.Runtime.Remoting;
using System.Collections;
namespace Smuxi.Engine
@@ -104,7 +105,10 @@ namespace Smuxi.Engine
// compatibility with 0.7.x server we need to suppress remoting
// exceptions here
try {
- _Config.Changed += OnConfigChanged;
+ // we can't use events over remoting
+ if (!RemotingServices.IsTransparentProxy(config)) {
+ _Config.Changed += OnConfigChanged;
+ }
} catch (Exception ex) {
#if LOG4NET
_Logger.Warn(
diff --git a/src/Frontend-GNOME/Views/Chats/ChatView.cs b/src/Frontend-GNOME/Views/Chats/ChatView.cs
index 0cc31f7..cd71f12 100644
--- a/src/Frontend-GNOME/Views/Chats/ChatView.cs
+++ b/src/Frontend-GNOME/Views/Chats/ChatView.cs
@@ -483,14 +483,6 @@ namespace Smuxi.Frontend.Gnome
tv.ScrollMarkOnscreen(tv.Buffer.InsertMark);
}
- int buffer_lines = (int)Frontend.UserConfig["Interface/Notebook/BufferLines"];
- if (tv.Buffer.LineCount > buffer_lines) {
- Gtk.TextIter start_iter = tv.Buffer.StartIter;
- // TODO: maybe we should delete chunks instead of each line
- Gtk.TextIter end_iter = tv.Buffer.GetIterAtLine(tv.Buffer.LineCount - buffer_lines);
- tv.Buffer.Delete(ref start_iter, ref end_iter);
- }
-
// update the end mark
tv.Buffer.MoveMark(_EndMark, tv.Buffer.EndIter);
}
diff --git a/src/Frontend-GNOME/Views/MessageTextView.cs b/src/Frontend-GNOME/Views/MessageTextView.cs
index 51ca798..e83134d 100644
--- a/src/Frontend-GNOME/Views/MessageTextView.cs
+++ b/src/Frontend-GNOME/Views/MessageTextView.cs
@@ -51,6 +51,7 @@ namespace Smuxi.Frontend.Gnome
private ThemeSettings _ThemeSettings;
private Gdk.Color _MarkerlineColor = new Gdk.Color(255, 0, 0);
private int _MarkerlineBufferPosition;
+ private int _BufferLines = -1;
public event MessageTextViewMessageAddedEventHandler MessageAdded;
public event MessageTextViewMessageHighlightedEventHandler MessageHighlighted;
@@ -157,6 +158,8 @@ namespace Smuxi.Frontend.Gnome
}
WrapMode = wrapMode;
}
+
+ _BufferLines = (int) config["Interface/Notebook/BufferLines"];
}
public void Clear()
@@ -298,6 +301,8 @@ namespace Smuxi.Frontend.Gnome
Buffer.Insert(ref iter, "\n");
}
+ CheckBufferSize();
+
// HACK: force a redraw of the widget, as for some reason
// GTK+ 2.17.6 is not redrawing some lines we add here, especially
// for local messages. See:
@@ -567,6 +572,32 @@ namespace Smuxi.Frontend.Gnome
window.DrawLine(gc, 0, y, VisibleRect.Width, y);
}
+ void CheckBufferSize()
+ {
+ if (_BufferLines == -1) {
+ // no limit defined
+ return;
+ }
+
+ if (Buffer.LineCount > _BufferLines) {
+ Gtk.TextIter start_iter = Buffer.StartIter;
+ // TODO: maybe we should delete chunks instead of each line
+ Gtk.TextIter end_iter = Buffer.GetIterAtLine(Buffer.LineCount -
+ _BufferLines);
+ int offset = end_iter.Offset;
+ Buffer.Delete(ref start_iter, ref end_iter);
+
+ // update markerline offset if present
+ if (_MarkerlineBufferPosition != 0) {
+ _MarkerlineBufferPosition -= offset;
+ // remove markerline if it went out of buffer
+ if (_MarkerlineBufferPosition < 0) {
+ _MarkerlineBufferPosition = 0;
+ }
+ }
+ }
+ }
+
private static string _(string msg)
{
return Mono.Unix.Catalog.GetString(msg);
--
smuxi
More information about the Pkg-cli-apps-commits
mailing list