Changeset 9186
- Timestamp:
- 12/20/07 05:08:07 (11 months ago)
- Location:
- branches/normal_control
- Files:
-
- 3 removed
- 9 modified
-
. (modified) (1 prop)
-
data/glade/accounts_window.glade (modified) (47 diffs)
-
src/chat_control.py (modified) (1 diff)
-
src/common/config.py (modified) (1 diff)
-
src/common/connection.py (modified) (1 diff)
-
src/config.py (modified) (2 diffs)
-
src/message_window.py (modified) (5 diffs)
-
src/osx/.deps (deleted)
-
src/osx/growl/.deps (deleted)
-
src/osx/idle.c (modified) (1 diff)
-
src/osx/syncmenu/.deps (deleted)
-
src/roster_window.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/normal_control
- Property svnmerge-integrated changed from /trunk:1-9171,9178 to /trunk:1-9185
-
branches/normal_control/data/glade/accounts_window.glade
r8932 r9186 52 52 <property name="label" translatable="yes">gtk-add</property> 53 53 <property name="use_stock">True</property> 54 <property name="response_id">0</property> 54 55 <signal name="clicked" handler="on_add_button_clicked"/> 55 56 </widget> … … 67 68 <property name="label" translatable="yes">gtk-remove</property> 68 69 <property name="use_stock">True</property> 70 <property name="response_id">0</property> 69 71 <signal name="clicked" handler="on_remove_button_clicked"/> 70 72 </widget> … … 80 82 <property name="receives_default">True</property> 81 83 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 84 <property name="response_id">0</property> 82 85 <signal name="clicked" handler="on_rename_button_clicked"/> 83 86 <child> … … 139 142 <packing> 140 143 <property name="resize">False</property> 144 <property name="shrink">True</property> 141 145 </packing> 142 146 </child> … … 153 157 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 154 158 </widget> 155 <packing>156 <property name="tab_expand">False</property>157 </packing>158 159 </child> 159 160 <child> … … 223 224 <property name="label" translatable="yes">Synchronise contacts</property> 224 225 <property name="use_underline">True</property> 226 <property name="response_id">0</property> 225 227 <signal name="clicked" handler="on_synchronise_contacts_button1_clicked"/> 226 228 </widget> … … 236 238 <property name="label" translatable="yes">Chan_ge Password</property> 237 239 <property name="use_underline">True</property> 240 <property name="response_id">0</property> 238 241 <signal name="clicked" handler="on_change_password_button1_clicked"/> 239 242 </widget> … … 289 292 <property name="label" translatable="yes">_Adjust to status</property> 290 293 <property name="use_underline">True</property> 294 <property name="response_id">0</property> 291 295 <property name="draw_indicator">True</property> 292 296 <signal name="toggled" handler="on_adjust_priority_with_status_checkbutton1_toggled"/> … … 337 341 <property name="use_underline">True</property> 338 342 <property name="focus_on_click">False</property> 343 <property name="response_id">0</property> 339 344 <property name="draw_indicator">True</property> 340 345 <signal name="toggled" handler="on_save_password_checkbutton1_toggled"/> … … 395 400 </child> 396 401 </widget> 397 <packing>398 <property name="tab_expand">False</property>399 </packing>400 402 </child> 401 403 <child> … … 406 408 <packing> 407 409 <property name="type">tab</property> 408 <property name="tab_expand">False</property>409 410 <property name="tab_fill">False</property> 410 411 </packing> … … 422 423 <property name="label" translatable="yes">C_onnect on Gajim startup</property> 423 424 <property name="use_underline">True</property> 425 <property name="response_id">0</property> 424 426 <property name="draw_indicator">True</property> 425 427 <signal name="toggled" handler="on_autoconnect_checkbutton_toggled"/> … … 436 438 <property name="label" translatable="yes">Auto-reconnect when connection is lost</property> 437 439 <property name="use_underline">True</property> 440 <property name="response_id">0</property> 438 441 <property name="draw_indicator">True</property> 439 442 <signal name="toggled" handler="on_autoreconnect_checkbutton_toggled"/> … … 451 454 <property name="label" translatable="yes">Save conversation _logs for all contacts</property> 452 455 <property name="use_underline">True</property> 456 <property name="response_id">0</property> 453 457 <property name="active">True</property> 454 458 <property name="draw_indicator">True</property> … … 468 472 <property name="label" translatable="yes">Synch_ronize account status with global status</property> 469 473 <property name="use_underline">True</property> 474 <property name="response_id">0</property> 470 475 <property name="draw_indicator">True</property> 471 476 <signal name="toggled" handler="on_sync_with_global_status_checkbutton_toggled"/> … … 484 489 <property name="label" translatable="yes">Use file transfer proxies</property> 485 490 <property name="use_underline">True</property> 491 <property name="response_id">0</property> 486 492 <property name="draw_indicator">True</property> 487 493 <signal name="toggled" handler="on_use_ft_proxies_checkbutton1_toggled"/> … … 496 502 <packing> 497 503 <property name="position">1</property> 498 <property name="tab_expand">False</property>499 504 </packing> 500 505 </child> … … 508 513 <property name="type">tab</property> 509 514 <property name="position">1</property> 510 <property name="tab_expand">False</property>511 515 <property name="tab_fill">False</property> 512 516 </packing> … … 518 522 <property name="spacing">12</property> 519 523 <child> 520 <widget class="GtkHBox" id="hbox2"> 521 <property name="visible">True</property> 522 <property name="border_width">6</property> 523 <property name="spacing">6</property> 524 <widget class="GtkFrame" id="frame3"> 525 <property name="visible">True</property> 526 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 527 <property name="label_xalign">0</property> 528 <property name="shadow_type">GTK_SHADOW_NONE</property> 529 <child> 530 <widget class="GtkAlignment" id="alignment4"> 531 <property name="visible">True</property> 532 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 533 <property name="left_padding">12</property> 534 <child> 535 <widget class="GtkVBox" id="vbox11"> 536 <property name="visible">True</property> 537 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 538 <property name="border_width">6</property> 539 <property name="spacing">6</property> 540 <child> 541 <widget class="GtkCheckButton" id="use_env_http_proxy_checkbutton1"> 542 <property name="visible">True</property> 543 <property name="can_focus">True</property> 544 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 545 <property name="label" translatable="yes">use HTTP_PROXY environment variable</property> 546 <property name="response_id">0</property> 547 <property name="draw_indicator">True</property> 548 <signal name="toggled" handler="on_use_env_http_proxy_checkbutton1_toggled"/> 549 </widget> 550 <packing> 551 <property name="expand">False</property> 552 </packing> 553 </child> 554 <child> 555 <widget class="GtkHBox" id="proxy_hbox1"> 556 <property name="visible">True</property> 557 <property name="spacing">6</property> 558 <child> 559 <widget class="GtkComboBox" id="proxies_combobox1"> 560 <property name="visible">True</property> 561 <property name="items" translatable="yes" comments="None means no proxy profile selected">None</property> 562 <signal name="changed" handler="on_proxies_combobox1_changed"/> 563 </widget> 564 </child> 565 <child> 566 <widget class="GtkButton" id="manage_proxies_button1"> 567 <property name="visible">True</property> 568 <property name="can_focus">True</property> 569 <property name="label" translatable="yes">Manage...</property> 570 <property name="use_underline">True</property> 571 <property name="response_id">0</property> 572 <signal name="clicked" handler="on_manage_proxies_button1_clicked"/> 573 </widget> 574 <packing> 575 <property name="expand">False</property> 576 <property name="fill">False</property> 577 <property name="position">1</property> 578 </packing> 579 </child> 580 </widget> 581 <packing> 582 <property name="expand">False</property> 583 <property name="position">1</property> 584 </packing> 585 </child> 586 </widget> 587 </child> 588 </widget> 589 </child> 524 590 <child> 525 591 <widget class="GtkLabel" id="label9"> 526 592 <property name="visible">True</property> 527 <property name="label" translatable="yes">Proxy:</property> 528 </widget> 529 <packing> 530 <property name="expand">False</property> 531 <property name="fill">False</property> 532 </packing> 533 </child> 534 <child> 535 <widget class="GtkComboBox" id="proxies_combobox1"> 536 <property name="visible">True</property> 537 <property name="items" translatable="yes" comments="None means no proxy profile selected">None</property> 538 <signal name="changed" handler="on_proxies_combobox1_changed"/> 539 </widget> 540 <packing> 541 <property name="position">1</property> 542 </packing> 543 </child> 544 <child> 545 <widget class="GtkButton" id="manage_proxies_button1"> 546 <property name="visible">True</property> 547 <property name="can_focus">True</property> 548 <property name="label" translatable="yes">Manage...</property> 549 <property name="use_underline">True</property> 550 <signal name="clicked" handler="on_manage_proxies_button1_clicked"/> 551 </widget> 552 <packing> 553 <property name="expand">False</property> 554 <property name="fill">False</property> 555 <property name="position">2</property> 556 </packing> 557 </child> 558 </widget> 559 <packing> 560 <property name="expand">False</property> 561 </packing> 593 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 594 <property name="label" translatable="yes"><b>Proxy</b></property> 595 <property name="use_markup">True</property> 596 </widget> 597 <packing> 598 <property name="type">label_item</property> 599 </packing> 600 </child> 601 </widget> 562 602 </child> 563 603 <child> … … 582 622 <property name="label" translatable="yes">Use _SSL (legacy)</property> 583 623 <property name="use_underline">True</property> 624 <property name="response_id">0</property> 584 625 <property name="draw_indicator">True</property> 585 626 <signal name="toggled" handler="on_use_ssl_checkbutton1_toggled"/> … … 597 638 <property name="label" translatable="yes">Send keep-alive packets</property> 598 639 <property name="use_underline">True</property> 640 <property name="response_id">0</property> 599 641 <property name="active">True</property> 600 642 <property name="draw_indicator">True</property> … … 613 655 <property name="label" translatable="yes">Use custom hostname/port</property> 614 656 <property name="use_underline">True</property> 657 <property name="response_id">0</property> 615 658 <property name="draw_indicator">True</property> 616 659 <signal name="toggled" handler="on_custom_host_port_checkbutton1_toggled"/> … … 701 744 <packing> 702 745 <property name="position">2</property> 703 <property name="tab_expand">False</property>704 746 </packing> 705 747 </child> … … 712 754 <property name="type">tab</property> 713 755 <property name="position">2</property> 714 <property name="tab_expand">False</property>715 756 <property name="tab_fill">False</property> 716 757 </packing> … … 767 808 <property name="label" translatable="yes">Choose _Key...</property> 768 809 <property name="use_underline">True</property> 810 <property name="response_id">0</property> 769 811 <signal name="clicked" handler="on_gpg_choose_button_clicked"/> 770 812 </widget> … … 788 830 <property name="label" translatable="yes">Use GPG _Agent</property> 789 831 <property name="use_underline">True</property> 832 <property name="response_id">0</property> 790 833 <property name="draw_indicator">True</property> 791 834 <signal name="toggled" handler="on_use_gpg_agent_checkbutton_toggled"/> … … 794 837 <property name="expand">False</property> 795 838 <property name="fill">False</property> 839 <property name="position">1</property> 796 840 </packing> 797 841 </child> … … 832 876 <property name="label" translatable="yes">Edit Personal Information...</property> 833 877 <property name="use_underline">True</property> 878 <property name="response_id">0</property> 834 879 <signal name="clicked" handler="on_edit_details_button1_clicked"/> 835 880 </widget> … … 856 901 <packing> 857 902 <property name="position">3</property> 858 <property name="tab_expand">False</property>859 903 </packing> 860 904 </child> … … 867 911 <property name="type">tab</property> 868 912 <property name="position">3</property> 869 <property name="tab_expand">False</property>870 913 <property name="tab_fill">False</property> 871 914 </packing> … … 874 917 <packing> 875 918 <property name="position">1</property> 876 <property name="tab_expand">False</property>877 919 </packing> 878 920 </child> … … 893 935 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 894 936 <property name="label" translatable="yes">Enable</property> 937 <property name="response_id">0</property> 895 938 <property name="draw_indicator">True</property> 896 939 <signal name="toggled" handler="on_enable_zeroconf_checkbutton2_toggled"/> … … 916 959 <property name="label" translatable="yes">C_onnect on Gajim startup</property> 917 960 <property name="use_underline">True</property> 961 <property name="response_id">0</property> 918 962 <property name="draw_indicator">True</property> 919 963 <signal name="toggled" handler="on_autoconnect_checkbutton_toggled"/> … … 930 974 <property name="label" translatable="yes">Save conversation _logs for all contacts</property> 931 975 <property name="use_underline">True</property> 976 <property name="response_id">0</property> 932 977 <property name="draw_indicator">True</property> 933 978 <signal name="toggled" handler="on_log_history_checkbutton_toggled"/> … … 946 991 <property name="label" translatable="yes">Synch_ronize account status with global status</property> 947 992 <property name="use_underline">True</property> 993 <property name="response_id">0</property> 948 994 <property name="draw_indicator">True</property> 949 995 <signal name="toggled" handler="on_sync_with_global_status_checkbutton_toggled"/> … … 966 1012 <property name="label" translatable="yes">Use custom port:</property> 967 1013 <property name="use_underline">True</property> 1014 <property name="response_id">0</property> 968 1015 <property name="draw_indicator">True</property> 969 1016 <signal name="toggled" handler="on_custom_port_checkbutton2_toggled"/> … … 995 1042 </child> 996 1043 </widget> 997 <packing>998 <property name="tab_expand">False</property>999 </packing>1000 1044 </child> 1001 1045 <child> … … 1007 1051 <packing> 1008 1052 <property name="type">tab</property> 1009 <property name="tab_expand">False</property>1010 1053 <property name="tab_fill">False</property> 1011 1054 </packing> … … 1182 1225 <property name="label" translatable="yes">Choose _Key...</property> 1183 1226 <property name="use_underline">True</property> 1227 <property name="response_id">0</property> 1184 1228 <signal name="clicked" handler="on_gpg_choose_button_clicked"/> 1185 1229 </widget> … … 1202 1246 <property name="label" translatable="yes">Use GPG _Agent</property> 1203 1247 <property name="use_underline">True</property> 1248 <property name="response_id">0</property> 1204 1249 <property name="draw_indicator">True</property> 1205 1250 <signal name="toggled" handler="on_use_gpg_agent_checkbutton_toggled"/> … … 1208 1253 <property name="expand">False</property> 1209 1254 <property name="fill">False</property> 1255 <property name="position">2</property> 1210 1256 </packing> 1211 1257 </child> … … 1219 1265 <packing> 1220 1266 <property name="position">1</property> 1221 <property name="tab_expand">False</property>1222 1267 </packing> 1223 1268 </child> … … 1230 1275 <property name="type">tab</property> 1231 1276 <property name="position">1</property> 1232 <property name="tab_expand">False</property>1233 1277 <property name="tab_fill">False</property> 1234 1278 </packing> … … 1242 1286 <packing> 1243 1287 <property name="position">2</property> 1244 <property name="tab_expand">False</property>1245 1288