gajim: fix SeparatorMenuItem - Commits

1 Jan 2013

changeset ab854000f4fd in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=ab854000f4fd
description: fix SeparatorMenuItem
diffstat:
src/chat_control.py          |   8 ++++----
 src/conversation_textview.py |   4 ++--
 src/groupchat_control.py     |   2 +-
 src/gui_menu_builder.py      |   2 +-
 src/roster_window.py         |  30 +++++++++++++++---------------
 src/statusicon.py            |   8 ++++----
 6 files changed, 27 insertions(+), 27 deletions(-)
diffs (261 lines):
diff -r 61963a47b20b -r ab854000f4fd src/chat_control.py

--- a/src/chat_control.py	Tue Jan 01 18:34:30 2013 +0400
+++ b/src/chat_control.py	Tue Jan 01 19:46:04 2013 +0400
@@ -525,7 +525,7 @@
         """
         Override the default context menu and add our own menutiems
         """
-        item = Gtk.SeparatorMenuItem()
+        item = Gtk.SeparatorMenuItem.new()
         menu.prepend(item)
menu2 = self.prepare_context_menu()
@@ -573,7 +573,7 @@
         id_ = item.connect('activate', self.msg_textview.undo)
         self.handlers[id_] = item
-        item = Gtk.SeparatorMenuItem()
+        item = Gtk.SeparatorMenuItem.new()
         menu.prepend(item)
item = Gtk.ImageMenuItem(Gtk.STOCK_CLEAR)
@@ -1066,7 +1066,7 @@
                     menuitem[1])
             menu.append(item)
-        item = Gtk.SeparatorMenuItem() # separator
+        item = Gtk.SeparatorMenuItem.new() # separator
         menu.append(item)
item = Gtk.ImageMenuItem(_('Color'))
@@ -1081,7 +1081,7 @@
         item.connect('activate', self.on_font_menuitem_activale)
         menu.append(item)
-        item = Gtk.SeparatorMenuItem() # separator
+        item = Gtk.SeparatorMenuItem.new() # separator
         menu.append(item)
item = Gtk.ImageMenuItem(_('Clear formating'))
diff -r 61963a47b20b -r ab854000f4fd src/conversation_textview.py
--- a/src/conversation_textview.py	Tue Jan 01 18:34:30 2013 +0400
+++ b/src/conversation_textview.py	Tue Jan 01 19:46:04 2013 +0400
@@ -728,7 +728,7 @@
         """
         separator_menuitem_was_added = False
         if not self.used_in_history_window:
-            item = Gtk.SeparatorMenuItem()
+            item = Gtk.SeparatorMenuItem.new()
             menu.prepend(item)
             separator_menuitem_was_added = True
@@ -739,7 +739,7 @@
if self.selected_phrase:
             if not separator_menuitem_was_added:
-                item = Gtk.SeparatorMenuItem()
+                item = Gtk.SeparatorMenuItem.new()
                 menu.prepend(item)
if not self.used_in_history_window:
diff -r 61963a47b20b -r ab854000f4fd src/groupchat_control.py
--- a/src/groupchat_control.py	Tue Jan 01 18:34:30 2013 +0400
+++ b/src/groupchat_control.py	Tue Jan 01 19:46:04 2013 +0400
@@ -563,7 +563,7 @@
         and the ability to insert a nick
         """
         ChatControlBase.on_msg_textview_populate_popup(self, textview, menu)
-        item = Gtk.SeparatorMenuItem()
+        item = Gtk.SeparatorMenuItem.new()
         menu.prepend(item)
item = Gtk.MenuItem(_('Insert Nickname'))
diff -r 61963a47b20b -r ab854000f4fd src/gui_menu_builder.py
--- a/src/gui_menu_builder.py	Tue Jan 01 18:34:30 2013 +0400
+++ b/src/gui_menu_builder.py	Tue Jan 01 19:46:04 2013 +0400
@@ -136,7 +136,7 @@
         contacts_transport == gajim.get_transport_name_from_jid(room_jid):
             rooms.append((room_jid, acct))
     if len(rooms):
-        item = Gtk.SeparatorMenuItem() # separator
+        item = Gtk.SeparatorMenuItem.new() # separator
         invite_to_submenu.append(item)
         for (room_jid, account) in rooms:
             menuitem = Gtk.MenuItem(room_jid.split('@')[0])
diff -r 61963a47b20b -r ab854000f4fd src/roster_window.py
--- a/src/roster_window.py	Tue Jan 01 18:34:30 2013 +0400
+++ b/src/roster_window.py	Tue Jan 01 19:46:04 2013 +0400
@@ -5470,7 +5470,7 @@
                             item.set_sensitive(False)
# Manage GC bookmarks
-        newitem = Gtk.SeparatorMenuItem() # separator
+        newitem = Gtk.SeparatorMenuItem.new() # separator
         gc_sub_menu.append(newitem)
newitem = Gtk.ImageMenuItem(_('_Manage Bookmarks...'))
@@ -5579,7 +5579,7 @@
             status_menuitem.set_submenu(sub_menu)
for show in ('online', 'chat', 'away', 'xa', 'dnd', 'invisible'):
-                uf_show = helpers.get_uf_show(show, use_mnemonic=True)
+                uf_show = helpers.get_uf_show(show, use_mnemonic=False)
                 item = Gtk.ImageMenuItem(uf_show)
                 icon = state_images[show]
                 item.set_image(icon)
@@ -5591,7 +5591,7 @@
                 else:
                     item.connect('activate', self.change_status, account, show)
-            item = Gtk.SeparatorMenuItem()
+            item = Gtk.SeparatorMenuItem.new()
             sub_menu.append(item)
item = Gtk.ImageMenuItem(_('_Change Status Message'))
@@ -5602,7 +5602,7 @@
             if gajim.connections[account].connected < 2:
                 item.set_sensitive(False)
-            item = Gtk.SeparatorMenuItem()
+            item = Gtk.SeparatorMenuItem.new()
             sub_menu.append(item)
uf_show = helpers.get_uf_show('offline', use_mnemonic=True)
@@ -5633,7 +5633,7 @@
                     self.on_publish_location_toggled)
pep_config = Gtk.ImageMenuItem(_('Configure Services...'))
-                item = Gtk.SeparatorMenuItem()
+                item = Gtk.SeparatorMenuItem.new()
                 pep_submenu.append(item)
                 pep_config.set_sensitive(True)
                 pep_submenu.append(pep_config)
@@ -5699,7 +5699,7 @@
                 sub_menu.append(item)
                 item.connect('activate', self.change_status, account, show)
-            item = Gtk.SeparatorMenuItem()
+            item = Gtk.SeparatorMenuItem.new()
             sub_menu.append(item)
item = Gtk.ImageMenuItem(_('_Change Status Message'))
@@ -5853,7 +5853,7 @@
                 send_group_message_item.set_sensitive(False)
if not group in helpers.special_groups:
-            item = Gtk.SeparatorMenuItem() # separator
+            item = Gtk.SeparatorMenuItem.new() # separator
             menu.append(item)
# Rename
@@ -5979,7 +5979,7 @@
         gui_menu_builder.build_invite_submenu(invite_item, list_)
         menu.append(invite_item)
-        item = Gtk.SeparatorMenuItem() # separator
+        item = Gtk.SeparatorMenuItem.new() # separator
         menu.append(item)
# Manage Transport submenu
@@ -5998,7 +5998,7 @@
         manage_contacts_submenu.append(edit_groups_item)
         edit_groups_item.connect('activate', self.on_edit_groups, list_)
-        item = Gtk.SeparatorMenuItem() # separator
+        item = Gtk.SeparatorMenuItem.new() # separator
         manage_contacts_submenu.append(item)
# Block
@@ -6090,7 +6090,7 @@
                 status_menuitems.append(status_menuitem)
         menu.append(send_custom_status_menuitem)
-        item = Gtk.SeparatorMenuItem() # separator
+        item = Gtk.SeparatorMenuItem.new() # separator
         menu.append(item)
# Execute Command
@@ -6131,7 +6131,7 @@
         if gajim.account_is_disconnected(account):
             item.set_sensitive(False)
-        item = Gtk.SeparatorMenuItem() # separator
+        item = Gtk.SeparatorMenuItem.new() # separator
         manage_transport_submenu.append(item)
# Block
@@ -6157,7 +6157,7 @@
         if gajim.account_is_disconnected(account):
             item.set_sensitive(False)
-        item = Gtk.SeparatorMenuItem() # separator
+        item = Gtk.SeparatorMenuItem.new() # separator
         menu.append(item)
# Information
@@ -6207,7 +6207,7 @@
             account)
         menu.append(disconnect_menuitem)
-        item = Gtk.SeparatorMenuItem() # separator
+        item = Gtk.SeparatorMenuItem.new() # separator
         menu.append(item)
history_menuitem = Gtk.ImageMenuItem(_('_History'))
@@ -6284,7 +6284,7 @@
         """
         Add a seperator and History Manager menuitem BELOW for account menuitems
         """
-        item = Gtk.SeparatorMenuItem() # separator
+        item = Gtk.SeparatorMenuItem.new() # separator
         menu.append(item)
# History manager
@@ -6308,7 +6308,7 @@
# User has at least one bookmark.
         if gajim.connections[account].bookmarks:
-            item = Gtk.SeparatorMenuItem()
+            item = Gtk.SeparatorMenuItem.new()
             gc_sub_menu.append(item)
for bookmark in gajim.connections[account].bookmarks:
diff -r 61963a47b20b -r ab854000f4fd src/statusicon.py
--- a/src/statusicon.py	Tue Jan 01 18:34:30 2013 +0400
+++ b/src/statusicon.py	Tue Jan 01 19:46:04 2013 +0400
@@ -235,7 +235,7 @@
             sub_menu.append(item)
             item.connect('activate', self.on_show_menuitem_activate, show)
-        item = Gtk.SeparatorMenuItem()
+        item = Gtk.SeparatorMenuItem.new()
         sub_menu.append(item)
item = Gtk.ImageMenuItem(_('_Change Status Message...'))
@@ -249,7 +249,7 @@
connected_accounts_with_private_storage = 0
-        item = Gtk.SeparatorMenuItem()
+        item = Gtk.SeparatorMenuItem.new()
         sub_menu.append(item)
uf_show = helpers.get_uf_show('offline', use_mnemonic = True)
@@ -336,7 +336,7 @@
                 gc_item.set_submenu(gc_menuitem_menu)
                 gc_sub_menu.show_all()
-        newitem = Gtk.SeparatorMenuItem() # separator
+        newitem = Gtk.SeparatorMenuItem.new() # separator
         gc_sub_menu.append(newitem)
         newitem = Gtk.ImageMenuItem(_('_Manage Bookmarks...'))
         img = Gtk.Image.new_from_stock(Gtk.STOCK_PREFERENCES, Gtk.IconSize.MENU)
@@ -363,7 +363,7 @@
if os.name == 'nt':
             if self.added_hide_menuitem is False:
-                self.systray_context_menu.prepend(Gtk.SeparatorMenuItem())
+                self.systray_context_menu.prepend(Gtk.SeparatorMenuItem.new())
                 item = Gtk.MenuItem(_('Hide this menu'))
                 self.systray_context_menu.prepend(item)
                 self.added_hide_menuitem = True

    