@@ -19,6 +19,7 @@ - Focus the inputbox when left-clicking in xtext. - Fixed bug where text typed could be sent to the wrong window after a detach. + - New default icon again, this one scales better (Dagmar d'Surreal). - - ChangeLog @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-01-02 15:47+1100\n" +"POT-Creation-Date: 2003-01-04 13:11+1100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -19,15 +19,15 @@ msgstr "" msgid "Cannot create ~/.xchat2" msgstr "" -#: src/common/cfgfiles.c:537 +#: src/common/cfgfiles.c:541 msgid "I'm busy" msgstr "" -#: src/common/cfgfiles.c:538 +#: src/common/cfgfiles.c:542 msgid "Client exiting" msgstr "" -#: src/common/cfgfiles.c:581 +#: src/common/cfgfiles.c:585 msgid "" "* Running IRC as root is stupid! You should\n" " create a User Account and use that to login.\n" @@ -566,13 +566,13 @@ msgstr "" msgid "Nick of person who changed the topic" msgstr "" -#: src/common/text.c:586 src/common/text.c:592 src/fe-gtk/chanlist.c:583 -#: src/fe-gtk/chanlist.c:686 +#: src/common/text.c:586 src/common/text.c:592 src/fe-gtk/chanlist.c:593 +#: src/fe-gtk/chanlist.c:696 msgid "Topic" msgstr "" #: src/common/text.c:587 src/common/text.c:591 src/common/text.c:1001 -#: src/fe-gtk/chanlist.c:583 src/fe-gtk/chanlist.c:677 +#: src/fe-gtk/chanlist.c:593 src/fe-gtk/chanlist.c:687 #: src/fe-gtk/ignoregui.c:394 msgid "Channel" msgstr "" @@ -811,7 +811,7 @@ msgstr "" msgid "Nick of person who invited you" msgstr "" -#: src/common/text.c:819 src/fe-gtk/chanlist.c:583 +#: src/common/text.c:819 src/fe-gtk/chanlist.c:593 msgid "Users" msgstr "" @@ -2127,52 +2127,52 @@ msgstr "" msgid "User and Channel Statistics: %d/%d Users on %d/%d Channels" msgstr "" -#: src/fe-gtk/chanlist.c:526 +#: src/fe-gtk/chanlist.c:536 msgid "I can't save an empty list!" msgstr "" -#: src/fe-gtk/chanlist.c:529 src/fe-gtk/menu.c:842 +#: src/fe-gtk/chanlist.c:539 src/fe-gtk/menu.c:842 msgid "Select an output filename" msgstr "" -#: src/fe-gtk/chanlist.c:593 +#: src/fe-gtk/chanlist.c:603 #, c-format msgid "X-Chat: Channel List (%s)" msgstr "" -#: src/fe-gtk/chanlist.c:608 +#: src/fe-gtk/chanlist.c:618 msgid "List display options:" msgstr "" -#: src/fe-gtk/chanlist.c:620 +#: src/fe-gtk/chanlist.c:630 msgid "Minimum Users:" msgstr "" -#: src/fe-gtk/chanlist.c:635 +#: src/fe-gtk/chanlist.c:645 msgid "Maximum Users:" msgstr "" -#: src/fe-gtk/chanlist.c:650 +#: src/fe-gtk/chanlist.c:660 msgid "Regex Match:" msgstr "" -#: src/fe-gtk/chanlist.c:671 +#: src/fe-gtk/chanlist.c:681 msgid "Apply Match to:" msgstr "" -#: src/fe-gtk/chanlist.c:695 +#: src/fe-gtk/chanlist.c:705 msgid "Apply" msgstr "" -#: src/fe-gtk/chanlist.c:737 +#: src/fe-gtk/chanlist.c:747 msgid "Refresh the list" msgstr "" -#: src/fe-gtk/chanlist.c:739 +#: src/fe-gtk/chanlist.c:749 msgid "Save the list" msgstr "" -#: src/fe-gtk/chanlist.c:741 src/fe-gtk/menu.c:650 +#: src/fe-gtk/chanlist.c:751 src/fe-gtk/menu.c:650 msgid "Join Channel" msgstr "" @@ -2422,7 +2422,7 @@ msgstr "" #: src/fe-gtk/fkeys.c:394 src/fe-gtk/fkeys.c:673 src/fe-gtk/fkeys.c:679 #: src/fe-gtk/fkeys.c:684 src/fe-gtk/maingui.c:712 src/fe-gtk/maingui.c:733 -#: src/fe-gtk/maingui.c:780 src/fe-gtk/maingui.c:2067 +#: src/fe-gtk/maingui.c:780 src/fe-gtk/maingui.c:2070 msgid "<none>" msgstr "" @@ -2663,32 +2663,32 @@ msgstr "" msgid "Show/Hide userlist" msgstr "" -#: src/fe-gtk/maingui.c:1604 +#: src/fe-gtk/maingui.c:1607 msgid "Insert color code" msgstr "" -#: src/fe-gtk/maingui.c:1624 +#: src/fe-gtk/maingui.c:1627 #, c-format msgid "(%s) Channel settings" msgstr "" -#: src/fe-gtk/maingui.c:1634 +#: src/fe-gtk/maingui.c:1637 msgid "Beep on message" msgstr "" -#: src/fe-gtk/maingui.c:1636 +#: src/fe-gtk/maingui.c:1639 msgid "Hide join/parts" msgstr "" -#: src/fe-gtk/maingui.c:1638 +#: src/fe-gtk/maingui.c:1641 msgid "Color paste" msgstr "" -#: src/fe-gtk/maingui.c:1661 +#: src/fe-gtk/maingui.c:1664 msgid "Enter new nickname:" msgstr "" -#: src/fe-gtk/maingui.c:1732 +#: src/fe-gtk/maingui.c:1735 msgid "Channel Options" msgstr "" po/xchat.pot @@ -446,7 +446,7 @@ load_config (void) { struct stat st; char *cfg; - const char *username; + const char *username, *realname; int res, val, i, fh; check_prefs_dir (); @@ -454,6 +454,10 @@ load_config (void) if (!username) username = "root"; + realname = g_get_real_name (); + if ((realname && realname[0] == 0) || !realname) + realname = username; + memset (&prefs, 0, sizeof (struct xchatprefs)); /* put in default values, anything left out is automatically zero */ @@ -522,7 +526,7 @@ load_config (void) strcat (prefs.nick2, "_"); strcpy (prefs.nick3, username); strcat (prefs.nick3, "__"); - strcpy (prefs.realname, username); + strcpy (prefs.realname, realname); strcpy (prefs.username, username); #ifdef WIN32 strcpy (prefs.sounddir, "./sound"); src/common/cfgfiles.c @@ -1807,7 +1807,7 @@ cmd_load (struct session *sess, char *tbuf, char *word[], char *word_eol[]) } #endif - sprintf (tbuf, "Unknown file type %s\n", word[2]); + sprintf (tbuf, "Unknown file type %s. Maybe you need to install the Perl or Python plugin?\n", word[2]); PrintText (sess, tbuf); return FALSE; src/common/outbound.c @@ -304,6 +304,9 @@ process_numeric (session * sess, char *outbuf, int n, { serv->use_listargs = TRUE; /* use the /list args */ serv->modes_per_line = 6; /* allow 6 modes per line */ + } else if (strncmp (word[5], "glx2", 4) == 0) + { + serv->use_listargs = TRUE; /* use the /list args */ } goto def; @@ -330,7 +333,7 @@ process_numeric (session * sess, char *outbuf, int n, goto def; case 312: - EMIT_SIGNAL (XP_TE_WHOIS3, sess, word[4], word_eol[5], NULL, NULL, 0); + EMIT_SIGNAL (XP_TE_WHOIS3, serv->server_session, word[4], word_eol[5], NULL, NULL, 0); break; case 311: @@ -338,7 +341,7 @@ process_numeric (session * sess, char *outbuf, int n, /* FALL THROUGH */ case 314: - EMIT_SIGNAL (XP_TE_WHOIS1, sess, word[4], word[5], + EMIT_SIGNAL (XP_TE_WHOIS1, serv->server_session, word[4], word[5], word[6], word_eol[8] + 1, 0); break; @@ -350,27 +353,27 @@ process_numeric (session * sess, char *outbuf, int n, sprintf (outbuf, "%02ld:%02ld:%02ld", idle / 3600, (idle / 60) % 60, idle % 60); if (n == 0) - EMIT_SIGNAL (XP_TE_WHOIS4, serv->front_session, - word[4], outbuf, NULL, NULL, 0); + EMIT_SIGNAL (XP_TE_WHOIS4, serv->server_session, word[4], + outbuf, NULL, NULL, 0); else { tim = ctime (&n); tim[19] = 0; /* get rid of the \n */ - EMIT_SIGNAL (XP_TE_WHOIS4T, serv->front_session, - word[4], outbuf, tim, NULL, 0); + EMIT_SIGNAL (XP_TE_WHOIS4T, serv->server_session, word[4], + outbuf, tim, NULL, 0); } } break; case 318: serv->inside_whois = 0; - EMIT_SIGNAL (XP_TE_WHOIS6, serv->front_session, word[4], NULL, + EMIT_SIGNAL (XP_TE_WHOIS6, serv->server_session, word[4], NULL, NULL, NULL, 0); break; case 313: case 319: - EMIT_SIGNAL (XP_TE_WHOIS2, serv->front_session, word[4], + EMIT_SIGNAL (XP_TE_WHOIS2, serv->server_session, word[4], word_eol[5] + 1, NULL, NULL, 0); break; @@ -559,7 +562,7 @@ process_numeric (session * sess, char *outbuf, int n, { realsess = find_channel (serv, word[4]); if (!realsess) - realsess = sess; + realsess = serv->server_session; EMIT_SIGNAL (XP_TE_SERVTEXT, realsess, text, word[1], NULL, NULL, 0); } else { src/common/proto-irc.c @@ -204,6 +204,8 @@ static void chanlist_place_row_in_gui (struct server *serv, gchar ** next_row) { int num_users = atoi (next_row[1]); + gfloat val, end; + GtkAdjustment *adj; /* First, update the 'found' counter values */ serv->gui->chanlist_users_found_count += num_users; @@ -260,6 +262,8 @@ chanlist_place_row_in_gui (struct server *serv, gchar ** next_row) } } + adj = gtk_clist_get_vadjustment (GTK_CLIST (serv->gui->chanlist_list)); + val = adj->value; /* * If all the above above tests passed or if no text was in the * chanlist_wild_text, add this entry to the GUI @@ -270,6 +274,12 @@ chanlist_place_row_in_gui (struct server *serv, gchar ** next_row) serv->gui->chanlist_users_shown_count += num_users; serv->gui->chanlist_channels_shown_count++; + /* restore original scrollbar position */ + end = adj->upper - adj->lower - adj->page_size; + if (val > end) + val = end; + gtk_adjustment_set_value (adj, val); + chanlist_update_caption (serv); } src/fe-gtk/chanlist.c @@ -1489,12 +1489,15 @@ mg_create_meters (session_gui *gui, GtkWidget *box) } static void -mg_create_userlist (session_gui *gui, GtkWidget *box) +mg_create_userlist (session_gui *gui, GtkWidget *box, int pack) { GtkWidget *frame, *ulist, *vbox; vbox = gtk_vbox_new (0, 0); - gtk_box_pack_start (GTK_BOX (box), vbox, 0, 0, 0); + if (pack) + gtk_box_pack_start (GTK_BOX (box), vbox, 0, 0, 0); + else + gtk_container_add (GTK_CONTAINER (box), vbox); frame = gtk_frame_new (NULL); gtk_box_pack_start (GTK_BOX (vbox), frame, 0, 0, 1); @@ -1521,37 +1524,37 @@ mg_create_userlist (session_gui *gui, GtkWidget *box) static void mg_create_center (session *sess, session_gui *gui, GtkWidget *box) { - GtkWidget *vbox, *hbox, *tbox, *paned; + GtkWidget *vbox, *hbox, *paned; + + hbox = gtk_hbox_new (FALSE, 1); if (prefs.paned_userlist) { paned = gtk_hpaned_new (); - - hbox = gtk_hbox_new (FALSE, 1); gtk_paned_add1 (GTK_PANED (paned), hbox); vbox = gtk_vbox_new (FALSE, 1); gtk_container_add (GTK_CONTAINER (hbox), vbox); - tbox = gtk_hbox_new (FALSE, 0); - gtk_paned_add2 (GTK_PANED (paned), tbox); - gtk_container_add (GTK_CONTAINER (box), paned); mg_create_textarea (gui, vbox); - mg_create_userlist (gui, tbox); mg_create_entry (sess, vbox); + hbox = gtk_hbox_new (FALSE, 1); + gtk_paned_add2 (GTK_PANED (paned), hbox); + + mg_create_userlist (gui, hbox, FALSE); + } else { - hbox = gtk_hbox_new (FALSE, 1); gtk_container_add (GTK_CONTAINER (box), hbox); vbox = gtk_vbox_new (FALSE, 1); gtk_container_add (GTK_CONTAINER (hbox), vbox); mg_create_textarea (gui, vbox); - mg_create_userlist (gui, hbox); + mg_create_userlist (gui, hbox, TRUE); mg_create_entry (sess, vbox); } } src/fe-gtk/maingui.c @@ -12,7 +12,6 @@ PNGS = book.png hop.png op.png purple.png red.png voice.png xchat.png noinst_HEADERS = inline_pngs.h CLEANFILES = $(noinst_HEADERS) EXTRA_DIST = $(PNGS) makefile.msc -CONV = @gdkpixbufcsourcepath@ inline_pngs.h: - $(CONV) --build-list $(LIST) > $(srcdir)/inline_pngs.h + @gdkpixbufcsourcepath@ --build-list $(LIST) > $(srcdir)/inline_pngs.h src/pixmaps/Makefile.am @@ -148,7 +148,6 @@ PNGS = book.png hop.png op.png purple.png red.png voice.png xchat.png noinst_HEADERS = inline_pngs.h CLEANFILES = $(noinst_HEADERS) EXTRA_DIST = $(PNGS) makefile.msc -CONV = @gdkpixbufcsourcepath@ subdir = src/pixmaps mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h @@ -317,7 +316,7 @@ uninstall-am: uninstall-info-am inline_pngs.h: - $(CONV) --build-list $(LIST) > $(srcdir)/inline_pngs.h + @gdkpixbufcsourcepath@ --build-list $(LIST) > $(srcdir)/inline_pngs.h # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: src/pixmaps/Makefile.in src/pixmaps/xchat.png xchat.png 70c53cf44c2b48078e4ba64f1c1aa939eb9ac288 zed zed http://github.com/tycho/xchat-aqua/commit/ea4b19069f047e4aef8181d545c29c4f5e2fdfab ea4b19069f047e4aef8181d545c29c4f5e2fdfab 2003-01-04T00:55:32-08:00 2003-01-04T00:55:32-08:00 *** empty log message *** 4c1511161788c0d5839c588b75ecd09bb2f5baa6 zed zed