- - Attachment 219 by @nenolod

xirssi-svn.diff

Index: pixmaps/Makefile.am
===================================================================
--- pixmaps/Makefile.am	(revision 5140)
+++ pixmaps/Makefile.am	(working copy)
@@ -36,7 +36,8 @@
 	ball-orange.png \
 	ball-red.png \
 	irssilogo.jpg
-all: $(generated_pixmaps)
+all:
+# $(generated_pixmaps)
 
 clean-generic:
 	rm -f $(generated_pixmaps)
Index: src/dialog-about.c
===================================================================
--- src/dialog-about.c	(revision 5140)
+++ src/dialog-about.c	(working copy)
@@ -24,6 +24,8 @@
 #include "gui-menu.h"
 
 #define IRSSI_COPYRIGHT "Copyright (C) 1999-2002 Timo Sirainen"
+#define IRSSI_WEBSITE "http://irssi.org/"
+#define IRSSI_AUTHOR_EMAIL "tss@iki.fi"
 
 static GtkWidget *dialog = NULL;
 
@@ -65,7 +67,7 @@
 			 GTK_SIGNAL_FUNC(gtk_widget_destroy), NULL);
 
 	/* name */
-	label = gtk_label_new(PACKAGE);
+	label = gtk_label_new(PACKAGE_NAME);
 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), label,
 			   FALSE, FALSE, 10);
 
@@ -93,7 +95,7 @@
 	gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
 
 	/* version */
-	g_snprintf(str, sizeof(str), "version " IRSSI_VERSION " (%d %04d)",
+	g_snprintf(str, sizeof(str), "version " PACKAGE_VERSION " (%d %04d)",
 		   IRSSI_VERSION_DATE, IRSSI_VERSION_TIME);
 
 	label = gtk_label_new(str);
Index: src/gui-menu-main.c
===================================================================
--- src/gui-menu-main.c	(revision 5140)
+++ src/gui-menu-main.c	(working copy)
@@ -113,7 +113,7 @@
 		signal_emit("url open", 2, STARTUP_HOWTO_URL, "http");
 		break;
 	case ACTION_HOMEPAGE:
-		signal_emit("url open", 2, IRSSI_WEBSITE, "http");
+		signal_emit("url open", 2, "http://irssi.org/", "http");
 		break;
 	case ACTION_ABOUT:
 		dialog_about_show();
Index: src/setup-highlighting-edit.c
===================================================================
--- src/setup-highlighting-edit.c	(revision 5140)
+++ src/setup-highlighting-edit.c	(working copy)
@@ -46,7 +46,7 @@
 
 	/* level */
 	entry = g_object_get_data(obj, "level");
-	highlight->level = level2bits(gtk_entry_get_text(entry));
+	highlight->level = level2bits(gtk_entry_get_text(entry), NULL);
 	if (highlight->level == 0)
 		highlight->level = MSGLEVEL_ALL;
 
Index: src/gui-window-view.c
===================================================================
--- src/gui-window-view.c	(revision 5140)
+++ src/gui-window-view.c	(working copy)
@@ -102,7 +102,7 @@
 {
         WindowView *view;
 	GtkWidget *sw, *text_view;
-	/*PangoFontDescription *font_desc;*/
+	PangoFontDescription *font_desc;
 	GdkColor color;
 
 	view = g_new0(WindowView, 1);
@@ -134,9 +134,9 @@
 	gtk_container_add(GTK_CONTAINER(sw), text_view);
 
 	/* FIXME: configurable */
-	/*font_desc = pango_font_description_from_string("fixed 10");
+	font_desc = pango_font_description_from_string("fixed 10");
 	gtk_widget_modify_font(text_view, font_desc);
-	pango_font_description_free(font_desc);*/
+	pango_font_description_free(font_desc);
 
 	gtk_text_view_set_cursor_visible(view->view, FALSE);
 	gtk_text_view_set_wrap_mode(view->view, GTK_WRAP_WORD);
Index: src/module.h
===================================================================
--- src/module.h	(revision 5140)
+++ src/module.h	(working copy)
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "irssi-config.h"
 
 #include <gtk/gtk.h>
 
Index: src/glade/interface.c
===================================================================
--- src/glade/interface.c	(revision 5140)
+++ src/glade/interface.c	(working copy)
@@ -2,10 +2,6 @@
  * DO NOT EDIT THIS FILE - it is generated by Glade.
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
Index: src/glade/support.h
===================================================================
--- src/glade/support.h	(revision 5140)
+++ src/glade/support.h	(working copy)
@@ -3,7 +3,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#  include <irssi-config.h>
 #endif
 
 #include <gtk/gtk.h>
Index: src/glade/support.c
===================================================================
--- src/glade/support.c	(revision 5140)
+++ src/glade/support.c	(working copy)
@@ -3,7 +3,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#  include <irssi-config.h>
 #endif
 
 #include <sys/types.h>
Index: src/gui-nicklist-view.c
===================================================================
--- src/gui-nicklist-view.c	(revision 5140)
+++ src/gui-nicklist-view.c	(working copy)
@@ -27,10 +27,6 @@
 #include "gui-nicklist-view.h"
 #include "gui-menu.h"
 
-#include "ball-green.h"
-#include "ball-orange.h"
-#include "ball-yellow.h"
-
 static GdkPixbuf *op_pixbuf, *voice_pixbuf, *halfop_pixbuf;
 
 static gboolean event_destroy(GtkWidget *widget, NicklistView *view)
@@ -320,17 +316,21 @@
 
 void gui_nicklist_views_init(void)
 {
+#if 0
 	op_pixbuf = gdk_pixbuf_new_from_inline(sizeof(ball_green),
 					       ball_green, FALSE, NULL);
 	halfop_pixbuf = gdk_pixbuf_new_from_inline(sizeof(ball_orange),
 						   ball_orange, FALSE, NULL);
 	voice_pixbuf = gdk_pixbuf_new_from_inline(sizeof(ball_yellow),
 						  ball_yellow, FALSE, NULL);
+#endif
 }
 
 void gui_nicklist_views_deinit(void)
 {
+#if 0
 	gdk_pixbuf_unref(op_pixbuf);
 	gdk_pixbuf_unref(halfop_pixbuf);
 	gdk_pixbuf_unref(voice_pixbuf);
+#endif
 }
Index: src/setup-ignores-edit.c
===================================================================
--- src/setup-ignores-edit.c	(revision 5140)
+++ src/setup-ignores-edit.c	(working copy)
@@ -52,7 +52,7 @@
 
 	/* level */
 	entry = g_object_get_data(obj, "level");
-	ignore->level = level2bits(gtk_entry_get_text(entry));
+	ignore->level = level2bits(gtk_entry_get_text(entry), NULL);
 	if (ignore->level == 0)
 		ignore->level = MSGLEVEL_ALL;
 
Index: src/gui-window.c
===================================================================
--- src/gui-window.c	(revision 5140)
+++ src/gui-window.c	(working copy)
@@ -164,10 +164,10 @@
 		gtk_text_buffer_apply_tag(window->buffer, window->tag_underline,
 					  &start_iter, &iter);
 	}
-	if (flags & GUI_PRINT_FLAG_MONOSPACE) {
+//	if (flags & GUI_PRINT_FLAG_MONOSPACE) {
 		gtk_text_buffer_apply_tag(window->buffer, window->tag_monospace,
 					  &start_iter, &iter);
-	}
+//	}
 
 	if ((flags & GUI_PRINT_FLAG_MIRC_COLOR) == 0) {
 		/* normal color */
@@ -275,7 +275,7 @@
 
 	gui->buffer = gtk_text_buffer_new(NULL);
 	gui->tagtable = gtk_text_buffer_get_tag_table(gui->buffer);
-	gui->font_monospace = pango_font_description_from_string("fixed 10");
+	gui->font_monospace = pango_font_description_from_string("Monospace 10");
 
 	/* underline tag */
 	gui->tag_underline =
Index: src/irssi.c
===================================================================
--- src/irssi.c	(revision 5140)
+++ src/irssi.c	(working copy)
@@ -163,7 +163,7 @@
 {
 	gtk_init(&argc, &argv);
 
-	core_init_paths(argc, argv);
+	core_register_options();
 
 #ifdef HAVE_SOCKS
 	SOCKSinit(argv[0]);
@@ -174,6 +174,9 @@
 	textdomain(PACKAGE);
 #endif
 
+	core_preinit(argv[0]);
+	core_init();
+
 	gui_init();
 	args_execute(argc, argv);
 
Index: src/gui-nicklist.c
===================================================================
--- src/gui-nicklist.c	(revision 5140)
+++ src/gui-nicklist.c	(working copy)
@@ -36,7 +36,7 @@
 	gtk_tree_model_get(model, a, 0, &nick1, -1);
 	gtk_tree_model_get(model, b, 0, &nick2, -1);
 
-	return nicklist_compare(nick1, nick2);
+	return nicklist_compare(nick1, nick2, user_data);
 }
 
 Nicklist *gui_nicklist_new(Channel *channel)
Index: src/gui-keyboard.c
===================================================================
--- src/gui-keyboard.c	(revision 5140)
+++ src/gui-keyboard.c	(working copy)
@@ -27,7 +27,6 @@
 #include "keyboard.h"
 #include "completion.h"
 #include "command-history.h"
-#include "translation.h"
 
 #include "gui-keyboard.h"
 #include "gui-entry.h"
@@ -377,7 +376,6 @@
 		/* error - fallback to utf8 */
 		str = g_strdup(line);
 	}
-	translate_output(str);
 
 	gtk_widget_ref(entry->widget);
 
@@ -424,7 +422,7 @@
 	pos = gtk_editable_get_position(GTK_EDITABLE(entry->entry));
 
         text = gtk_entry_get_text(entry->entry);
-	line = word_complete(entry->active_win, text, &pos, erase);
+	line = word_complete(entry->active_win, text, &pos, erase, FALSE);
 
 	if (line != NULL) {
 		gtk_entry_set_text(entry->entry, line);

[patch] make xirssi work with latest SVN #749

Description

Metadata

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Issue actions