Context Navigation

← Previous Changeset
Next Changeset →

Changeset 7829

Timestamp:

01/13/07 23:35:41 (23 months ago)

Author:

asterix

Message:

merge diff from trunc to 0.11 branch

Location:

branches/gajim_0.11

Files:

: 30 modified

configure.ac (modified) (1 diff)
data/glade/preferences_window.glade (modified) (6 diffs)
src/adhoc_commands.py (modified) (5 diffs)
src/chat_control.py (modified) (8 diffs)
src/common/commands.py (modified) (1 diff)
src/common/config.py (modified) (1 diff)
src/common/connection_handlers.py (modified) (2 diffs)
src/common/connection.py (modified) (5 diffs)
src/common/dataforms.py (modified) (1 diff)
src/common/defs.py (modified) (1 diff)
src/common/GnuPG.py (modified) (2 diffs)
src/common/logger.py (modified) (3 diffs)
src/common/optparser.py (modified) (3 diffs)
src/common/passwords.py (modified) (1 diff)
src/common/sleepy.py (modified) (7 diffs)
src/common/xmpp/features_nb.py (modified) (1 diff)
src/config.py (modified) (7 diffs)
src/conversation_textview.py (modified) (2 diffs)
src/dialogs.py (modified) (2 diffs)
src/gajim.py (modified) (2 diffs)
src/gajim-remote.py (modified) (3 diffs)
src/groupchat_control.py (modified) (10 diffs)
src/gtkgui_helpers.py (modified) (1 diff)
src/history_window.py (modified) (1 diff)
src/htmltextview.py (modified) (2 diffs)
src/message_control.py (modified) (1 diff)
src/notify.py (modified) (1 diff)
src/profile_window.py (modified) (3 diffs)
src/remote_control.py (modified) (15 diffs)
src/roster_window.py (modified) (5 diffs)

Legend:

: Unmodified
: Added
: Removed

branches/gajim_0.11/configure.ac

r7787	r7829
1	1	AC_INIT([Gajim - A Jabber Instant Messager],
2		[0.11],[http://trac.gajim.org/],[gajim])
	2	[0.11.0.1],[http://trac.gajim.org/],[gajim])
3	3	AC_PREREQ([2.59])
4	4	AM_INIT_AUTOMAKE([1.8])

branches/gajim_0.11/data/glade/preferences_window.glade

r7787	r7829
730	730
731	731	<child>
	732	<widget class="GtkHBox" id="hbox3025">
	733	<property name="visible">True</property>
	734	<property name="homogeneous">False</property>
	735	<property name="spacing">6</property>
	736
	737	<child>
	738	<widget class="GtkLabel" id="time_stamp_label">
	739	<property name="visible">True</property>
	740	<property name="label" translatable="yes">Time Stamp:</property>
	741	<property name="use_underline">False</property>
	742	<property name="use_markup">False</property>
	743	<property name="justify">GTK_JUSTIFY_LEFT</property>
	744	<property name="wrap">False</property>
	745	<property name="selectable">False</property>
	746	<property name="xalign">0.5</property>
	747	<property name="yalign">0.5</property>
	748	<property name="xpad">0</property>
	749	<property name="ypad">0</property>
	750	<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
	751	<property name="width_chars">-1</property>
	752	<property name="single_line_mode">False</property>
	753	<property name="angle">0</property>
	754	</widget>
	755	<packing>
	756	<property name="padding">0</property>
	757	<property name="expand">False</property>
	758	<property name="fill">False</property>
	759	</packing>
	760	</child>
	761
	762	<child>
	763	<widget class="GtkScrolledWindow" id="scrolledwindow29">
	764	<property name="height_request">30</property>
	765	<property name="visible">True</property>
	766	<property name="can_focus">True</property>
	767	<property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
	768	<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
	769	<property name="shadow_type">GTK_SHADOW_IN</property>
	770	<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
	771
	772	<child>
	773	<widget class="GtkTextView" id="time_stamp_textview">
	774	<property name="visible">True</property>
	775	<property name="can_focus">True</property>
	776	<property name="editable">True</property>
	777	<property name="overwrite">False</property>
	778	<property name="accepts_tab">True</property>
	779	<property name="justification">GTK_JUSTIFY_LEFT</property>
	780	<property name="wrap_mode">GTK_WRAP_CHAR</property>
	781	<property name="cursor_visible">True</property>
	782	<property name="pixels_above_lines">0</property>
	783	<property name="pixels_below_lines">0</property>
	784	<property name="pixels_inside_wrap">0</property>
	785	<property name="left_margin">0</property>
	786	<property name="right_margin">0</property>
	787	<property name="indent">0</property>
	788	<property name="text" translatable="yes"></property>
	789	<signal name="focus_out_event" handler="on_time_stamp_textview_focus_out_event" last_modification_time="Thu, 11 Jan 2007 13:08:04 GMT"/>
	790	</widget>
	791	</child>
	792	</widget>
	793	<packing>
	794	<property name="padding">0</property>
	795	<property name="expand">True</property>
	796	<property name="fill">True</property>
	797	</packing>
	798	</child>
	799	</widget>
	800	<packing>
	801	<property name="padding">0</property>
	802	<property name="expand">False</property>
	803	<property name="fill">True</property>
	804	</packing>
	805	</child>
	806
	807	<child>
732	808	<widget class="GtkTable" id="table25">
733	809	<property name="visible">True</property>
734		<property name="n_rows">6</property>
	810	<property name="n_rows">5</property>
735	811	<property name="n_columns">4</property>
736	812	<property name="homogeneous">False</property>
737	813	<property name="row_spacing">6</property>
738	814	<property name="column_spacing">12</property>
	815
	816	<child>
	817	<widget class="GtkLabel" id="label230">
	818	<property name="visible">True</property>
	819	<property name="label" translatable="yes">B_efore nickname:</property>
	820	<property name="use_underline">True</property>
	821	<property name="use_markup">False</property>
	822	<property name="justify">GTK_JUSTIFY_LEFT</property>
	823	<property name="wrap">False</property>
	824	<property name="selectable">False</property>
	825	<property name="xalign">0</property>
	826	<property name="yalign">0.5</property>
	827	<property name="xpad">0</property>
	828	<property name="ypad">0</property>
	829	<property name="mnemonic_widget">scrolledwindow27</property>
	830	<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
	831	<property name="width_chars">-1</property>
	832	<property name="single_line_mode">False</property>
	833	<property name="angle">0</property>
	834	</widget>
	835	<packing>
	836	<property name="left_attach">0</property>
	837	<property name="right_attach">1</property>
	838	<property name="top_attach">0</property>
	839	<property name="bottom_attach">1</property>
	840	<property name="x_options">fill</property>
	841	<property name="y_options"></property>
	842	</packing>
	843	</child>
	844
	845	<child>
	846	<widget class="GtkScrolledWindow" id="scrolledwindow27">
	847	<property name="height_request">30</property>
	848	<property name="visible">True</property>
	849	<property name="can_focus">True</property>
	850	<property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
	851	<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
	852	<property name="shadow_type">GTK_SHADOW_IN</property>
	853	<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
	854
	855	<child>
	856	<widget class="GtkTextView" id="before_nickname_textview">
	857	<property name="visible">True</property>
	858	<property name="can_focus">True</property>
	859	<property name="editable">True</property>
	860	<property name="overwrite">False</property>
	861	<property name="accepts_tab">True</property>
	862	<property name="justification">GTK_JUSTIFY_LEFT</property>
	863	<property name="wrap_mode">GTK_WRAP_CHAR</property>
	864	<property name="cursor_visible">True</property>
	865	<property name="pixels_above_lines">0</property>
	866	<property name="pixels_below_lines">0</property>
	867	<property name="pixels_inside_wrap">0</property>
	868	<property name="left_margin">0</property>
	869	<property name="right_margin">0</property>
	870	<property name="indent">0</property>
	871	<property name="text" translatable="yes"></property>
	872	<signal name="focus_out_event" handler="on_before_nickname_textview_focus_out_event" last_modification_time="Wed, 20 Sep 2006 19:52:05 GMT"/>
	873	</widget>
	874	</child>
	875	</widget>
	876	<packing>
	877	<property name="left_attach">1</property>
	878	<property name="right_attach">2</property>
	879	<property name="top_attach">0</property>
	880	<property name="bottom_attach">1</property>
	881	<property name="x_options">fill</property>
	882	<property name="y_options"></property>
	883	</packing>
	884	</child>
	885
	886	<child>
	887	<widget class="GtkLabel" id="label231">
	888	<property name="visible">True</property>
	889	<property name="label" translatable="yes">A_fter nickname:</property>
	890	<property name="use_underline">True</property>
	891	<property name="use_markup">False</property>
	892	<property name="justify">GTK_JUSTIFY_LEFT</property>
	893	<property name="wrap">False</property>
	894	<property name="selectable">False</property>
	895	<property name="xalign">0</property>
	896	<property name="yalign">0.5</property>
	897	<property name="xpad">0</property>
	898	<property name="ypad">0</property>
	899	<property name="mnemonic_widget">scrolledwindow28</property>
	900	<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
	901	<property name="width_chars">-1</property>
	902	<property name="single_line_mode">False</property>
	903	<property name="angle">0</property>
	904	</widget>
	905	<packing>
	906	<property name="left_attach">2</property>
	907	<property name="right_attach">3</property>
	908	<property name="top_attach">0</property>
	909	<property name="bottom_attach">1</property>
	910	<property name="x_options">fill</property>
	911	<property name="y_options"></property>
	912	</packing>
	913	</child>
	914
	915	<child>
	916	<widget class="GtkScrolledWindow" id="scrolledwindow28">
	917	<property name="height_request">30</property>
	918	<property name="visible">True</property>
	919	<property name="can_focus">True</property>
	920	<property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
	921	<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
	922	<property name="shadow_type">GTK_SHADOW_IN</property>
	923	<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
	924
	925	<child>
	926	<widget class="GtkTextView" id="after_nickname_textview">
	927	<property name="visible">True</property>
	928	<property name="can_focus">True</property>
	929	<property name="editable">True</property>
	930	<property name="overwrite">False</property>
	931	<property name="accepts_tab">True</property>
	932	<property name="justification">GTK_JUSTIFY_LEFT</property>
	933	<property name="wrap_mode">GTK_WRAP_CHAR</property>
	934	<property name="cursor_visible">True</property>
	935	<property name="pixels_above_lines">0</property>
	936	<property name="pixels_below_lines">0</property>
	937	<property name="pixels_inside_wrap">0</property>
	938	<property name="left_margin">0</property>
	939	<property name="right_margin">0</property>
	940	<property name="indent">0</property>
	941	<property name="text" translatable="yes"></property>
	942	<signal name="focus_out_event" handler="on_after_nickname_textview_focus_out_event" last_modification_time="Wed, 20 Sep 2006 19:52:51 GMT"/>
	943	</widget>
	944	</child>
	945	</widget>
	946	<packing>
	947	<property name="left_attach">3</property>
	948	<property name="right_attach">4</property>
	949	<property name="top_attach">0</property>
	950	<property name="bottom_attach">1</property>
	951	<property name="x_options">fill</property>
	952	<property name="y_options"></property>
	953	</packing>
	954	</child>
739	955
740	956	<child>
…	…
760	976	<property name="left_attach">0</property>
761	977	<property name="right_attach">1</property>
762		<property name="top_attach">2</property>
763		<property name="bottom_attach">3</property>
	978	<property name="top_attach">1</property>
	979	<property name="bottom_attach">2</property>
764	980	<property name="x_options">fill</property>
	981	<property name="y_options"></property>
	982	</packing>
	983	</child>
	984
	985	<child>
	986	<widget class="GtkColorButton" id="incoming_msg_colorbutton">
	987	<property name="visible">True</property>
	988	<property name="can_default">True</property>
	989	<property name="has_default">True</property>
	990	<property name="can_focus">True</property>
	991	<property name="has_focus">True</property>
	992	<property name="use_alpha">False</property>
	993	<property name="focus_on_click">True</property>
	994	<signal name="color_set" handler="on_incoming_msg_colorbutton_color_set" last_modification_time="Sun, 06 Mar 2005 14:07:44 GMT"/>
	995	</widget>
	996	<packing>
	997	<property name="left_attach">1</property>
	998	<property name="right_attach">2</property>
	999	<property name="top_attach">1</property>
	1000	<property name="bottom_attach">2</property>
	1001	<property name="x_options"></property>
765	1002	<property name="y_options"></property>
766	1003	</packing>
…	…
789	1026	<property name="left_attach">2</property>
790	1027	<property name="right_attach">3</property>
	1028	<property name="top_attach">1</property>
	1029	<property name="bottom_attach">2</property>
	1030	<property name="x_options">fill</property>
	1031	<property name="y_options"></property>
	1032	</packing>
	1033	</child>
	1034
	1035	<child>
	1036	<widget class="GtkColorButton" id="outgoing_msg_colorbutton">
	1037	<property name="visible">True</property>
	1038	<property name="can_focus">True</property>
	1039	<property name="use_alpha">False</property>
	1040	<property name="focus_on_click">True</property>
	1041	<signal name="color_set" handler="on_outgoing_msg_colorbutton_color_set" last_modification_time="Sun, 06 Mar 2005 14:07:56 GMT"/>
	1042	</widget>
	1043	<packing>
	1044	<property name="left_attach">3</property>
	1045	<property name="right_attach">4</property>
	1046	<property name="top_attach">1</property>
	1047	<property name="bottom_attach">2</property>
	1048	<property name="x_options">fill</property>
	1049	<property name="y_options"></property>
	1050	</packing>
	1051	</child>
	1052
	1053	<child>
	1054	<widget class="GtkColorButton" id="url_msg_colorbutton">
	1055	<property name="visible">True</property>
	1056	<property name="can_focus">True</property>
	1057	<property name="use_alpha">False</property>
	1058	<property name="focus_on_click">True</property>
	1059	<signal name="color_set" handler="on_url_msg_colorbutton_color_set" last_modification_time="Sun, 25 Dec 2005 15:22:17 GMT"/>
	1060	</widget>
	1061	<packing>
	1062	<property name="left_attach">3</property>
	1063	<property name="right_attach">4</property>
791	1064	<property name="top_attach">2</property>
792	1065	<property name="bottom_attach">3</property>
793	1066	<property name="x_options">fill</property>
	1067	<property name="y_options"></property>
	1068	</packing>
	1069	</child>
	1070
	1071	<child>
	1072	<widget class="GtkLabel" id="label371">
	1073	<property name="visible">True</property>
	1074	<property name="label" translatable="yes">_URL:</property>
	1075	<property name="use_underline">True</property>
	1076	<property name="use_markup">False</property>
	1077	<property name="justify">GTK_JUSTIFY_LEFT</property>
	1078	<property name="wrap">False</property>
	1079	<property name="selectable">False</property>
	1080	<property name="xalign">0</property>
	1081	<property name="yalign">0.5</property>
	1082	<property name="xpad">0</property>
	1083	<property name="ypad">0</property>
	1084	<property name="mnemonic_widget">url_msg_colorbutton</property>
	1085	<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
	1086	<property name="width_chars">-1</property>
	1087	<property name="single_line_mode">False</property>
	1088	<property name="angle">0</property>
	1089	</widget>
	1090	<packing>
	1091	<property name="left_attach">2</property>
	1092	<property name="right_attach">3</property>
	1093	<property name="top_attach">2</property>
	1094	<property name="bottom_attach">3</property>
	1095	<property name="x_options">fill</property>
	1096	<property name="y_options"></property>
	1097	</packing>
	1098	</child>
	1099
	1100	<child>
	1101	<widget class="GtkColorButton" id="status_msg_colorbutton">
	1102	<property name="visible">True</property>
	1103	<property name="can_focus">True</property>
	1104	<property name="use_alpha">False</property>
	1105	<property name="focus_on_click">True</property>
	1106	<signal name="color_set" handler="on_status_msg_colorbutton_color_set" last_modification_time="Sun, 06 Mar 2005 14:08:04 GMT"/>
	1107	</widget>
	1108	<packing>
	1109	<property name="left_attach">1</property>
	1110	<property name="right_attach">2</property>
	1111	<property name="top_attach">2</property>
	1112	<property name="bottom_attach">3</property>
	1113	<property name="x_options"></property>
794	1114	<property name="y_options"></property>
795	1115	</packing>
…	…
818	1138	<property name="left_attach">0</property>
819	1139	<property name="right_attach">1</property>
820		~~<property name="top_attach">3</property>~~
821		~~<property name="bottom_attach">4</property>~~
822		~~<property name="x_options">fill</property>~~
823		~~<property name="y_options"></property>~~
824		~~</packing>~~
825		~~</child>~~
826
827		~~<child>~~
828		~~<widget class="GtkLabel" id="label371">~~
829		~~<property name="visible">True</property>~~
830		~~<property name="label" translatable="yes">_URL:</property>~~
831		~~<property name="use_underline">True</property>~~
832		~~<property name="use_markup">False</property>~~
833		~~<property name="justify">GTK_JUSTIFY_LEFT</property>~~
834		~~<property name="wrap">False</property>~~
835		~~<property name="selectable">False</property>~~
836		~~<property name="xalign">0</property>~~
837		~~<property name="yalign">0.5</property>~~
838		~~<property name="xpad">0</property>~~
839		~~<property name="ypad">0</property>~~
840		~~<property name="mnemonic_widget">url_msg_colorbutton</property>~~
841		~~<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>~~
842		~~<property name="width_chars">-1</property>~~
843		~~<property name="single_line_mode">False</property>~~
844		~~<property name="angle">0</property>~~
845		~~</widget>~~
846		~~<packing>~~
847		~~<property name="left_attach">2</property>~~
848		~~<property name="right_attach">3</property>~~
849		~~<property name="top_attach">3</property>~~
850		~~<property name="bottom_attach">4</property>~~
851		~~<property name="x_options">fill</property>~~
852		~~<property name="y_options"></property>~~
853		~~</packing>~~
854		~~</child>~~
855
856		~~<child>~~
857		~~<widget class="GtkLabel" id="before_time_label">~~
858		~~<property name="visible">True</property>~~
859		~~<property name="label" translatable="yes">_Before time:</property>~~
860		~~<property name="use_underline">True</property>~~
861		~~<property name="use_markup">False</property>~~
862		~~<property name="justify">GTK_JUSTIFY_LEFT</property>~~
863		~~<property name="wrap">False</property>~~
864		~~<property name="selectable">False</property>~~
865		~~<property name="xalign">0</property>~~
866		~~<property name="yalign">0.5</property>~~
867		~~<property name="xpad">0</property>~~
868		~~<property name="ypad">0</property>~~
869		~~<property name="mnemonic_widget">scrolledwindow25</property>~~
870		~~<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>~~
871		~~<property name="width_chars">-1</property>~~
872		~~<property name="single_line_mode">False&l~~