Commits November 2009

commits@gajim.org

9 participants
288 discussions

gajim: A final refactoring touch
by Alexander Cherniuk 27 Nov '09

27 Nov '09

changeset 3b0324cf76f6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3b0324cf76f6 description: A final refactoring touch diffstat: src/config.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r a08899658e26 -r 3b0324cf76f6 src/config.py --- a/src/config.py Fri Nov 27 23:46:09 2009 +0200 +++ b/src/config.py Sat Nov 28 00:07:01 2009 +0200 @@ -424,8 +424,8 @@ model = gtk.ListStore(str, str) combobox.set_model(model) - for index, (name, value) in enumerate(device_dict.iteritems()): - model.append([name, value]) + for index, (name, value) in enumerate(sorted(device_dict.iteritems())): + model.append((name, value)) if gajim.config.get(opt_name + '_device') == name: combobox.set_active(index)

1 0

gajim: A bit of refactoring
by Alexander Cherniuk 27 Nov '09

27 Nov '09

changeset a08899658e26 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a08899658e26 description: A bit of refactoring diffstat: src/config.py | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diffs (29 lines): diff -r 8803717bdec0 -r a08899658e26 src/config.py --- a/src/config.py Fri Nov 27 22:17:24 2009 +0100 +++ b/src/config.py Fri Nov 27 23:46:09 2009 +0200 @@ -423,12 +423,11 @@ combobox.add_attribute(cell, 'text', 0) model = gtk.ListStore(str, str) combobox.set_model(model) - i = 0 - for name in device_dict: - model.append([name, device_dict[name]]) + + for index, (name, value) in enumerate(device_dict.iteritems()): + model.append([name, value]) if gajim.config.get(opt_name + '_device') == name: - combobox.set_active(i) - i += 1 + combobox.set_active(index) create_av_combobox('audio_input', {'test': 'test'}) create_av_combobox('audio_output', {'test': 'test'}) @@ -867,7 +866,7 @@ else: font_widget.set_sensitive(True) self.on_preference_widget_font_set(font_widget, 'conversation_font') - + def draw_color_widgets(self): col_to_widget = {'inmsgcolor': 'incoming_nick_colorbutton', 'outmsgcolor': 'outgoing_nick_colorbutton',

1 0

gajim: prepare preference audio / video tab
by Yann Leboulanger 27 Nov '09

27 Nov '09

changeset 8803717bdec0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8803717bdec0 description: prepare preference audio / video tab diffstat: data/glade/preferences_window.glade | 200 +++++++++++++++++++++++++++++++++++++++- src/config.py | 20 ++++ 2 files changed, 218 insertions(+), 2 deletions(-) diffs (truncated from 348 to 300 lines): diff -r 1ad8f5d20ceb -r 8803717bdec0 data/glade/preferences_window.glade --- a/data/glade/preferences_window.glade Fri Nov 27 21:03:38 2009 +0100 +++ b/data/glade/preferences_window.glade Fri Nov 27 22:17:24 2009 +0100 @@ -11,6 +11,7 @@ <child> <widget class="GtkVBox" id="vbox13"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <widget class="GtkNotebook" id="preferences_notebook"> @@ -21,6 +22,7 @@ <widget class="GtkVBox" id="vbox41"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <widget class="GtkFrame" id="frame1"> @@ -38,6 +40,7 @@ <widget class="GtkVBox" id="vbox1"> <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="orientation">vertical</property> <property name="spacing">6</property> <child> <widget class="GtkCheckButton" id="show_avatars_in_roster_checkbutton"> @@ -363,6 +366,7 @@ <widget class="GtkVBox" id="vbox42"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <widget class="GtkFrame" id="frame29"> @@ -377,6 +381,7 @@ <child> <widget class="GtkVBox" id="vbox67"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <widget class="GtkHBox" id="hbox1"> @@ -475,6 +480,7 @@ <child> <widget class="GtkVBox" id="vbox_gmail"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <widget class="GtkCheckButton" id="notify_gmail_checkbutton"> @@ -626,6 +632,7 @@ <child> <widget class="GtkVBox" id="vbox3"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <widget class="GtkHBox" id="hbox4"> @@ -721,6 +728,7 @@ <widget class="GtkVBox" id="vbox11"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <widget class="GtkFrame" id="frame13"> @@ -848,6 +856,7 @@ <widget class="GtkVBox" id="status_vbox"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <widget class="GtkFrame" id="frame81"> @@ -1044,6 +1053,7 @@ <widget class="GtkVBox" id="vbox2"> <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="orientation">vertical</property> <property name="spacing">6</property> <child> <widget class="GtkHBox" id="hbox2934"> @@ -1293,6 +1303,7 @@ <widget class="GtkVBox" id="vbox58"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <widget class="GtkFrame" id="frame9"> @@ -1922,9 +1933,192 @@ </packing> </child> <child> + <widget class="GtkVBox" id="vbox4"> + <property name="visible">True</property> + <property name="border_width">12</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <widget class="GtkFrame" id="audio_frame"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <widget class="GtkAlignment" id="alignment6"> + <property name="visible">True</property> + <property name="left_padding">12</property> + <child> + <widget class="GtkTable" id="table6"> + <property name="visible">True</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <property name="column_spacing">6</property> + <property name="row_spacing">6</property> + <child> + <widget class="GtkComboBox" id="audio_input_combobox"> + <property name="visible">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="x_options"></property> + </packing> + </child> + <child> + <widget class="GtkComboBox" id="audio_output_combobox"> + <property name="visible">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label18"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Audio input device</property> + </widget> + <packing> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label19"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Audio output device</property> + </widget> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label16"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Audio</b></property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkFrame" id="frame6"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <widget class="GtkAlignment" id="alignment7"> + <property name="visible">True</property> + <property name="left_padding">12</property> + <child> + <widget class="GtkTable" id="table8"> + <property name="visible">True</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <property name="column_spacing">6</property> + <property name="row_spacing">6</property> + <child> + <widget class="GtkLabel" id="label20"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Video input device</property> + </widget> + <packing> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label21"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Video output device</property> + </widget> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkComboBox" id="video_input_combobox"> + <property name="visible">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="x_options"></property> + </packing> + </child> + <child> + <widget class="GtkComboBox" id="video_output_combobox"> + <property name="visible">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options"></property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label17"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Video</b></property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="position">5</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label15"> + <property name="visible">True</property> + <property name="label" translatable="yes">Audio / Video</property> + </widget> + <packing> + <property name="position">5</property> + <property name="tab_fill">False</property> + <property name="type">tab</property> + </packing> + </child> + <child> <widget class="GtkVBox" id="vbox45"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <widget class="GtkFrame" id="applications_frame"> @@ -1939,6 +2133,7 @@ <child> <widget class="GtkVBox" id="vbox50"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <widget class="GtkComboBox" id="applications_combobox"> @@ -2193,6 +2388,7 @@ <child> <widget class="GtkVBox" id="vbox66"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <widget class="GtkCheckButton" id="log_show_changes_checkbutton">

1 0

gajim: Remove logging within each idlequeue process step. (A log...
by Stephan Erb 27 Nov '09

27 Nov '09

changeset 1ad8f5d20ceb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1ad8f5d20ceb description: Remove logging within each idlequeue process step. (A log entry every two seconds without much value) diffstat: src/common/xmpp/idlequeue.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r c511ae2b2235 -r 1ad8f5d20ceb src/common/xmpp/idlequeue.py --- a/src/common/xmpp/idlequeue.py Fri Nov 27 20:31:53 2009 +0100 +++ b/src/common/xmpp/idlequeue.py Fri Nov 27 21:03:38 2009 +0100 @@ -305,7 +305,6 @@ Execute and remove alarm callbacks and execute func() or read_timeout() for plugged objects if specified time has ellapsed """ - log.info('check time evs') current_time = self.current_time() for fd, timeouts in self.read_timeouts.items():

1 0

gajim: move icons folder on top of tree, as it will be once inst...
by Yann Leboulanger 27 Nov '09

27 Nov '09

changeset c511ae2b2235 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c511ae2b2235 description: move icons folder on top of tree, as it will be once installed diffstat: Makefile.am | 2 +- data/Makefile.am | 2 +- data/icons/Makefile.am | 38 ------------------- data/icons/hicolor/16x16/actions/gajim-upload.png | icons/Makefile.am | 38 +++++++++++++++++++ icons/hicolor/16x16/actions/gajim-upload.png | 6 files changed, 40 insertions(+), 40 deletions(-) diffs (106 lines): diff -r dab0360d56e9 -r c511ae2b2235 Makefile.am --- a/Makefile.am Fri Nov 27 16:42:32 2009 +0100 +++ b/Makefile.am Fri Nov 27 20:31:53 2009 +0100 @@ -1,4 +1,4 @@ -SUBDIRS = src data po +SUBDIRS = src data po icons ACLOCAL_AMFLAGS = -I m4 diff -r dab0360d56e9 -r c511ae2b2235 data/Makefile.am --- a/data/Makefile.am Fri Nov 27 16:42:32 2009 +0100 +++ b/data/Makefile.am Fri Nov 27 20:31:53 2009 +0100 @@ -1,4 +1,4 @@ -SUBDIRS = glade emoticons pixmaps iconsets moods activities icons +SUBDIRS = glade emoticons pixmaps iconsets moods activities @INTLTOOL_DESKTOP_RULE@ desktopdir = $(datadir)/applications diff -r dab0360d56e9 -r c511ae2b2235 data/icons/Makefile.am --- a/data/icons/Makefile.am Fri Nov 27 16:42:32 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -iconsdir = $(pkgdatadir)/icons - -icons_DATA = - -ICONS_DIRS = **/**/** - -ICONS_FILES = **/**/**/{*.png,*.svg} - - -install-data-local: - @for d in $$(cd $(srcdir); echo $(ICONS_DIRS));do \ - if test -d $(srcdir)/$$d;then \ - echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/icons/$$d"; \ - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/icons/$$d || exit 1; \ - fi; \ - done; \ - for f in $$(cd $(srcdir); echo $(ICONS_FILES));do \ - if test -f $(srcdir)/$$f; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/icons/$$f"; \ - $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/icons/$$f || exit 1; \ - fi; \ - done; - -dist-hook: - @for d in $$(cd $(srcdir); echo $(ICONS_DIRS));do \ - if test -d $(srcdir)/$$d;then \ - echo " $(mkdir_p) $(distdir)/$$d"; \ - $(mkdir_p) $(distdir)/$$d || exit 1; \ - fi; \ - done; \ - for f in $$(cd $(srcdir); echo $(ICONS_FILES));do \ - if test -f $(srcdir)/$$f; then \ - echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \ - cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \ - fi; \ - done; - -MAINTAINERCLEANFILES = Makefile.in diff -r dab0360d56e9 -r c511ae2b2235 data/icons/hicolor/16x16/actions/gajim-upload.png Binary file data/icons/hicolor/16x16/actions/gajim-upload.png has changed diff -r dab0360d56e9 -r c511ae2b2235 icons/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons/Makefile.am Fri Nov 27 20:31:53 2009 +0100 @@ -0,0 +1,38 @@ +iconsdir = $(pkgdatadir)/icons + +icons_DATA = + +ICONS_DIRS = **/**/** + +ICONS_FILES = **/**/**/{*.png,*.svg} + + +install-data-local: + @for d in $$(cd $(srcdir); echo $(ICONS_DIRS));do \ + if test -d $(srcdir)/$$d;then \ + echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/icons/$$d"; \ + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/icons/$$d || exit 1; \ + fi; \ + done; \ + for f in $$(cd $(srcdir); echo $(ICONS_FILES));do \ + if test -f $(srcdir)/$$f; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/icons/$$f"; \ + $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/icons/$$f || exit 1; \ + fi; \ + done; + +dist-hook: + @for d in $$(cd $(srcdir); echo $(ICONS_DIRS));do \ + if test -d $(srcdir)/$$d;then \ + echo " $(mkdir_p) $(distdir)/$$d"; \ + $(mkdir_p) $(distdir)/$$d || exit 1; \ + fi; \ + done; \ + for f in $$(cd $(srcdir); echo $(ICONS_FILES));do \ + if test -f $(srcdir)/$$f; then \ + echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \ + cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \ + fi; \ + done; + +MAINTAINERCLEANFILES = Makefile.in diff -r dab0360d56e9 -r c511ae2b2235 icons/hicolor/16x16/actions/gajim-upload.png Binary file icons/hicolor/16x16/actions/gajim-upload.png has changed

1 0

gajim: base of using icon themes. see #2378
by Yann Leboulanger 27 Nov '09

27 Nov '09

changeset dab0360d56e9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dab0360d56e9 description: base of using icon themes. see #2378 diffstat: configure.ac | 1 + data/Makefile.am | 2 +- data/icons/Makefile.am | 38 +++++++++++++++++++ data/icons/hicolor/16x16/actions/gajim-upload.png | data/pixmaps/upload.png | src/chat_control.py | 2 +- src/common/configpaths.py | 1 + src/common/gajim.py | 1 + src/groupchat_control.py | 2 +- src/gtkgui_helpers.py | 20 ++++++++++ src/gui_menu_builder.py | 2 +- 11 files changed, 65 insertions(+), 4 deletions(-) diffs (154 lines): diff -r 568e48a75cd4 -r dab0360d56e9 configure.ac --- a/configure.ac Fri Nov 27 12:09:43 2009 +0200 +++ b/configure.ac Fri Nov 27 16:42:32 2009 +0100 @@ -73,6 +73,7 @@ data/iconsets/Makefile data/moods/Makefile data/activities/Makefile + data/icons/Makefile data/gajim.desktop.in data/defs.py src/Makefile diff -r 568e48a75cd4 -r dab0360d56e9 data/Makefile.am --- a/data/Makefile.am Fri Nov 27 12:09:43 2009 +0200 +++ b/data/Makefile.am Fri Nov 27 16:42:32 2009 +0100 @@ -1,4 +1,4 @@ -SUBDIRS = glade emoticons pixmaps iconsets moods activities +SUBDIRS = glade emoticons pixmaps iconsets moods activities icons @INTLTOOL_DESKTOP_RULE@ desktopdir = $(datadir)/applications diff -r 568e48a75cd4 -r dab0360d56e9 data/icons/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/icons/Makefile.am Fri Nov 27 16:42:32 2009 +0100 @@ -0,0 +1,38 @@ +iconsdir = $(pkgdatadir)/icons + +icons_DATA = + +ICONS_DIRS = **/**/** + +ICONS_FILES = **/**/**/{*.png,*.svg} + + +install-data-local: + @for d in $$(cd $(srcdir); echo $(ICONS_DIRS));do \ + if test -d $(srcdir)/$$d;then \ + echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/icons/$$d"; \ + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/icons/$$d || exit 1; \ + fi; \ + done; \ + for f in $$(cd $(srcdir); echo $(ICONS_FILES));do \ + if test -f $(srcdir)/$$f; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/icons/$$f"; \ + $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/icons/$$f || exit 1; \ + fi; \ + done; + +dist-hook: + @for d in $$(cd $(srcdir); echo $(ICONS_DIRS));do \ + if test -d $(srcdir)/$$d;then \ + echo " $(mkdir_p) $(distdir)/$$d"; \ + $(mkdir_p) $(distdir)/$$d || exit 1; \ + fi; \ + done; \ + for f in $$(cd $(srcdir); echo $(ICONS_FILES));do \ + if test -f $(srcdir)/$$f; then \ + echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \ + cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \ + fi; \ + done; + +MAINTAINERCLEANFILES = Makefile.in diff -r 568e48a75cd4 -r dab0360d56e9 data/icons/hicolor/16x16/actions/gajim-upload.png Binary file data/icons/hicolor/16x16/actions/gajim-upload.png has changed diff -r 568e48a75cd4 -r dab0360d56e9 data/pixmaps/upload.png Binary file data/pixmaps/upload.png has changed diff -r 568e48a75cd4 -r dab0360d56e9 src/chat_control.py --- a/src/chat_control.py Fri Nov 27 12:09:43 2009 +0200 +++ b/src/chat_control.py Fri Nov 27 16:42:32 2009 +0100 @@ -1292,7 +1292,7 @@ self._send_file_button = self.xml.get_widget('send_file_button') # add a special img for send file button - path_to_upload_img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'upload.png') + path_to_upload_img = gtkgui_helpers.get_icon_path('gajim-upload') img = gtk.Image() img.set_from_file(path_to_upload_img) self._send_file_button.set_image(img) diff -r 568e48a75cd4 -r dab0360d56e9 src/common/configpaths.py --- a/src/common/configpaths.py Fri Nov 27 12:09:43 2009 +0200 +++ b/src/common/configpaths.py Fri Nov 27 16:42:32 2009 +0100 @@ -122,6 +122,7 @@ if not datadir: datadir = u'..' self.add('DATA', os.path.join(datadir, windowsify(u'data'))) + self.add('ICONS', os.path.join(datadir, windowsify(u'icons'))) self.add('HOME', fse(os.path.expanduser('~'))) try: self.add('TMP', fse(tempfile.gettempdir())) diff -r 568e48a75cd4 -r dab0360d56e9 src/common/gajim.py --- a/src/common/gajim.py Fri Nov 27 12:09:43 2009 +0200 +++ b/src/common/gajim.py Fri Nov 27 16:42:32 2009 +0100 @@ -85,6 +85,7 @@ MY_CACERTS = gajimpaths['MY_CACERTS'] TMP = gajimpaths['TMP'] DATA_DIR = gajimpaths['DATA'] +ICONS_DIR = gajimpaths['ICONS'] HOME_DIR = gajimpaths['HOME'] try: diff -r 568e48a75cd4 -r dab0360d56e9 src/groupchat_control.py --- a/src/groupchat_control.py Fri Nov 27 12:09:43 2009 +0200 +++ b/src/groupchat_control.py Fri Nov 27 16:42:32 2009 +0100 @@ -2086,7 +2086,7 @@ item = xml.get_widget('send_file_menuitem') # add a special img for send file menuitem - path_to_upload_img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'upload.png') + path_to_upload_img = gtkgui_helpers.get_icon_path('gajim-upload') img = gtk.Image() img.set_from_file(path_to_upload_img) item.set_image(img) diff -r 568e48a75cd4 -r dab0360d56e9 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Fri Nov 27 12:09:43 2009 +0200 +++ b/src/gtkgui_helpers.py Fri Nov 27 16:42:32 2009 +0100 @@ -61,6 +61,26 @@ screen_w = gtk.gdk.screen_width() screen_h = gtk.gdk.screen_height() +gtk_icon_theme = gtk.icon_theme_get_default() +gtk_icon_theme.append_search_path(gajim.ICONS_DIR) + +def get_icon_pixmap(icon_name, size=16): + try: + return gtk_icon_theme.load_icon(icon_name, size, 0) + except gobject.GError, e: + log.error('Unable to load icon %s: %s' % (icon_name, str(e))) + +def get_icon_path(icon_name, size=16): + try: + icon_info = gtk_icon_theme.lookup_icon(icon_name, size, 0) + if icon_info == None: + log.error('Icon not found: %s' % icon_name) + return "" + else: + return icon_info.get_filename() + except gobject.GError, e: + log.error("Unable to find icon %s: %s" % (icon_name, str(e))) + GLADE_DIR = os.path.join(gajim.DATA_DIR, 'glade') def get_glade(file_name, root = None): file_path = os.path.join(GLADE_DIR, file_name) diff -r 568e48a75cd4 -r dab0360d56e9 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Fri Nov 27 12:09:43 2009 +0200 +++ b/src/gui_menu_builder.py Fri Nov 27 16:42:32 2009 +0100 @@ -200,7 +200,7 @@ items_to_hide = [] # add a special img for send file menuitem - path_to_upload_img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'upload.png') + path_to_upload_img = gtkgui_helpers.get_icon_path('gajim-upload') img = gtk.Image() img.set_from_file(path_to_upload_img) send_file_menuitem.set_image(img)

1 0

gajim: Tiny refactoring bits of jingle code
by Alexander Cherniuk 27 Nov '09

27 Nov '09

changeset 568e48a75cd4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=568e48a75cd4 description: Tiny refactoring bits of jingle code diffstat: src/common/jingle_content.py | 4 +--- src/common/jingle_rtp.py | 11 ++++++----- src/common/jingle_session.py | 11 ++++++----- src/common/jingle_transport.py | 2 -- 4 files changed, 13 insertions(+), 15 deletions(-) diffs (123 lines): diff -r f7de11463423 -r 568e48a75cd4 src/common/jingle_content.py --- a/src/common/jingle_content.py Fri Nov 27 10:29:17 2009 +0100 +++ b/src/common/jingle_content.py Fri Nov 27 12:09:43 2009 +0200 @@ -21,8 +21,6 @@ namespace = node.getNamespace() if namespace in contents: return contents[namespace](node) - else: - return None class JingleContent(object): @@ -74,7 +72,7 @@ } def is_ready(self): - return (self.accepted and not self.sent) + return self.accepted and not self.sent def add_remote_candidates(self, candidates): """ diff -r f7de11463423 -r 568e48a75cd4 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Fri Nov 27 10:29:17 2009 +0100 +++ b/src/common/jingle_rtp.py Fri Nov 27 12:09:43 2009 +0200 @@ -182,7 +182,9 @@ self.session.content_negociated(self.media) def __on_remote_codecs(self, stanza, content, error, action): - ''' Get peer codecs from what we get from peer. ''' + """ + Get peer codecs from what we get from peer + """ if self.got_codecs: return @@ -198,7 +200,7 @@ codec.iterTags('parameter')] codecs.append(c) - if len(codecs) > 0: + if codecs: # FIXME: Handle this case: # glib.GError: There was no intersection between the remote codecs and # the local ones @@ -216,7 +218,8 @@ if codec.optional_params: payload = (xmpp.Node('parameter', {'name': name, 'value': value}) for name, value in codec.optional_params) - else: payload = () + else: + payload = () yield xmpp.Node('payload-type', attrs, payload) def __stop(self, *things): @@ -319,7 +322,5 @@ return JingleAudio elif desc['media'] == 'video': return JingleVideo - else: - return None contents[xmpp.NS_JINGLE_RTP] = get_content diff -r f7de11463423 -r 568e48a75cd4 src/common/jingle_session.py --- a/src/common/jingle_session.py Fri Nov 27 10:29:17 2009 +0100 +++ b/src/common/jingle_session.py Fri Nov 27 12:09:43 2009 +0200 @@ -154,7 +154,7 @@ def get_content(self, media=None): if media is None: - return None + return for content in self.contents.values(): if content.media == media: @@ -353,7 +353,7 @@ def __on_session_info(self, stanza, jingle, error, action): # TODO: ringing, active, (un)hold, (un)mute payload = jingle.getPayload() - if len(payload) > 0: + if payload: self.__send_error(stanza, 'feature-not-implemented', 'unsupported-info') raise xmpp.NodeProcessed @@ -367,7 +367,7 @@ self.connection.dispatch('JINGLE_DISCONNECTED', (self.peerjid, self.sid, content.media, 'removed')) content.destroy() - if len(self.contents) == 0: + if not self.contents: reason = xmpp.Node('reason') reason.setTag('success') self._session_terminate(reason) @@ -469,7 +469,8 @@ if text: text = '%s (%s)' % (reason, text) else: - text = reason#TODO + # TODO + text = reason self.connection.dispatch('JINGLE_DISCONNECTED', (self.peerjid, self.sid, None, text)) @@ -481,7 +482,7 @@ content.on_stanza(stanza, None, error, action) def __parse_contents(self, jingle): - #TODO: Needs some reworking + # TODO: Needs some reworking contents = [] contents_rejected = [] contents_ok = False diff -r f7de11463423 -r 568e48a75cd4 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Fri Nov 27 10:29:17 2009 +0100 +++ b/src/common/jingle_transport.py Fri Nov 27 12:09:43 2009 +0200 @@ -23,8 +23,6 @@ namespace = node.getNamespace() if namespace in transports: return transports[namespace]() - else: - return None class TransportType(object):

1 0

gajim: Merge local changes
by Thibaut GIRKA 27 Nov '09

27 Nov '09

changeset f7de11463423 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f7de11463423 description: Merge local changes diffstat: src/chat_control.py | 78 ++++++++++++++++---------------------- src/common/jingle.py | 8 ++-- src/common/jingle_content.py | 26 ++++++------ src/common/jingle_rtp.py | 22 +++++----- src/common/jingle_session.py | 86 +++++++++++++++++++++--------------------- 5 files changed, 104 insertions(+), 116 deletions(-) diffs (truncated from 532 to 300 lines): diff -r 241411c9ee6e -r f7de11463423 src/chat_control.py --- a/src/chat_control.py Fri Nov 27 11:13:27 2009 +0200 +++ b/src/chat_control.py Fri Nov 27 10:29:17 2009 +0100 @@ -1510,22 +1510,23 @@ def _update_jingle(self, jingle_type): if jingle_type not in ('audio', 'video'): return - if self.__dict__[jingle_type + '_state'] in ( + banner_image = getattr(self, '_' + jingle_type + '_banner_image') + if getattr(self, jingle_type + '_state') in ( self.JINGLE_STATE_NOT_AVAILABLE, self.JINGLE_STATE_AVAILABLE): - self.__dict__['_' + jingle_type + '_banner_image'].hide() + banner_image.hide() else: - self.__dict__['_' + jingle_type + '_banner_image'].show() + banner_image.show() if self.audio_state == self.JINGLE_STATE_CONNECTING: - self.__dict__['_' + jingle_type + '_banner_image'].set_from_stock( + banner_image.set_from_stock( gtk.STOCK_CONVERT, 1) elif self.audio_state == self.JINGLE_STATE_CONNECTION_RECEIVED: - self.__dict__['_' + jingle_type + '_banner_image'].set_from_stock( + banner_image.set_from_stock( gtk.STOCK_NETWORK, 1) elif self.audio_state == self.JINGLE_STATE_CONNECTED: - self.__dict__['_' + jingle_type + '_banner_image'].set_from_stock( + banner_image.set_from_stock( gtk.STOCK_CONNECT, 1) elif self.audio_state == self.JINGLE_STATE_ERROR: - self.__dict__['_' + jingle_type + '_banner_image'].set_from_stock( + banner_image.set_from_stock( gtk.STOCK_DIALOG_WARNING, 1) self.update_toolbar() @@ -1566,27 +1567,27 @@ if state in states: jingle_state = states[state] - if self.__dict__[jingle_type + '_state'] == jingle_state: + if getattr(self, jingle_type + '_state') == jingle_state: return - self.__dict__[jingle_type + '_state'] = jingle_state + setattr(self, jingle_type + '_state', jingle_state) # Destroy existing session with the user when he signs off # We need to do that before modifying the sid if state == 'not_available': gajim.connections[self.account].delete_jingle_session( - self.contact.get_full_jid(), self.__dict__[jingle_type + '_sid']) + self.contact.get_full_jid(), getattr(self, jingle_type + '_sid')) if state in ('not_available', 'available', 'stop'): - self.__dict__[jingle_type + '_sid'] = None + setattr(self, jingle_type + '_sid', None) if state in ('connection_received', 'connecting'): - self.__dict__[jingle_type + '_sid'] = sid + setattr(self, jingle_type + '_sid', sid) if state in ('connecting', 'connected', 'connection_received'): - self.__dict__['_' + jingle_type + '_button'].set_active(True) + getattr(self, '_' + jingle_type + '_button').set_active(True) elif state in ('not_available', 'stop'): - self.__dict__['_' + jingle_type + '_button'].set_active(False) + getattr(self, '_' + jingle_type + '_button').set_active(False) - eval('self.update_' + jingle_type)() + getattr(self, 'update_' + jingle_type)() def set_audio_state(self, state, sid=None, reason=None): self._set_jingle_state('audio', state, sid=sid, reason=reason) @@ -1799,45 +1800,32 @@ banner_name_label.set_markup(label_text) banner_name_label.set_tooltip_text(label_tooltip) - def on_audio_button_toggled(self, widget): + def on_jingle_button_toggled(self, widget, jingle_type): + path_to_img = os.path.join(gajim.DATA_DIR, 'pixmaps', '%s_%s.png' + % ({'audio': 'mic', 'video': 'cam'}[jingle_type], + {True: 'active', False: 'inactive'}[widget.get_active()])) + if widget.get_active(): - path_to_img = os.path.join(gajim.DATA_DIR, 'pixmaps', - 'mic_active.png') - if self.audio_state == self.JINGLE_STATE_AVAILABLE: - sid = gajim.connections[self.account].startVoIP( - self.contact.get_full_jid()) - self.set_audio_state('connecting', sid) + if getattr(self, jingle_type + '_state') == self.JINGLE_STATE_AVAILABLE: + sid = getattr(gajim.connections[self.account], + 'start_' + jingle_type)(self.contact.get_full_jid()) + getattr(self, 'set_' + jingle_type + '_state')('connecting', sid) else: - path_to_img = os.path.join(gajim.DATA_DIR, 'pixmaps', - 'mic_inactive.png') session = gajim.connections[self.account].get_jingle_session( - self.contact.get_full_jid(), self.audio_sid) + self.contact.get_full_jid(), getattr(self, jingle_type + '_sid')) if session: - content = session.get_content('audio') + content = session.get_content(jingle_type) if content: session.remove_content(content.creator, content.name) - img = self._audio_button.get_property('image') + + img = getattr(self, '_' + jingle_type + '_button').get_property('image') img.set_from_file(path_to_img) + def on_audio_button_toggled(self, widget): + self.on_jingle_button_toggled(widget, 'audio') + def on_video_button_toggled(self, widget): - if widget.get_active(): - path_to_img = os.path.join(gajim.DATA_DIR, 'pixmaps', - 'cam_active.png') - if self.video_state == self.JINGLE_STATE_AVAILABLE: - sid = gajim.connections[self.account].startVideoIP( - self.contact.get_full_jid()) - self.set_video_state('connecting', sid) - else: - path_to_img = os.path.join(gajim.DATA_DIR, 'pixmaps', - 'cam_inactive.png') - session = gajim.connections[self.account].get_jingle_session( - self.contact.get_full_jid(), self.video_sid) - if session: - content = session.get_content('video') - if content: - session.remove_content(content.creator, content.name) - img = self._video_button.get_property('image') - img.set_from_file(path_to_img) + self.on_jingle_button_toggled(widget, 'video') def _toggle_gpg(self): if not self.gpg_is_active and not self.contact.keyID: diff -r 241411c9ee6e -r f7de11463423 src/common/jingle.py --- a/src/common/jingle.py Fri Nov 27 11:13:27 2009 +0200 +++ b/src/common/jingle.py Fri Nov 27 10:29:17 2009 +0100 @@ -86,7 +86,7 @@ id = stanza.getID() if (jid, id) in self.__iq_responses.keys(): - self.__iq_responses[(jid, id)].stanzaCB(stanza) + self.__iq_responses[(jid, id)].on_stanza(stanza) del self.__iq_responses[(jid, id)] raise xmpp.NodeProcessed @@ -101,11 +101,11 @@ self.add_jingle(newjingle) # we already have such session in dispatcher... - self.__sessions[(jid, sid)].stanzaCB(stanza) + self.__sessions[(jid, sid)].on_stanza(stanza) raise xmpp.NodeProcessed - def startVoIP(self, jid): + def start_audio(self, jid): if self.get_jingle_session(jid, media='audio'): return self.get_jingle_session(jid, media='audio').sid jingle = self.get_jingle_session(jid, media='video') @@ -118,7 +118,7 @@ jingle.start_session() return jingle.sid - def startVideoIP(self, jid): + def start_video(self, jid): if self.get_jingle_session(jid, media='video'): return self.get_jingle_session(jid, media='video').sid jingle = self.get_jingle_session(jid, media='audio') diff -r 241411c9ee6e -r f7de11463423 src/common/jingle_content.py --- a/src/common/jingle_content.py Fri Nov 27 11:13:27 2009 +0200 +++ b/src/common/jingle_content.py Fri Nov 27 10:29:17 2009 +0100 @@ -48,28 +48,28 @@ self.callbacks = { # these are called when *we* get stanzas - 'content-accept': [self.__transportInfoCB], - 'content-add': [self.__transportInfoCB], + 'content-accept': [self.__on_transport_info], + 'content-add': [self.__on_transport_info], 'content-modify': [], 'content-reject': [], 'content-remove': [], 'description-info': [], 'security-info': [], - 'session-accept': [self.__transportInfoCB], + 'session-accept': [self.__on_transport_info], 'session-info': [], - 'session-initiate': [self.__transportInfoCB], + 'session-initiate': [self.__on_transport_info], 'session-terminate': [], - 'transport-info': [self.__transportInfoCB], + 'transport-info': [self.__on_transport_info], 'transport-replace': [], 'transport-accept': [], 'transport-reject': [], 'iq-result': [], 'iq-error': [], # these are called when *we* sent these stanzas - 'content-accept-sent': [self.__fillJingleStanza], - 'content-add-sent': [self.__fillJingleStanza], - 'session-initiate-sent': [self.__fillJingleStanza], - 'session-accept-sent': [self.__fillJingleStanza], + 'content-accept-sent': [self.__fill_jingle_stanza], + 'content-add-sent': [self.__fill_jingle_stanza], + 'session-initiate-sent': [self.__fill_jingle_stanza], + 'session-accept-sent': [self.__fill_jingle_stanza], 'session-terminate-sent': [], } @@ -82,7 +82,7 @@ """ pass - def stanzaCB(self, stanza, content, error, action): + def on_stanza(self, stanza, content, error, action): """ Called when something related to our content was sent by peer """ @@ -90,7 +90,7 @@ for callback in self.callbacks[action]: callback(stanza, content, error, action) - def __transportInfoCB(self, stanza, content, error, action): + def __on_transport_info(self, stanza, content, error, action): """ Got a new transport candidate """ @@ -112,11 +112,11 @@ content.addChild(self.transport.make_transport([candidate])) self.session.send_transport_info(content) - def __fillJingleStanza(self, stanza, content, error, action): + def __fill_jingle_stanza(self, stanza, content, error, action): """ Add our things to session-initiate stanza """ - self._fillContent(content) + self._fill_content(content) self.sent = True content.addChild(node=self.transport.make_transport()) diff -r 241411c9ee6e -r f7de11463423 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Fri Nov 27 11:13:27 2009 +0200 +++ b/src/common/jingle_rtp.py Fri Nov 27 10:29:17 2009 +0100 @@ -47,14 +47,14 @@ self.candidates_ready = False # True when local candidates are prepared - self.callbacks['session-initiate'] += [self.__getRemoteCodecsCB] - self.callbacks['content-add'] += [self.__getRemoteCodecsCB] - self.callbacks['content-accept'] += [self.__getRemoteCodecsCB, - self.__contentAcceptCB] - self.callbacks['session-accept'] += [self.__getRemoteCodecsCB, - self.__contentAcceptCB] - self.callbacks['session-accept-sent'] += [self.__contentAcceptCB] - self.callbacks['content-accept-sent'] += [self.__contentAcceptCB] + self.callbacks['session-initiate'] += [self.__on_remote_codecs] + self.callbacks['content-add'] += [self.__on_remote_codecs] + self.callbacks['content-accept'] += [self.__on_remote_codecs, + self.__on_content_accept] + self.callbacks['session-accept'] += [self.__on_remote_codecs, + self.__on_content_accept] + self.callbacks['session-accept-sent'] += [self.__on_content_accept] + self.callbacks['content-accept-sent'] += [self.__on_content_accept] self.callbacks['session-terminate'] += [self.__stop] self.callbacks['session-terminate-sent'] += [self.__stop] @@ -121,7 +121,7 @@ def _stop_dtmf(self): self.p2psession.stop_telephony_event(farsight.DTMF_METHOD_RTP_RFC4733) - def _fillContent(self, content): + def _fill_content(self, content): content.addChild(xmpp.NS_JINGLE_RTP + ' description', attrs={'media': self.media}, payload=self.iter_codecs()) @@ -172,7 +172,7 @@ else: print name - def __contentAcceptCB(self, stanza, content, error, action): + def __on_content_accept(self, stanza, content, error, action): if self.accepted: if self.transport.remote_candidates: self.p2pstream.set_remote_candidates(self.transport.remote_candidates) @@ -181,7 +181,7 @@ self.p2pstream.set_property('direction', farsight.DIRECTION_BOTH) self.session.content_negociated(self.media) - def __getRemoteCodecsCB(self, stanza, content, error, action): + def __on_remote_codecs(self, stanza, content, error, action): ''' Get peer codecs from what we get from peer. ''' if self.got_codecs: return diff -r 241411c9ee6e -r f7de11463423 src/common/jingle_session.py --- a/src/common/jingle_session.py Fri Nov 27 11:13:27 2009 +0200 +++ b/src/common/jingle_session.py Fri Nov 27 10:29:17 2009 +0100 @@ -89,28 +89,28 @@ # use .prepend() to add new callbacks, especially when you're going # to send error instead of ack

1 0

gajim: [Jingle] Renamed callbacks to match name conventions
by Thibaut GIRKA 27 Nov '09

27 Nov '09

changeset a67d3ac7d6c6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a67d3ac7d6c6 description: [Jingle] Renamed callbacks to match name conventions diffstat: src/common/jingle.py | 4 +- src/common/jingle_content.py | 14 +++--- src/common/jingle_rtp.py | 20 +++++----- src/common/jingle_session.py | 86 +++++++++++++++++++++--------------------- 4 files changed, 62 insertions(+), 62 deletions(-) diffs (truncated from 348 to 300 lines): diff -r 95f4d411c229 -r a67d3ac7d6c6 src/common/jingle.py --- a/src/common/jingle.py Thu Nov 26 21:53:44 2009 +0100 +++ b/src/common/jingle.py Thu Nov 26 22:09:34 2009 +0100 @@ -86,7 +86,7 @@ id = stanza.getID() if (jid, id) in self.__iq_responses.keys(): - self.__iq_responses[(jid, id)].stanzaCB(stanza) + self.__iq_responses[(jid, id)].on_stanza(stanza) del self.__iq_responses[(jid, id)] raise xmpp.NodeProcessed @@ -101,7 +101,7 @@ self.add_jingle(newjingle) # we already have such session in dispatcher... - self.__sessions[(jid, sid)].stanzaCB(stanza) + self.__sessions[(jid, sid)].on_stanza(stanza) raise xmpp.NodeProcessed diff -r 95f4d411c229 -r a67d3ac7d6c6 src/common/jingle_content.py --- a/src/common/jingle_content.py Thu Nov 26 21:53:44 2009 +0100 +++ b/src/common/jingle_content.py Thu Nov 26 22:09:34 2009 +0100 @@ -48,18 +48,18 @@ self.callbacks = { # these are called when *we* get stanzas - 'content-accept': [self.__transportInfoCB], - 'content-add': [self.__transportInfoCB], + 'content-accept': [self.__on_transport_info], + 'content-add': [self.__on_transport_info], 'content-modify': [], 'content-reject': [], 'content-remove': [], 'description-info': [], 'security-info': [], - 'session-accept': [self.__transportInfoCB], + 'session-accept': [self.__on_transport_info], 'session-info': [], - 'session-initiate': [self.__transportInfoCB], + 'session-initiate': [self.__on_transport_info], 'session-terminate': [], - 'transport-info': [self.__transportInfoCB], + 'transport-info': [self.__on_transport_info], 'transport-replace': [], 'transport-accept': [], 'transport-reject': [], @@ -82,7 +82,7 @@ """ pass - def stanzaCB(self, stanza, content, error, action): + def on_stanza(self, stanza, content, error, action): """ Called when something related to our content was sent by peer """ @@ -90,7 +90,7 @@ for callback in self.callbacks[action]: callback(stanza, content, error, action) - def __transportInfoCB(self, stanza, content, error, action): + def __on_transport_info(self, stanza, content, error, action): """ Got a new transport candidate """ diff -r 95f4d411c229 -r a67d3ac7d6c6 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Thu Nov 26 21:53:44 2009 +0100 +++ b/src/common/jingle_rtp.py Thu Nov 26 22:09:34 2009 +0100 @@ -47,14 +47,14 @@ self.candidates_ready = False # True when local candidates are prepared - self.callbacks['session-initiate'] += [self.__getRemoteCodecsCB] - self.callbacks['content-add'] += [self.__getRemoteCodecsCB] - self.callbacks['content-accept'] += [self.__getRemoteCodecsCB, - self.__contentAcceptCB] - self.callbacks['session-accept'] += [self.__getRemoteCodecsCB, - self.__contentAcceptCB] - self.callbacks['session-accept-sent'] += [self.__contentAcceptCB] - self.callbacks['content-accept-sent'] += [self.__contentAcceptCB] + self.callbacks['session-initiate'] += [self.__on_remote_codecs] + self.callbacks['content-add'] += [self.__on_remote_codecs] + self.callbacks['content-accept'] += [self.__on_remote_codecs, + self.__on_content_accept] + self.callbacks['session-accept'] += [self.__on_remote_codecs, + self.__on_content_accept] + self.callbacks['session-accept-sent'] += [self.__on_content_accept] + self.callbacks['content-accept-sent'] += [self.__on_content_accept] self.callbacks['session-terminate'] += [self.__stop] self.callbacks['session-terminate-sent'] += [self.__stop] @@ -172,7 +172,7 @@ else: print name - def __contentAcceptCB(self, stanza, content, error, action): + def __on_content_accept(self, stanza, content, error, action): if self.accepted: if self.transport.remote_candidates: self.p2pstream.set_remote_candidates(self.transport.remote_candidates) @@ -181,7 +181,7 @@ self.p2pstream.set_property('direction', farsight.DIRECTION_BOTH) self.session.content_negociated(self.media) - def __getRemoteCodecsCB(self, stanza, content, error, action): + def __on_remote_codecs(self, stanza, content, error, action): ''' Get peer codecs from what we get from peer. ''' if self.got_codecs: return diff -r 95f4d411c229 -r a67d3ac7d6c6 src/common/jingle_session.py --- a/src/common/jingle_session.py Thu Nov 26 21:53:44 2009 +0100 +++ b/src/common/jingle_session.py Thu Nov 26 22:09:34 2009 +0100 @@ -89,28 +89,28 @@ # use .prepend() to add new callbacks, especially when you're going # to send error instead of ack self.callbacks = { - 'content-accept': [self.__contentAcceptCB, self.__broadcastCB, - self.__defaultCB], - 'content-add': [self.__contentAddCB, self.__broadcastCB, - self.__defaultCB], #TODO - 'content-modify': [self.__defaultCB], #TODO - 'content-reject': [self.__defaultCB, self.__contentRemoveCB], #TODO - 'content-remove': [self.__defaultCB, self.__contentRemoveCB], - 'description-info': [self.__broadcastCB, self.__defaultCB], #TODO - 'security-info': [self.__defaultCB], #TODO - 'session-accept': [self.__sessionAcceptCB, self.__contentAcceptCB, - self.__broadcastCB, self.__defaultCB], - 'session-info': [self.__sessionInfoCB, self.__broadcastCB, self.__defaultCB], - 'session-initiate': [self.__sessionInitiateCB, self.__broadcastCB, - self.__defaultCB], - 'session-terminate': [self.__sessionTerminateCB, self.__broadcastAllCB, - self.__defaultCB], - 'transport-info': [self.__broadcastCB, self.__defaultCB], - 'transport-replace': [self.__broadcastCB, self.__transportReplaceCB], #TODO - 'transport-accept': [self.__defaultCB], #TODO - 'transport-reject': [self.__defaultCB], #TODO + 'content-accept': [self.__on_content_accept, self.__broadcast, + self.__ack], + 'content-add': [self.__on_content_add, self.__broadcast, + self.__ack], #TODO + 'content-modify': [self.__ack], #TODO + 'content-reject': [self.__ack, self.__on_content_remove], #TODO + 'content-remove': [self.__ack, self.__on_content_remove], + 'description-info': [self.__broadcast, self.__ack], #TODO + 'security-info': [self.__ack], #TODO + 'session-accept': [self.__on_session_accept, self.__on_content_accept, + self.__broadcast, self.__ack], + 'session-info': [self.__on_session_info, self.__broadcast, self.__ack], + 'session-initiate': [self.__on_session_initiate, self.__broadcast, + self.__ack], + 'session-terminate': [self.__on_session_terminate, self.__broadcast_all, + self.__ack], + 'transport-info': [self.__broadcast, self.__ack], + 'transport-replace': [self.__broadcast, self.__on_transport_replace], #TODO + 'transport-accept': [self.__ack], #TODO + 'transport-reject': [self.__ack], #TODO 'iq-result': [], - 'iq-error': [self.__errorCB], + 'iq-error': [self.__on_error], } def approve_session(self): @@ -262,7 +262,7 @@ jingle.addChild(node=content) self.connection.connection.send(stanza) - def stanzaCB(self, stanza): + def on_stanza(self, stanza): """ A callback for ConnectionJingle. It gets stanza, then tries to send it to all internally registered callbacks. First one to raise @@ -300,14 +300,14 @@ # FIXME self.__send_error(stanza, 'unexpected-request', 'out-of-order') - def __defaultCB(self, stanza, jingle, error, action): + def __ack(self, stanza, jingle, error, action): """ Default callback for action stanzas -- simple ack and stop processing """ response = stanza.buildReply('result') self.connection.connection.send(response) - def __errorCB(self, stanza, jingle, error, action): + def __on_error(self, stanza, jingle, error, action): # FIXME text = error.getTagData('text') jingle_error = None @@ -322,7 +322,7 @@ if xmpp_error == 'item-not-found': self.connection.delete_jingle_session(self.peerjid, self.sid) - def __transportReplaceCB(self, stanza, jingle, error, action): + def __on_transport_replace(self, stanza, jingle, error, action): for content in jingle.iterTags('content'): creator = content['creator'] name = content['name'] @@ -350,14 +350,14 @@ self.connection.connection.send(stanza) raise xmpp.NodeProcessed - def __sessionInfoCB(self, stanza, jingle, error, action): + def __on_session_info(self, stanza, jingle, error, action): # TODO: ringing, active, (un)hold, (un)mute payload = jingle.getPayload() if len(payload) > 0: self.__send_error(stanza, 'feature-not-implemented', 'unsupported-info') raise xmpp.NodeProcessed - def __contentRemoveCB(self, stanza, jingle, error, action): + def __on_content_remove(self, stanza, jingle, error, action): for content in jingle.iterTags('content'): creator = content['creator'] name = content['name'] @@ -372,13 +372,13 @@ reason.setTag('success') self._session_terminate(reason) - def __sessionAcceptCB(self, stanza, jingle, error, action): + def __on_session_accept(self, stanza, jingle, error, action): # FIXME if self.state != JingleStates.pending: raise OutOfOrder self.state = JingleStates.active - def __contentAcceptCB(self, stanza, jingle, error, action): + def __on_content_accept(self, stanza, jingle, error, action): """ Called when we get content-accept stanza or equivalent one (like session-accept) @@ -389,7 +389,7 @@ # TODO name = content['name'] - def __contentAddCB(self, stanza, jingle, error, action): + def __on_content_add(self, stanza, jingle, error, action): if self.state == JingleStates.ended: raise OutOfOrder @@ -407,7 +407,7 @@ self.connection.dispatch('JINGLE_INCOMING', (self.peerjid, self.sid, contents)) - def __sessionInitiateCB(self, stanza, jingle, error, action): + def __on_session_initiate(self, stanza, jingle, error, action): """ We got a jingle session request from other entity, therefore we are the receiver... Unpack the data, inform the user @@ -433,7 +433,7 @@ # TODO: http://xmpp.org/extensions/xep-0166.html#session-terminate reason = xmpp.Node('reason') reason.setTag('unsupported-applications') - self.__defaultCB(stanza, jingle, error, action) + self.__ack(stanza, jingle, error, action) self._session_terminate(reason) raise xmpp.NodeProcessed @@ -441,7 +441,7 @@ # TODO: http://xmpp.org/extensions/xep-0166.html#session-terminate reason = xmpp.Node('reason') reason.setTag('unsupported-transports') - self.__defaultCB(stanza, jingle, error, action) + self.__ack(stanza, jingle, error, action) self._session_terminate(reason) raise xmpp.NodeProcessed @@ -451,7 +451,7 @@ self.connection.dispatch('JINGLE_INCOMING', (self.peerjid, self.sid, contents)) - def __broadcastCB(self, stanza, jingle, error, action): + def __broadcast(self, stanza, jingle, error, action): """ Broadcast the stanza contents to proper content handlers """ @@ -459,9 +459,9 @@ name = content['name'] creator = content['creator'] cn = self.contents[(creator, name)] - cn.stanzaCB(stanza, content, error, action) + cn.on_stanza(stanza, content, error, action) - def __sessionTerminateCB(self, stanza, jingle, error, action): + def __on_session_terminate(self, stanza, jingle, error, action): self.connection.delete_jingle_session(self.peerjid, self.sid) reason, text = self.__reason_from_stanza(jingle) if reason not in ('success', 'cancel', 'decline'): @@ -473,12 +473,12 @@ self.connection.dispatch('JINGLE_DISCONNECTED', (self.peerjid, self.sid, None, text)) - def __broadcastAllCB(self, stanza, jingle, error, action): + def __broadcast_all(self, stanza, jingle, error, action): """ Broadcast the stanza to all content handlers """ for content in self.contents.itervalues(): - content.stanzaCB(stanza, None, error, action) + content.on_stanza(stanza, None, error, action)

1 0

gajim: Renamed a few methods, refactor on_*_button_toggled, use ...
by Thibaut GIRKA 27 Nov '09

27 Nov '09

changeset 95f4d411c229 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=95f4d411c229 description: Renamed a few methods, refactor on_*_button_toggled, use getattr/setattr instead of eval/self.__dict__ diffstat: src/chat_control.py | 78 ++++++++++++++++---------------------- src/common/jingle.py | 4 +- src/common/jingle_content.py | 12 +++--- src/common/jingle_rtp.py | 2 +- 4 files changed, 42 insertions(+), 54 deletions(-) diffs (198 lines): diff -r 6418a98956a1 -r 95f4d411c229 src/chat_control.py --- a/src/chat_control.py Thu Nov 26 20:18:09 2009 +0100 +++ b/src/chat_control.py Thu Nov 26 21:53:44 2009 +0100 @@ -1510,22 +1510,23 @@ def _update_jingle(self, jingle_type): if jingle_type not in ('audio', 'video'): return - if self.__dict__[jingle_type + '_state'] in ( + banner_image = getattr(self, '_' + jingle_type + '_banner_image') + if getattr(self, jingle_type + '_state') in ( self.JINGLE_STATE_NOT_AVAILABLE, self.JINGLE_STATE_AVAILABLE): - self.__dict__['_' + jingle_type + '_banner_image'].hide() + banner_image.hide() else: - self.__dict__['_' + jingle_type + '_banner_image'].show() + banner_image.show() if self.audio_state == self.JINGLE_STATE_CONNECTING: - self.__dict__['_' + jingle_type + '_banner_image'].set_from_stock( + banner_image.set_from_stock( gtk.STOCK_CONVERT, 1) elif self.audio_state == self.JINGLE_STATE_CONNECTION_RECEIVED: - self.__dict__['_' + jingle_type + '_banner_image'].set_from_stock( + banner_image.set_from_stock( gtk.STOCK_NETWORK, 1) elif self.audio_state == self.JINGLE_STATE_CONNECTED: - self.__dict__['_' + jingle_type + '_banner_image'].set_from_stock( + banner_image.set_from_stock( gtk.STOCK_CONNECT, 1) elif self.audio_state == self.JINGLE_STATE_ERROR: - self.__dict__['_' + jingle_type + '_banner_image'].set_from_stock( + banner_image.set_from_stock( gtk.STOCK_DIALOG_WARNING, 1) self.update_toolbar() @@ -1566,27 +1567,27 @@ if state in states: jingle_state = states[state] - if self.__dict__[jingle_type + '_state'] == jingle_state: + if getattr(self, jingle_type + '_state') == jingle_state: return - self.__dict__[jingle_type + '_state'] = jingle_state + setattr(self, jingle_type + '_state', jingle_state) # Destroy existing session with the user when he signs off # We need to do that before modifying the sid if state == 'not_available': gajim.connections[self.account].delete_jingle_session( - self.contact.get_full_jid(), self.__dict__[jingle_type + '_sid']) + self.contact.get_full_jid(), getattr(self, jingle_type + '_sid')) if state in ('not_available', 'available', 'stop'): - self.__dict__[jingle_type + '_sid'] = None + setattr(self, jingle_type + '_sid', None) if state in ('connection_received', 'connecting'): - self.__dict__[jingle_type + '_sid'] = sid + setattr(self, jingle_type + '_sid', sid) if state in ('connecting', 'connected', 'connection_received'): - self.__dict__['_' + jingle_type + '_button'].set_active(True) + getattr(self, '_' + jingle_type + '_button').set_active(True) elif state in ('not_available', 'stop'): - self.__dict__['_' + jingle_type + '_button'].set_active(False) + getattr(self, '_' + jingle_type + '_button').set_active(False) - eval('self.update_' + jingle_type)() + getattr(self, 'update_' + jingle_type)() def set_audio_state(self, state, sid=None, reason=None): self._set_jingle_state('audio', state, sid=sid, reason=reason) @@ -1799,45 +1800,32 @@ banner_name_label.set_markup(label_text) banner_name_label.set_tooltip_text(label_tooltip) - def on_audio_button_toggled(self, widget): + def on_jingle_button_toggled(self, widget, jingle_type): + path_to_img = os.path.join(gajim.DATA_DIR, 'pixmaps', '%s_%s.png' + % ({'audio': 'mic', 'video': 'cam'}[jingle_type], + {True: 'active', False: 'inactive'}[widget.get_active()])) + if widget.get_active(): - path_to_img = os.path.join(gajim.DATA_DIR, 'pixmaps', - 'mic_active.png') - if self.audio_state == self.JINGLE_STATE_AVAILABLE: - sid = gajim.connections[self.account].startVoIP( - self.contact.get_full_jid()) - self.set_audio_state('connecting', sid) + if getattr(self, jingle_type + '_state') == self.JINGLE_STATE_AVAILABLE: + sid = getattr(gajim.connections[self.account], + 'start_' + jingle_type)(self.contact.get_full_jid()) + getattr(self, 'set_' + jingle_type + '_state')('connecting', sid) else: - path_to_img = os.path.join(gajim.DATA_DIR, 'pixmaps', - 'mic_inactive.png') session = gajim.connections[self.account].get_jingle_session( - self.contact.get_full_jid(), self.audio_sid) + self.contact.get_full_jid(), getattr(self, jingle_type + '_sid')) if session: - content = session.get_content('audio') + content = session.get_content(jingle_type) if content: session.remove_content(content.creator, content.name) - img = self._audio_button.get_property('image') + + img = getattr(self, '_' + jingle_type + '_button').get_property('image') img.set_from_file(path_to_img) + def on_audio_button_toggled(self, widget): + self.on_jingle_button_toggled(widget, 'audio') + def on_video_button_toggled(self, widget): - if widget.get_active(): - path_to_img = os.path.join(gajim.DATA_DIR, 'pixmaps', - 'cam_active.png') - if self.video_state == self.JINGLE_STATE_AVAILABLE: - sid = gajim.connections[self.account].startVideoIP( - self.contact.get_full_jid()) - self.set_video_state('connecting', sid) - else: - path_to_img = os.path.join(gajim.DATA_DIR, 'pixmaps', - 'cam_inactive.png') - session = gajim.connections[self.account].get_jingle_session( - self.contact.get_full_jid(), self.video_sid) - if session: - content = session.get_content('video') - if content: - session.remove_content(content.creator, content.name) - img = self._video_button.get_property('image') - img.set_from_file(path_to_img) + self.on_jingle_button_toggled(widget, 'video') def _toggle_gpg(self): if not self.gpg_is_active and not self.contact.keyID: diff -r 6418a98956a1 -r 95f4d411c229 src/common/jingle.py --- a/src/common/jingle.py Thu Nov 26 20:18:09 2009 +0100 +++ b/src/common/jingle.py Thu Nov 26 21:53:44 2009 +0100 @@ -105,7 +105,7 @@ raise xmpp.NodeProcessed - def startVoIP(self, jid): + def start_audio(self, jid): if self.get_jingle_session(jid, media='audio'): return self.get_jingle_session(jid, media='audio').sid jingle = self.get_jingle_session(jid, media='video') @@ -118,7 +118,7 @@ jingle.start_session() return jingle.sid - def startVideoIP(self, jid): + def start_video(self, jid): if self.get_jingle_session(jid, media='video'): return self.get_jingle_session(jid, media='video').sid jingle = self.get_jingle_session(jid, media='audio') diff -r 6418a98956a1 -r 95f4d411c229 src/common/jingle_content.py --- a/src/common/jingle_content.py Thu Nov 26 20:18:09 2009 +0100 +++ b/src/common/jingle_content.py Thu Nov 26 21:53:44 2009 +0100 @@ -66,10 +66,10 @@ 'iq-result': [], 'iq-error': [], # these are called when *we* sent these stanzas - 'content-accept-sent': [self.__fillJingleStanza], - 'content-add-sent': [self.__fillJingleStanza], - 'session-initiate-sent': [self.__fillJingleStanza], - 'session-accept-sent': [self.__fillJingleStanza], + 'content-accept-sent': [self.__fill_jingle_stanza], + 'content-add-sent': [self.__fill_jingle_stanza], + 'session-initiate-sent': [self.__fill_jingle_stanza], + 'session-accept-sent': [self.__fill_jingle_stanza], 'session-terminate-sent': [], } @@ -112,11 +112,11 @@ content.addChild(self.transport.make_transport([candidate])) self.session.send_transport_info(content) - def __fillJingleStanza(self, stanza, content, error, action): + def __fill_jingle_stanza(self, stanza, content, error, action): """ Add our things to session-initiate stanza """ - self._fillContent(content) + self._fill_content(content) self.sent = True content.addChild(node=self.transport.make_transport()) diff -r 6418a98956a1 -r 95f4d411c229 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Thu Nov 26 20:18:09 2009 +0100 +++ b/src/common/jingle_rtp.py Thu Nov 26 21:53:44 2009 +0100 @@ -121,7 +121,7 @@ def _stop_dtmf(self): self.p2psession.stop_telephony_event(farsight.DTMF_METHOD_RTP_RFC4733) - def _fillContent(self, content): + def _fill_content(self, content): content.addChild(xmpp.NS_JINGLE_RTP + ' description', attrs={'media': self.media}, payload=self.iter_codecs())

1 0

← Newer
1
2
3
4
5
6
7
...
29
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2009