Commit 77d45f5d authored by sb's avatar sb

rest of the r6870 merge...

parent fd7eead5
Gajim 0.10 (XX May 2006)
Gajim 0.10.1 (06 June 2006)
* freeze and lost contacts in roster (#1953)
* popup menus are correctly placed
* high CPU usage on FreeBSD (#1963)
* nickname can contain '|' (#1913)
* update pl, cs, fr translations
* don't play sound, when no event is shown (#1970)
* set gajim icon for history manager
* gajim.desktop is generated with translation (#834)
* preventing several TBs and annoyances (r6273, r6275, r6279, r6301,
r6308, r6311, r6323, r6326, r6327, r6335, r6342, r6346, r6348)
Gajim 0.10 (01 May 2006)
* One Messages Window ability (default to it) with tab reordering ability
* Non blocking socket connections. Gajim no longer remains unresponsive.
......
......@@ -87,9 +87,12 @@ install:
mkdir -p "$(DESTDIR)$(PREFIX)/share/locale/$$d"; \
fi; \
done
${MAKE} -C po install PREFIX=$(PREFIX)
if [[ -n $$(find po -name *.mo) ]]; then \
${MAKE} -C po install PREFIX=$(PREFIX) ; \
fi
cp COPYING "$(DESTDIR)$(PREFIX)/share/gajim/";
cp THANKS "$(DESTDIR)$(PREFIX)/share/gajim/";
cp AUTHORS "$(DESTDIR)$(PREFIX)/share/gajim/";
mkdir -p "$(DESTDIR)$(PREFIX)/share/pixmaps";
cp data/pixmaps/gajim.png "$(DESTDIR)$(PREFIX)/share/pixmaps/";
cp data/pixmaps/gajim_about.png "$(DESTDIR)$(PREFIX)/share/pixmaps/";
......
Alexander Futász
Alexander V. Butenko
Alexey Nezhdanov
Alfredo Junix
Anders Ström
Andrew Sayman
Anton Shmigirilov
Christian Bjälevik
Christophe Got
Christoph Neuroth
......@@ -17,6 +19,7 @@ Geobert Quach
Guillaume Morin
Gustavo J. A. M. Carneiro
Ivo Anjo
Julien Pivotto
Juraj Michalek
Luis Peralta
Michele Campeotto
......
This diff is collapsed.
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
<glade-interface>
<widget class="GtkWindow" id="privacy_lists_first_window">
<property name="border_width">12</property>
<property name="visible">True</property>
<property name="title" translatable="yes">window1</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
<signal name="destroy" handler="on_privacy_lists_first_window_destroy" last_modification_time="Sun, 02 Jul 2006 20:56:21 GMT"/>
<child>
<widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkLabel" id="Server-based_privacy_lists_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Server-based Privacy Lists</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">5</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkComboBox" id="list_of_privacy_lists_combobox">
<property name="border_width">4</property>
<property name="visible">True</property>
<property name="items" translatable="yes"></property>
<property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="buttons_hbox">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<property name="spacing">0</property>
<child>
<widget class="GtkButton" id="delete_privacy_list_button">
<property name="border_width">5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-delete</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_delete_privacy_list_button_clicked" last_modification_time="Sun, 02 Jul 2006 16:47:54 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="open_privacy_list_button">
<property name="border_width">5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-open</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_open_privacy_list_button_clicked" last_modification_time="Sun, 02 Jul 2006 16:47:34 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkHSeparator" id="hseparator1">
<property name="visible">True</property>
</widget>
<packing>
<property name="padding">5</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="create_privacy_list_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Create your own Privacy Lists</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">5</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="new_privacy_list_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
<property name="invisible_char"></property>
<property name="activates_default">False</property>
</widget>
<packing>
<property name="padding">4</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="new_privacy_list_button">
<property name="border_width">5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-new</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_new_privacy_list_button_clicked" last_modification_time="Sun, 02 Jul 2006 16:47:16 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkHSeparator" id="hseparator2">
<property name="visible">True</property>
</widget>
<packing>
<property name="padding">5</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<property name="spacing">0</property>
<child>
<widget class="GtkButton" id="privacy_lists_refresh_button">
<property name="border_width">5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-refresh</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_privacy_lists_refresh_button_clicked" last_modification_time="Sun, 02 Jul 2006 16:46:48 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="close_privacy_lists_window_button">
<property name="border_width">5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_close_button_clicked" last_modification_time="Sun, 02 Jul 2006 20:53:03 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
</child>
</widget>
</glade-interface>
This diff is collapsed.
gajim for Debian
----------------
If you want to use OpenPGP in gajim, you have to install python-gnupginterface.
-- Yann Le Boulanger <asterix@lagaule.org>, Mon, 20 Jun 2005 12:02:31 +0200
......@@ -7,7 +7,7 @@ Standards-Version: 3.6.2
Package: gajim
Architecture: any
Depends: ${shlibs:Depends}, python2.4 (>= 2.4), python2.4-glade2 (>= 2.6.0), python2.4-gtk2 (>= 2.6.0), python2.4-pysqlite2
Depends: ${shlibs:Depends}, python2.4-glade2 (>= 2.6.0), python2.4-gtk2 (>= 2.6.0), python2.4-pysqlite2
Recommends: dnsutils, python2.4-dbus, notification-daemon
Suggests: python2.4-gnome2
Description: Jabber client written in PyGTK
......
This package was debianized by Yann L.B. asterix@lagaule.org on
Wed, 16 Jun 2005 20:00:00 +0100.
It was downloaded from:
http://www.gajim.org/downloads/gajim-0.10.1.tar.gz
Upstream Authors:
- Yann Le Boulanger <asterix@lagaule.org>
- Dimitur Kirov <dkirov@gmail.com>
......
Index: Makefile
===================================================================
--- Makefile (revision 4702)
--- Makefile (revision 6485)
+++ Makefile (working copy)
@@ -87,7 +87,6 @@
mkdir -p "$(DESTDIR)$(PREFIX)/share/locale/$$d"; \
fi; \
@@ -89,7 +89,6 @@
done
${MAKE} -C po install PREFIX=$(PREFIX)
if [[ -n $$(find po -name *.mo) ]]; then \
${MAKE} -C po install PREFIX=$(PREFIX) ; \
fi
- cp COPYING "$(DESTDIR)$(PREFIX)/share/gajim/";
cp THANKS "$(DESTDIR)$(PREFIX)/share/gajim/";
cp THANKS "$(DESTDIR)$(PREFIX)/share/gajim/";
cp AUTHORS "$(DESTDIR)$(PREFIX)/share/gajim/";
mkdir -p "$(DESTDIR)$(PREFIX)/share/pixmaps";
cp data/pixmaps/gajim.png "$(DESTDIR)$(PREFIX)/share/pixmaps/";
Index: src/dialogs.py
===================================================================
--- src/dialogs.py (revision 4702)
--- src/dialogs.py (revision 6485)
+++ src/dialogs.py (working copy)
@@ -443,7 +443,7 @@
@@ -558,7 +558,7 @@
dlg.set_version(gajim.version)
s = u'Copyright \xa9 2003-2005 Gajim Team'
dlg.set_copyright(s)
......
[Setup]
AppName=Gajim
AppVerName=Gajim version 0.10-alpha
AppVerName=Gajim version 0.10.1-1
DefaultDirName={pf}\Gajim
DefaultGroupName=Gajim
UninstallDisplayIcon={app}\src\Gajim.exe
......@@ -23,7 +23,6 @@ Source: "COPYING"; DestDir: "{app}"
Source: "THANKS"; DestDir: "{app}"
Source: "dist\gajim.exe"; DestDir: "{app}\src"; components: main
Source: "dist\history_manager.exe"; DestDir: "{app}\src"; components: main
Source: "dist\*.glade"; DestDir: "{app}\src"
Source: "data\*"; DestDir: "{app}\data"; Flags: recursesubdirs
Source: "po\*.mo"; DestDir: "{app}\po"; Flags: recursesubdirs
......
#!/bin/sh
#!/bin/bash
cd `dirname $0`/src
exec python -OOt gajim.py $@
exec -a gajim python -OOt gajim.py $@
NAME = gajim
LANGS := fr pt el pl es ru bg de nb cs nl pt_BR sv it eu sk no zh_CN
LANGS := fr pt el pl es ru bg de nb cs nl pt_BR sv it eu sk no zh_CN br eo
LANGS_PO:=$(foreach LANG, ${LANGS}, ${LANG}.po)
LANGS_MO:=$(foreach LANG, ${LANGS}, ${LANG}.mo)
DATADIR:=$(subst //,/,${DESTDIR}/${PREFIX}/share)
......@@ -9,6 +9,9 @@ all: $(LANGS_MO)
%.mo: %.po
msgfmt $< -o $@
%.glade.h: %.glade
intltool-extract --type=gettext/glade $<
gajim.pot: ../src/*py ../src/common/*py \
../data/glade/account_context_menu.glade.h \
../data/glade/account_creation_wizard_window.glade.h \
......@@ -16,6 +19,7 @@ gajim.pot: ../src/*py ../src/common/*py \
../data/glade/accounts_window.glade.h \
../data/glade/add_new_contact_window.glade.h \
../data/glade/advanced_configuration_window.glade.h \
../data/glade/advanced_notifications_window.glade.h \
../data/glade/advanced_menuitem_menu.glade.h \
../data/glade/change_password_dialog.glade.h \
../data/glade/change_status_message_dialog.glade.h \
......@@ -28,18 +32,20 @@ gajim.pot: ../src/*py ../src/common/*py \
../data/glade/gajim_themes_window.glade.h \
../data/glade/gc_control_popup_menu.glade.h \
../data/glade/gc_occupants_menu.glade.h \
../data/glade/gtkgui.glade.h \
../data/glade/history_manager.glade.h \
../data/glade/history_window.glade.h \
../data/glade/input_dialog.glade.h \
../data/glade/invitation_received_dialog.glade.h \
../data/glade/join_groupchat_window.glade.h \
../data/glade/manage_accounts_window.glade.h \
../data/glade/manage_bookmarks_window.glade.h \
../data/glade/manage_proxies_window.glade.h \
../data/glade/message_window.glade.h \
../data/glade/passphrase_dialog.glade.h \
../data/glade/popup_notification_window.glade.h \
../data/glade/preferences_window.glade.h \
../data/glade/privacy_list_edit_window.glade.h \
../data/glade/privacy_lists_first_window.glade.h \
../data/glade/progress_dialog.glade.h \
../data/glade/remove_account_window.glade.h \
../data/glade/roster_contact_context_menu.glade.h \
......
......@@ -4,48 +4,50 @@
[encoding: UTF-8]
gajim.desktop.in
data/glade/account_context_menu.glade
data/glade/account_creation_wizard_window.glade
data/glade/account_modification_window.glade
data/glade/accounts_window.glade
data/glade/add_new_contact_window.glade
data/glade/advanced_configuration_window.glade
data/glade/advanced_menuitem_menu.glade
data/glade/advanced_notifications_window.glade
data/glade/change_password_dialog.glade
data/glade/change_status_message_dialog.glade
data/glade/chat_context_menu.glade
data/glade/chat_control_popup_menu.glade
data/glade/choose_gpg_key_dialog.glade
data/glade/data_form_window.glade
data/glade/edit_groups_dialog.glade
data/glade/filetransfers.glade
data/glade/gajim_themes_window.glade
data/glade/gc_control_popup_menu.glade
data/glade/gc_occupants_menu.glade
data/glade/gtkgui.glade
data/glade/history_manager.glade
data/glade/history_window.glade
data/glade/input_dialog.glade
data/glade/invitation_received_dialog.glade
data/glade/join_groupchat_window.glade
data/glade/manage_bookmarks_window.glade
data/glade/manage_proxies_window.glade
data/glade/message_window.glade
data/glade/passphrase_dialog.glade
data/glade/popup_notification_window.glade
data/glade/preferences_window.glade
data/glade/progress_dialog.glade
data/glade/remove_account_window.glade
data/glade/roster_contact_context_menu.glade
data/glade/roster_window.glade
data/glade/service_discovery_window.glade
data/glade/service_registration_window.glade
data/glade/single_message_window.glade
data/glade/subscription_request_window.glade
data/glade/systray_context_menu.glade
data/glade/vcard_information_window.glade
data/glade/xml_console_window.glade
data/glade/account_context_menu.glade.h
data/glade/account_creation_wizard_window.glade.h
data/glade/account_modification_window.glade.h
data/glade/accounts_window.glade.h
data/glade/add_new_contact_window.glade.h
data/glade/advanced_configuration_window.glade.h
data/glade/advanced_menuitem_menu.glade.h
data/glade/advanced_notifications_window.glade.h
data/glade/change_password_dialog.glade.h
data/glade/change_status_message_dialog.glade.h
data/glade/chat_context_menu.glade.h
data/glade/chat_control_popup_menu.glade.h
data/glade/choose_gpg_key_dialog.glade.h
data/glade/data_form_window.glade.h
data/glade/edit_groups_dialog.glade.h
data/glade/filetransfers.glade.h
data/glade/gajim_themes_window.glade.h
data/glade/gc_control_popup_menu.glade.h
data/glade/gc_occupants_menu.glade.h
data/glade/history_manager.glade.h
data/glade/history_window.glade.h
data/glade/input_dialog.glade.h
data/glade/invitation_received_dialog.glade.h
data/glade/join_groupchat_window.glade.h
data/glade/manage_accounts_window.glade.h
data/glade/manage_bookmarks_window.glade.h
data/glade/manage_proxies_window.glade.h
data/glade/message_window.glade.h
data/glade/passphrase_dialog.glade.h
data/glade/popup_notification_window.glade.h
data/glade/preferences_window.glade.h
data/glade/privacy_list_edit_window.glade.h
data/glade/privacy_lists_first_window.glade.h
data/glade/progress_dialog.glade.h
data/glade/remove_account_window.glade.h
data/glade/roster_contact_context_menu.glade.h
data/glade/roster_window.glade.h
data/glade/service_discovery_window.glade.h
data/glade/service_registration_window.glade.h
data/glade/single_message_window.glade.h
data/glade/subscription_request_window.glade.h
data/glade/systray_context_menu.glade.h
data/glade/vcard_information_window.glade.h
data/glade/xml_console_window.glade.h
src/advanced.py
src/cell_renderer_image.py
src/chat_control.py
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
#!/bin/sh
#!/bin/bash
## gajim
##
## Contributors for this file:
......@@ -29,4 +29,4 @@ fi
cd PREFIX/share/gajim/src
export PYTHONPATH="$PYTHONPATH:PREFIXLIB/gajim"
exec PYTHON_EXEC -OO gajim.py $@
exec -a gajim PYTHON_EXEC -OO gajim.py $@
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment