configure.in: python amd64 suse configure.in patch (Mads Martin Joerg…

…ensen).

history: add Ricky's patch so the current text isn't lost on history_up.
dccgui: add missing IG_DCC flag for new entries.
plugin: print plugin name on "xxx called without a valid context" messages.
textevents: add needed 5 spaces to ignore footer text event.
faq: remove "faq.html" from the links.
xtext: FALSE on gdk_colormap_alloc_color sharable arg.


git-svn-id: https://xchat.svn.sourceforge.net/svnroot/xchat@474 893a96be-7f27-4fdf-9d1e-6aeec9d3cce1

ChangeLog

@@ -2,6 +2,19 @@
 --|   X-Chat ChangeLog   |--------------------------------------------
   `----------------------'
 
+----------------------------------------------------------------------
+ x.y.z
+----------------------------------------------------------------------
+
+ - 3 python patches (not yet in).
+ - python amd64 suse configure.in patch (Mads Martin Joergensen).
+ - ricky's history patch (Ricky Clarkson).
+ - fixed missing dcc flag on new ignores via gui.
+ - print plugin name on "xxx called without a valid context" messages.
+ - add needed 5 spaces to ignore footer text event.
+ - FALSE on gdk_colormap_alloc_color sharable arg in xtext.c.
+
+
 ----------------------------------------------------------------------
  2.0.5
 ----------------------------------------------------------------------

configure.in

@@ -290,7 +290,7 @@ if test "$python" = yes; then
                 AC_MSG_CHECKING(Python version)
                 changequote(<<, >>)dnl
                 PY_VER=`$pythonpath -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_vars("VERSION")[0];'`
-                PY_LIB=`$pythonpath -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_vars("LIBDEST")[0];'`
+                PY_LIB=`$pythonpath -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(standard_lib=1);'`
                 PY_INC=`$pythonpath -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_vars("INCLUDEPY")[0];'`
                 $pythonpath -c "import sys; map(int,sys.version[:3].split('.')) >= [2,2] or sys.exit(1)"
                 changequote([, ])dnl
@@ -495,7 +495,7 @@ if test "$shm" = yes; then
 
 	LIBS=$oldl
 	if test "$shm" = yes; then
-		GUI_LIBS="$GUI_LIBS -lX11 -lXext"
+		GUI_LIBS="$GUI_LIBS `$pkgconfigpath --libs-only-L xft` -lX11 -lXext"
 		AC_DEFINE(USE_SHM)
 	else
 		CPPFLAGS=$oldc

faq.html

@@ -28,56 +28,56 @@ <h1>X-Chat 2 Frequently Asked Questions</h1>
 
 <h2>1. Section One: Compiling and Installing.</h2>
 <p>
-<a href="faq.html#q11">1. I get this error: /bin/sh: no: command not found</a>
+<a href="#q11">1. I get this error: /bin/sh: no: command not found</a>
 <br/><br/>
-<a href="faq.html#q12">2. How do I compile X-Chat on my Sun OS system?</a>
+<a href="#q12">2. How do I compile X-Chat on my Sun OS system?</a>
 <br/><br/>
 </p>
 
 <h2>2. Section Two: Using X-Chat.</h2>
 <p>
-<a href="faq.html#q21">1. How do I enable identd in X-Chat? (How do I get rid of the ~ infront of my username?)</a>
+<a href="#q21">1. How do I enable identd in X-Chat? (How do I get rid of the ~ infront of my username?)</a>
 <br/><br/>
-<a href="faq.html#q22">2. How do I auto join more than one channel with keys?</a>
+<a href="#q22">2. How do I auto join more than one channel with keys?</a>
 <br/><br/>
-<a href="faq.html#q23">3. How do I autoconnect and join a channel when X-Chat loads?</a>
+<a href="#q23">3. How do I autoconnect and join a channel when X-Chat loads?</a>
 <br/><br/>
-<a href="faq.html#q24">4. How do I cut and paste in X-Chat?</a>
+<a href="#q24">4. How do I cut and paste in X-Chat?</a>
 <br/><br/>
-<a href="faq.html#q25">5. How do I connect through a proxy?</a>
+<a href="#q25">5. How do I connect through a proxy?</a>
 <br/><br/>
-<a href="faq.html#q26">6. How do I show @ and + infront of nicknames that are Op and Voice when they talk?</a>
+<a href="#q26">6. How do I show @ and + infront of nicknames that are Op and Voice when they talk?</a>
 <br/><br/>
-<a href="faq.html#q27">7. What happened to question 7?</a>
+<a href="#q27">7. What happened to question 7?</a>
 <br/><br/>
-<a href="faq.html#q28">8. How do I set different ban types?</a>
+<a href="#q28">8. How do I set different ban types?</a>
 <br/><br/>
-<a href="faq.html#q29">9. Why can't I see accented-letters/umlauts/upper-ascii-chars in X-Chat?</a>
+<a href="#q29">9. Why can't I see accented-letters/umlauts/upper-ascii-chars in X-Chat?</a>
 <br/><br/>
-<a href="faq.html#q210">10. Why does the timestamp overlap some nicknames?</a>
+<a href="#q210">10. Why does the timestamp overlap some nicknames?</a>
 <br/><br/>
-<a href="faq.html#q211">11. How do I turn on Conference mode where I will not see join or part messages?</a>
+<a href="#q211">11. How do I turn on Conference mode where I will not see join or part messages?</a>
 <br/><br/>
-<a href="faq.html#q212">12. How can I run the /dccserver command?</a>
+<a href="#q212">12. How can I run the /dccserver command?</a>
 <br/><br/>
-<a href="faq.html#q213">13. Why doesn't DCC send work behind IPNat or IPMasq?</a>
+<a href="#q213">13. Why doesn't DCC send work behind IPNat or IPMasq?</a>
 <br/><br/>
-<a href="faq.html#q214">14. How do I execute multiple commands in one line?</a>
+<a href="#q214">14. How do I execute multiple commands in one line?</a>
 <br/><br/>
-<a href="faq.html#q215">15. How do I enable Emacs keybindings in XChat 2.0?</a>
+<a href="#q215">15. How do I enable Emacs keybindings in XChat 2.0?</a>
 <br/><br/>
-<a href="faq.html#q216">16. I get this error: "Unknown file type abc.yz. Maybe you need to install the Perl or Python plugin?"</a>
+<a href="#q216">16. I get this error: "Unknown file type abc.yz. Maybe you need to install the Perl or Python plugin?"</a>
 <br/><br/>
 
 </p>
 
 <h2>3. Section Three: Contributions, Development and Bugs.</h2>
 <p>
-<a href="faq.html#q31">1. Why does X-Chat leak so much memory?</a>
+<a href="#q31">1. Why does X-Chat leak so much memory?</a>
 <br/><br/>
-<a href="faq.html#q32">2. My copy of X-Chat crashes, what can I do?</a>
+<a href="#q32">2. My copy of X-Chat crashes, what can I do?</a>
 <br/><br/>
-<a href="faq.html#q33">3. Can I write a new language translation for X-Chat?</a>
+<a href="#q33">3. Can I write a new language translation for X-Chat?</a>
 </p>
 
 <br/><br/>

src/common/history.c

@@ -83,7 +83,7 @@ history_down (struct history *his)
 }
 
 char *
-history_up (struct history *his)
+history_up (struct history *his, char *current_text)
 {
 	int next;
 
@@ -103,6 +103,16 @@ history_up (struct history *his)
 
 	if (his->lines[next])
 	{
+		if
+		(
+			current_text[0] && strcmp(current_text, his->lines[next]) &&
+			(!his->lines[his->pos] || strcmp(current_text, his->lines[his->pos])) &&
+			(!his->lines[his->realpos] || strcmp(current_text, his->lines[his->pos]))
+		)
+		{
+			history_add (his, current_text);
+		}
+
 		his->pos = next;
 		return his->lines[his->pos];
 	}

src/common/history.h

@@ -9,5 +9,5 @@ struct history
 
 void history_add (struct history *his, char *text);
 void history_free (struct history *his);
-char *history_up (struct history *his);
+char *history_up (struct history *his, char *current_text);
 char *history_down (struct history *his);

src/common/plugin.c

@@ -46,7 +46,7 @@ typedef struct session xchat_context;
 #endif
 #endif
 
-#define DEBUG(t) PrintText(0,t)
+#define DEBUG(x) {x;}
 
 /* crafted to be an even 32 bytes */
 struct _xchat_hook
@@ -741,7 +741,7 @@ xchat_print (xchat_plugin *ph, char *text)
 {
 	if (!is_session (ph->context))
 	{
-		DEBUG("xchat_print called without a valid context.\n");
+		DEBUG(PrintTextf(0, "%s\txchat_print called without a valid context.\n", ph->name));
 		return;
 	}
 
@@ -767,7 +767,7 @@ xchat_command (xchat_plugin *ph, char *command)
 {
 	if (!is_session (ph->context))
 	{
-		DEBUG("xchat_command called without a valid context.\n");
+		DEBUG(PrintTextf(0, "%s\txchat_command called without a valid context.\n", ph->name));
 		return;
 	}
 
@@ -859,7 +859,7 @@ xchat_get_info (xchat_plugin *ph, const char *id)
 	sess = ph->context;
 	if (!is_session (sess))
 	{
-		DEBUG("xchat_get_info called without a valid context.\n");
+		DEBUG(PrintTextf(0, "%s\txchat_get_info called without a valid context.\n", ph->name));
 		return NULL;
 	}
 

src/common/textevents.h

@@ -207,7 +207,7 @@ N_("%O%C11$1%O added to ignore list.")},
 N_("Ignore on %C11$1%O changed.")},
 
 {"Ignore Footer", pevt_generic_none_help, 0, 0,
-N_("%C08,02                                                         %O")},
+N_("%C08,02                                                              %O")},
 
 {"Ignore Header", pevt_generic_none_help, 0, 0,
 N_("%C08,02 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG %O")},

src/common/textevents.in

@@ -409,7 +409,7 @@ Ignore on %C11$1%O changed.
 Ignore Footer
 XP_TE_IGNOREFOOTER
 pevt_generic_none_help
-%C08,02                                                         %O
+%C08,02                                                              %O
 0
 
 Ignore Header

src/fe-gtk/fkeys.c

@@ -1279,7 +1279,7 @@ key_action_history_up (GtkWidget * wid, GdkEventKey * ent, char *d1, char *d2,
 {
 	char *new_line;
 
-	new_line = history_up (&sess->history);
+	new_line = history_up (&sess->history, (char *)GTK_ENTRY (wid)->text);
 	if (new_line)
 	{
 		gtk_entry_set_text (GTK_ENTRY (wid), new_line);
@@ -1419,7 +1419,7 @@ static int
 key_action_put_history (GtkWidget * wid, GdkEventKey * ent, char *d1,
 									char *d2, struct session *sess)
 {
-	history_add (&sess->history, (char *)gtk_entry_get_text (GTK_ENTRY (wid)));
+	history_add (&sess->history, (char *)GTK_ENTRY (wid)->text);
 	gtk_entry_set_text (GTK_ENTRY (wid), "");
 	return 2;						  /* -''- */
 }

src/fe-gtk/ignoregui.c

@@ -269,7 +269,7 @@ ignore_store_new (int cancel, char *mask, gpointer data)
 	GtkListStore *store = GTK_LIST_STORE (get_store ());
 	GtkTreeIter iter;
 	GtkTreePath *path;
-	int flags = IG_CHAN | IG_PRIV | IG_NOTI | IG_CTCP | IG_INVI;
+	int flags = IG_CHAN | IG_PRIV | IG_NOTI | IG_CTCP | IG_DCC | IG_INVI;
 
 	if (cancel)
 		return;

src/fe-gtk/xtext.c

@@ -918,17 +918,17 @@ gtk_xtext_realize (GtkWidget * widget)
 
 	/* for the separator bar (light) */
 	col.red = 0xffff; col.green = 0xffff; col.blue = 0xffff;
-	gdk_colormap_alloc_color (cmap, &col, TRUE, TRUE);
+	gdk_colormap_alloc_color (cmap, &col, FALSE, TRUE);
 	gdk_gc_set_foreground (xtext->light_gc, &col);
 
 	/* for the separator bar (dark) */
 	col.red = 0x1111; col.green = 0x1111; col.blue = 0x1111;
-	gdk_colormap_alloc_color (cmap, &col, TRUE, TRUE);
+	gdk_colormap_alloc_color (cmap, &col, FALSE, TRUE);
 	gdk_gc_set_foreground (xtext->dark_gc, &col);
 
 	/* for the separator bar (thinline) */
 	col.red = 0x8e38; col.green = 0x8e38; col.blue = 0x9f38;
-	gdk_colormap_alloc_color (cmap, &col, TRUE, TRUE);
+	gdk_colormap_alloc_color (cmap, &col, FALSE, TRUE);
 	gdk_gc_set_foreground (xtext->thin_gc, &col);
 
 	xtext_set_fg (xtext, xtext->fgc, 18);