Entertainer Media Center

Merge lp:~mblayman/entertainer/cfg_to_conf into lp:entertainer

  1. cfg_to_conf
  2. Merge into trunk
Proposed by Matt Layman
Status: Merged
Approved by: Paul Hummer
Approved revision: 350
Merged at revision: not available
Proposed branch: lp:~mblayman/entertainer/cfg_to_conf
Merge into: lp:entertainer
Diff against target: None lines
To merge this branch: bzr merge lp:~mblayman/entertainer/cfg_to_conf
Reviewer Review Type Date Requested Status
Samuel Buffet (community) Approve
Review via email: mp+3995@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Matt Layman (mblayman) wrote :

This branch fixes bug 335184. Some of the MessageTypes were wrong and it was affecting the preferences and content management dialog windows. The wrongness was associated with using CFG instead of CONF. It was a trivial fix, but greatly affects the usability of Entertainer (read: low hanging fruit).

Revision history for this message
Samuel Buffet (samuel-buffet) wrote :

Matt,

make test : ok
make lint : ok
functional tests : ok

Good work : Approved

the diff:

=== modified file 'entertainerlib/utils/content_management_dialog.py'
--- entertainerlib/utils/content_management_dialog.py 2009-02-10 00:11:06 +0000
+++ entertainerlib/utils/content_management_dialog.py 2009-02-28 18:00:06 +0000
@@ -130,7 +130,7 @@
         try:
             proxy = MessageBusProxy(client_name = "Content Management GUI")
             proxy.connectToMessageBus()
- proxy.sendMessage(Message(MessageType.CONTENT_CFG_UPDATED))
+ proxy.sendMessage(Message(MessageType.CONTENT_CONF_UPDATED))
             proxy.disconnectFromMessageBus()
         except socket.error:
             error = gtk.MessageDialog(
@@ -156,7 +156,7 @@
         try:
             proxy = MessageBusProxy(client_name = "Content Management GUI")
             proxy.connectToMessageBus()
- proxy.sendMessage(Message(MessageType.CONTENT_CFG_UPDATED))
+ proxy.sendMessage(Message(MessageType.CONTENT_CONF_UPDATED))
             proxy.disconnectFromMessageBus()
         except socket.error:
             error = gtk.MessageDialog(

=== modified file 'entertainerlib/utils/preferences_dialog.py'
--- entertainerlib/utils/preferences_dialog.py 2009-02-10 00:25:53 +0000
+++ entertainerlib/utils/preferences_dialog.py 2009-02-28 18:00:06 +0000
@@ -209,7 +209,7 @@
         try:
             proxy = MessageBusProxy(client_name = "Preferences GUI")
             proxy.connectToMessageBus()
- proxy.sendMessage(Message(MessageType.PREFERENCES_CFG_UPDATED))
+ proxy.sendMessage(Message(MessageType.PREFERENCES_CONF_UPDATED))
             proxy.disconnectFromMessageBus()
         except socket.error:
             error = gtk.MessageDialog(

=== modified file 'tools/messagebus-notifier'
--- tools/messagebus-notifier 2009-01-05 05:20:40 +0000
+++ tools/messagebus-notifier 2009-02-28 18:00:06 +0000
@@ -35,8 +35,8 @@
 'MESSAGE_TYPE' should be replaced one of the followings:
     - UPDATE_FEEDS
     - FEED_DB_UPDATED
- - CONTENT_CFG_UPDATED
- - PREFERENCES_CFG_UPDATED
+ - CONTENT_CONF_UPDATED
+ - PREFERENCES_CONF_UPDATED
     - REBUILD_IMAGE_CACHE
     - REBUILD_MUSIC_CACHE
     - REBUILD_VIDEO_CACHE

review: Approve
Revision history for this message
Matt Layman (mblayman) wrote :

Commit Message: Message events that were marked with CFG instead of CONF have been fixed. (Matt Layman)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'entertainerlib/utils/content_management_dialog.py'
--- entertainerlib/utils/content_management_dialog.py 2009-02-10 00:11:06 +0000
+++ entertainerlib/utils/content_management_dialog.py 2009-02-26 22:58:43 +0000
@@ -130,7 +130,7 @@
130 try:130 try:
131 proxy = MessageBusProxy(client_name = "Content Management GUI")131 proxy = MessageBusProxy(client_name = "Content Management GUI")
132 proxy.connectToMessageBus()132 proxy.connectToMessageBus()
133 proxy.sendMessage(Message(MessageType.CONTENT_CFG_UPDATED))133 proxy.sendMessage(Message(MessageType.CONTENT_CONF_UPDATED))
134 proxy.disconnectFromMessageBus()134 proxy.disconnectFromMessageBus()
135 except socket.error:135 except socket.error:
136 error = gtk.MessageDialog(136 error = gtk.MessageDialog(
@@ -156,7 +156,7 @@
156 try:156 try:
157 proxy = MessageBusProxy(client_name = "Content Management GUI")157 proxy = MessageBusProxy(client_name = "Content Management GUI")
158 proxy.connectToMessageBus()158 proxy.connectToMessageBus()
159 proxy.sendMessage(Message(MessageType.CONTENT_CFG_UPDATED))159 proxy.sendMessage(Message(MessageType.CONTENT_CONF_UPDATED))
160 proxy.disconnectFromMessageBus()160 proxy.disconnectFromMessageBus()
161 except socket.error:161 except socket.error:
162 error = gtk.MessageDialog(162 error = gtk.MessageDialog(
163163
=== modified file 'entertainerlib/utils/preferences_dialog.py'
--- entertainerlib/utils/preferences_dialog.py 2009-02-10 00:25:53 +0000
+++ entertainerlib/utils/preferences_dialog.py 2009-02-26 22:58:43 +0000
@@ -209,7 +209,7 @@
209 try:209 try:
210 proxy = MessageBusProxy(client_name = "Preferences GUI")210 proxy = MessageBusProxy(client_name = "Preferences GUI")
211 proxy.connectToMessageBus()211 proxy.connectToMessageBus()
212 proxy.sendMessage(Message(MessageType.PREFERENCES_CFG_UPDATED))212 proxy.sendMessage(Message(MessageType.PREFERENCES_CONF_UPDATED))
213 proxy.disconnectFromMessageBus()213 proxy.disconnectFromMessageBus()
214 except socket.error:214 except socket.error:
215 error = gtk.MessageDialog(215 error = gtk.MessageDialog(
216216
=== modified file 'tools/messagebus-notifier'
--- tools/messagebus-notifier 2009-01-05 05:20:40 +0000
+++ tools/messagebus-notifier 2009-02-26 22:58:43 +0000
@@ -35,8 +35,8 @@
35'MESSAGE_TYPE' should be replaced one of the followings:35'MESSAGE_TYPE' should be replaced one of the followings:
36 - UPDATE_FEEDS36 - UPDATE_FEEDS
37 - FEED_DB_UPDATED37 - FEED_DB_UPDATED
38 - CONTENT_CFG_UPDATED38 - CONTENT_CONF_UPDATED
39 - PREFERENCES_CFG_UPDATED39 - PREFERENCES_CONF_UPDATED
40 - REBUILD_IMAGE_CACHE40 - REBUILD_IMAGE_CACHE
41 - REBUILD_MUSIC_CACHE41 - REBUILD_MUSIC_CACHE
42 - REBUILD_VIDEO_CACHE42 - REBUILD_VIDEO_CACHE

Subscribers

People subscribed via source and target branches