Changeset 7060

Timestamp:

10/04/06 02:10:49 (2 years ago)

Author:

dkirov

Message:

merge from trunk
automake based instalation

Location:

branches/zeroconf_network

Files:

• aclocal.m4 (added)
• autogen.sh (added)
• ChangeLog (added)
• compile (added)
• config.guess (added)
• config.h.in (added)
• config.sub (added)
• configure (added)
• configure.ac (added)
• data/emoticons/Makefile.am (added)
• data/emoticons/Makefile.in (added)
• data/gajim.1 (added)
• data/gajim.desktop.in.in (added)
• data/gajim-remote.1 (added)
• data/glade/account_modification_window.glade (modified) (5 diffs)
• data/glade/add_new_contact_window.glade (modified) (3 diffs)
• data/glade/Makefile.am (added)
• data/glade/Makefile.in (added)
• data/glade/privacy_lists_window.glade (modified) (4 diffs)
• data/glade/roster_window.glade (modified) (11 diffs)
• data/glade/subscription_request_popup_menu.glade (added)
• data/glade/subscription_request_window.glade (modified) (5 diffs)
• data/iconsets/goojim/16x16/muc_active.png (added)
• data/iconsets/goojim/16x16/muc_inactive.png (added)
• data/iconsets/Makefile.am (added)
• data/iconsets/Makefile.in (added)
• data/Makefile.am (added)
• data/Makefile.in (added)
• data/other/servers.xml (modified) (1 diff)
• data/pixmaps/Makefile.am (added)
• data/pixmaps/Makefile.in (added)
• depcomp (added)
• INSTALL (added)
• install-sh (added)
• intltool-extract.in (added)
• intltool-merge.in (added)
• intltool-update.in (added)
• ltmain.sh (added)
• m4 (added)
• m4/glib-gettext.m4 (added)
• m4/python.m4 (added)
• Makefile (deleted)
• Makefile.am (added)
• Makefile.in (added)
• missing (added)
• mkinstalldirs (added)
• NEWS (added)
• po/ChangeLog (added)
• po/Makefile (deleted)
• po/Makefile.in.in (added)
• po/POTFILES.in (modified) (1 diff)
• README (modified) (1 diff)
• scripts/gajim (deleted)
• scripts/gajim.in (added)
• src/advanced.py (modified) (1 diff)
• src/cell_renderer_image.py (modified) (1 diff)
• src/chat_control.py (modified) (21 diffs)
• src/common/check_paths.py (modified) (1 diff)
• src/common/config.py (modified) (5 diffs)
• src/common/connection_handlers.py (modified) (13 diffs)
• src/common/connection.py (modified) (16 diffs)
• src/common/contacts.py (modified) (1 diff)
• src/common/dbus_support.py (added)
• src/common/events.py (modified) (1 diff)
• src/common/exceptions.py (modified) (1 diff)
• src/common/gajim.py (modified) (4 diffs)
• src/common/GnuPG.py (modified) (2 diffs)
• src/common/helpers.py (modified) (8 diffs)
• src/common/i18n.py (modified) (1 diff)
• src/common/logger.py (modified) (1 diff)
• src/common/Makefile (deleted)
• src/common/Makefile.am (added)
• src/common/Makefile.in (added)
• src/common/optparser.py (modified) (1 diff)
• src/common/sleepy.py (modified) (1 diff)
• src/common/socks5.py (modified) (2 diffs)
• src/common/xmpp/protocol.py (modified) (3 diffs)
• src/common/zeroconf/connection_zeroconf.py (modified) (1 diff)
• src/config.py (modified) (6 diffs)
• src/conversation_textview.py (modified) (10 diffs)
• src/dialogs.py (modified) (32 diffs)
• src/disco.py (modified) (6 diffs)
• src/gajim.py (modified) (14 diffs)
• src/gajim_themes_window.py (modified) (1 diff)
• src/groupchat_control.py (modified) (39 diffs)
• src/gtkexcepthook.py (modified) (1 diff)
• src/gtkgui_helpers.py (modified) (2 diffs)
• src/history_window.py (modified) (1 diff)
• src/htmltextview.py (added)
• src/Makefile (deleted)
• src/Makefile.am (added)
• src/Makefile.in (added)
• src/message_textview.py (modified) (1 diff)
• src/message_window.py (modified) (2 diffs)
• src/music_track_listener.py (modified) (1 diff)
• src/notify.py (modified) (14 diffs)
• src/profile_window.py (modified) (1 diff)
• src/remote_control.py (modified) (5 diffs)
• src/roster_window.py (modified) (43 diffs)
• src/rst_xhtml_generator.py (added)
• src/systraywin32.py (modified) (1 diff)
• src/vcard.py (modified) (4 diffs)

branches/zeroconf_network/data/glade/account_modification_window.glade

@@ -3 +3 @@
 
 <glade-interface>
+
 <widget class="GtkWindow" id="account_modification_window">
   <property name="border_width">12</property>
@@ -17 +18 @@
   <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_account_modification_window_destroy" last_modification_time="Mon, 07 Mar 2005 16:05:10 GMT"/>
 
@@ -333 +335 @@
 
               <child>
+                <widget class="GtkCheckButton" id="adjust_priority_with_status_checkbutton">
+                  <property name="visible">True</property>
+                  <property name="can_focus">True</property>
+                  <property name="label" translatable="yes">_Adjust with status</property>
+                  <property name="use_underline">True</property>
+                  <property name="relief">GTK_RELIEF_NORMAL</property>
+                  <property name="focus_on_click">True</property>
+                  <property name="active">False</property>
+                  <property name="inconsistent">False</property>
+                  <property name="draw_indicator">True</property>
+                  <signal name="toggled" handler="on_adjust_priority_with_status_checkbutton_toggled" last_modification_time="Tue, 03 Oct 2006 00:04:37 GMT"/>
+                </widget>
+                <packing>
+                  <property name="left_attach">1</property>
+                  <property name="right_attach">2</property>
+                  <property name="top_attach">3</property>
+                  <property name="bottom_attach">4</property>
+                  <property name="x_options">fill</property>
+                  <property name="y_options"></property>
+                </packing>
+              </child>
+
+              <child>
                 <widget class="GtkSpinButton" id="priority_spinbutton">
                   <property name="visible">True</property>
@@ -346 +371 @@
                 </widget>
                 <packing>
-                  <property name="left_attach">1</property>
-                  <property name="right_attach">2</property>
+                  <property name="left_attach">2</property>
+                  <property name="right_attach">3</property>
                   <property name="top_attach">3</property>
                   <property name="bottom_attach">4</property>
-                  <property name="x_options">shrink|fill</property>
+                  <property name="x_options">fill</property>
                   <property name="y_options"></property>
                 </packing>
@@ -1198 +1223 @@
   </child>
 </widget>
+
 </glade-interface>

branches/zeroconf_network/data/glade/add_new_contact_window.glade

@@ -181 +181 @@
           <property name="border_width">6</property>
           <property name="visible">True</property>
-          <property name="n_rows">4</property>
+          <property name="n_rows">3</property>
           <property name="n_columns">2</property>
           <property name="homogeneous">False</property>
@@ -332 +332 @@
             </packing>
           </child>
-
-          <child>
-            <widget class="GtkCheckButton" id="auto_authorize_checkbutton">
-              <property name="visible">True</property>
-              <property name="can_focus">True</property>
-              <property name="label" translatable="yes">A_llow this contact to view my status</property>
-              <property name="use_underline">True</property>
-              <property name="relief">GTK_RELIEF_NORMAL</property>
-              <property name="focus_on_click">True</property>
-              <property name="active">True</property>
-              <property name="inconsistent">False</property>
-              <property name="draw_indicator">True</property>
-            </widget>
-            <packing>
-              <property name="left_attach">1</property>
-              <property name="right_attach">2</property>
-              <property name="top_attach">3</property>
-              <property name="bottom_attach">4</property>
-              <property name="x_options">fill</property>
-              <property name="y_options"></property>
-            </packing>
-          </child>
         </widget>
         <packing>
@@ -359 +337 @@
           <property name="expand">False</property>
           <property name="fill">True</property>
+        </packing>
+      </child>
+
+      <child>
+        <widget class="GtkCheckButton" id="auto_authorize_checkbutton">
+          <property name="visible">True</property>
+          <property name="can_focus">True</property>
+          <property name="label" translatable="yes">A_llow this contact to view my status</property>
+          <property name="use_underline">True</property>
+          <property name="relief">GTK_RELIEF_NORMAL</property>
+          <property name="focus_on_click">True</property>
+          <property name="active">True</property>
+          <property name="inconsistent">False</property>
+          <property name="draw_indicator">True</property>
+        </widget>
+        <packing>
+          <property name="padding">0</property>
+          <property name="expand">False</property>
+          <property name="fill">False</property>
         </packing>
       </child>

branches/zeroconf_network/data/glade/privacy_lists_window.glade

@@ -26 +26 @@
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
+      <property name="spacing">6</property>
 
       <child>
-        <widget class="GtkLabel" id="Server-based_privacy_lists_label">
+        <widget class="GtkHBox" id="hbox1">
           <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>
+          <property name="homogeneous">False</property>
+          <property name="spacing">12</property>
+
+          <child>
+            <widget class="GtkLabel" id="label1">
+              <property name="visible">True</property>
+              <property name="label" translatable="yes">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</property>
+              <property name="yalign">0.5</property>
+              <property name="xpad">0</property>
+              <property name="ypad">0</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="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>
         </widget>
         <packing>
           <property name="padding">0</property>
           <property name="expand">False</property>
-          <property name="fill">False</property>
+          <property name="fill">True</property>
         </packing>
       </child>
 
       <child>
-        <widget class="GtkComboBox" id="list_of_privacy_lists_combobox">
-          <property name="border_width">4</property>
+        <widget class="GtkVBox" id="vbox1">
           <property name="visible">True</property>
-          <property name="items" translatable="yes"></property>
-          <property name="add_tearoffs">False</property>
-          <property name="focus_on_click">True</property>
+          <property name="homogeneous">False</property>
+          <property name="spacing">6</property>
+
+          <child>
+            <widget class="GtkHButtonBox" id="hbuttonbox2">
+              <property name="visible">True</property>
+              <property name="layout_style">GTK_BUTTONBOX_SPREAD</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>
+              </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-edit</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>
+              </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>
+              </child>
+            </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">0</property>
+              <property name="expand">False</property>
+              <property name="fill">False</property>
+            </packing>
+          </child>
         </widget>
         <packing>
@@ -69 +165 @@
 
       <child>
-        <widget class="GtkHBox" id="buttons_hbox">
+        <widget class="GtkHButtonBox" id="hbuttonbox1">
           <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="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
           <property name="spacing">0</property>
 
@@ -218 +181 @@
               <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>
 
@@ -236 +194 @@
               <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>