changeset cebed529e847 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=cebed529e847
description: merge jingle branch to default branche
diffstat:
data/glade/message_window.glade | 322 ++++++---
data/glade/voip_call_received_dialog.glade | 39 +
src/chat_control.py | 159 ++++
src/common/connection_handlers.py | 15 +-
src/common/events.py | 3 +-
src/common/gajim.py | 5 +
src/common/helpers.py | 6 +
src/common/jingle.py | 1165
+++++++++++++++++++++++++++++++++
src/common/meta.py | 36 +
src/common/xmpp/protocol.py | 7 +
src/common/xmpp/simplexml.py | 3 +
src/dialogs.py | 105 +++
src/features_window.py | 7 +
src/gajim.py | 107 +++-
14 files changed, 1866 insertions(+), 113 deletions(-)
diffs (truncated from 2684 to 300 lines):
diff -r 4f046069c031 -r cebed529e847 data/glade/message_window.glade
--- a/data/glade/message_window.glade Thu Oct 29 11:35:22 2009 +0100
+++ b/data/glade/message_window.glade Thu Oct 29 11:55:05 2009 +0100
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
<glade-interface>
+ <!-- interface-requires gtk+ 2.14 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkWindow" id="message_window">
<property name="default_width">480</property>
<property name="default_height">440</property>
@@ -40,6 +40,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">5</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -54,6 +55,9 @@
<property name="label"><span
weight="heavy" size="large">Contact name</span></property>
<property name="use_markup">True</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<placeholder/>
@@ -71,14 +75,17 @@
<widget class="GtkImage" id="mood_image">
<property
name="no_show_all">True</property>
<property name="stock">None</property>
- <property name="icon_size">1</property>
+ <property name="icon-size">1</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkImage" id="activity_image">
<property
name="no_show_all">True</property>
<property name="stock">None</property>
- <property name="icon_size">1</property>
+ <property name="icon-size">1</property>
</widget>
<packing>
<property name="position">1</property>
@@ -87,14 +94,34 @@
<child>
<widget class="GtkImage" id="tune_image">
<property
name="no_show_all">True</property>
- <property
name="pixbuf">../emoticons/static/music.png</property>
- <property name="icon_size">1</property>
+ <property
name="pixbuf">../emoticons/static/music.png</property>
+ <property name="icon-size">1</property>
</widget>
<packing>
<property name="position">2</property>
</packing>
</child>
<child>
+ <widget class="GtkImage"
id="audio_banner_image">
+ <property name="visible">True</property>
+ <property name="stock">None</property>
+ <property name="icon-size">1</property>
+ </widget>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage"
id="video_banner_image">
+ <property name="visible">True</property>
+ <property name="stock">None</property>
+ <property name="icon-size">1</property>
+ </widget>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkAlignment" id="alignment3">
<property
name="width_request">11</property>
<property name="visible">True</property>
@@ -103,7 +130,7 @@
</child>
</widget>
<packing>
- <property name="position">3</property>
+ <property name="position">5</property>
</packing>
</child>
</widget>
@@ -138,6 +165,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -148,35 +176,40 @@
<property name="height_request">60</property>
<property name="can_focus">True</property>
<property name="border_width">3</property>
- <property
name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<placeholder/>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <widget class="GtkHBox" id="hbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<child>
<widget class="GtkButton" id="authentication_button">
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="no_show_all">True</property>
- <property name="relief">GTK_RELIEF_NONE</property>
+ <property name="relief">none</property>
<property name="focus_on_click">False</property>
- <property name="response_id">0</property>
<child>
<widget class="GtkImage" id="lock_image">
<property
name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property
name="stock">gtk-dialog-authentication</property>
- <property name="icon_size">1</property>
+ <property name="icon-size">1</property>
</widget>
</child>
</widget>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -184,9 +217,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">3</property>
- <property
name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property
name="vscrollbar_policy">GTK_POLICY_NEVER</property>
- <property
name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">never</property>
+ <property name="shadow_type">in</property>
<child>
<placeholder/>
</child>
@@ -212,37 +245,40 @@
<child>
<widget class="GtkButton" id="emoticons_button">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip" translatable="yes">Show a
list of emoticons (Alt+M)</property>
- <property name="relief">GTK_RELIEF_NONE</property>
+ <property name="relief">none</property>
<property name="focus_on_click">False</property>
- <property name="response_id">0</property>
<child>
<widget class="GtkImage" id="emoticons_button_image">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="stock">gtk-missing-image</property>
- <property name="icon_size">1</property>
+ <property name="icon-size">1</property>
</widget>
</child>
</widget>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="formattings_button">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip" translatable="yes">Show a
list of formattings</property>
- <property name="relief">GTK_RELIEF_NONE</property>
+ <property name="relief">none</property>
<property name="focus_on_click">False</property>
- <property name="response_id">0</property>
<child>
<widget class="GtkImage" id="image10">
<property name="visible">True</property>
<property name="stock">gtk-bold</property>
- <property name="icon_size">1</property>
+ <property name="icon-size">1</property>
</widget>
</child>
</widget>
@@ -268,14 +304,13 @@
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="no_show_all">True</property>
<property name="tooltip" translatable="yes">Add this
contact to roster (Ctrl+D)</property>
- <property name="relief">GTK_RELIEF_NONE</property>
- <property name="response_id">0</property>
+ <property name="relief">none</property>
<child>
<widget class="GtkImage" id="image9">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="stock">gtk-add</property>
- <property name="icon_size">1</property>
+ <property name="icon-size">1</property>
</widget>
</child>
</widget>
@@ -288,16 +323,17 @@
<child>
<widget class="GtkButton" id="send_file_button">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip" translatable="yes">Send a
file (Ctrl+F)</property>
- <property name="relief">GTK_RELIEF_NONE</property>
+ <property name="relief">none</property>
<property name="focus_on_click">False</property>
- <property name="response_id">0</property>
<child>
<widget class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <property name="icon_size">1</property>
+ <property name="icon-size">1</property>
</widget>
</child>
</widget>
@@ -307,19 +343,16 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="convert_to_gc_button">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip" translatable="yes">Invite
contacts to the conversation (Ctrl+G)</property>
- <property name="relief">GTK_RELIEF_NONE</property>
- <property name="focus_on_click">False</property>
- <property name="response_id">0</property>
+ <widget class="GtkToggleButton" id="audio_togglebutton">
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip" translatable="yes">Toggle
audio session</property>
+ <property name="relief">none</property>
<child>
- <widget class="GtkImage"
id="convert_to_gc_button_image">
+ <widget class="GtkImage" id="audio_image">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="stock">gtk-missing-image</property>
- <property name="icon_size">1</property>
+ <property name="icon-size">1</property>
</widget>
</child>
</widget>
@@ -329,19 +362,16 @@
</packing>
</child>
<child>
- <widget class="GtkButton"
id="contact_information_button">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip" translatable="yes">Show the
contact's profile (Ctrl+I)</property>
- <property name="relief">GTK_RELIEF_NONE</property>
- <property name="focus_on_click">False</property>
- <property name="response_id">0</property>
+ <widget class="GtkToggleButton" id="video_togglebutton">
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip" translatable="yes">Toggle
video session</property>
+ <property name="relief">none</property>
<child>
- <widget class="GtkImage" id="image2">
+ <widget class="GtkImage" id="video_image">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
