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

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
1=== modified file 'entertainerlib/utils/content_management_dialog.py'
2--- entertainerlib/utils/content_management_dialog.py 2009-02-10 00:11:06 +0000
3+++ entertainerlib/utils/content_management_dialog.py 2009-02-26 22:58:43 +0000
4@@ -130,7 +130,7 @@
5 try:
6 proxy = MessageBusProxy(client_name = "Content Management GUI")
7 proxy.connectToMessageBus()
8- proxy.sendMessage(Message(MessageType.CONTENT_CFG_UPDATED))
9+ proxy.sendMessage(Message(MessageType.CONTENT_CONF_UPDATED))
10 proxy.disconnectFromMessageBus()
11 except socket.error:
12 error = gtk.MessageDialog(
13@@ -156,7 +156,7 @@
14 try:
15 proxy = MessageBusProxy(client_name = "Content Management GUI")
16 proxy.connectToMessageBus()
17- proxy.sendMessage(Message(MessageType.CONTENT_CFG_UPDATED))
18+ proxy.sendMessage(Message(MessageType.CONTENT_CONF_UPDATED))
19 proxy.disconnectFromMessageBus()
20 except socket.error:
21 error = gtk.MessageDialog(
22
23=== modified file 'entertainerlib/utils/preferences_dialog.py'
24--- entertainerlib/utils/preferences_dialog.py 2009-02-10 00:25:53 +0000
25+++ entertainerlib/utils/preferences_dialog.py 2009-02-26 22:58:43 +0000
26@@ -209,7 +209,7 @@
27 try:
28 proxy = MessageBusProxy(client_name = "Preferences GUI")
29 proxy.connectToMessageBus()
30- proxy.sendMessage(Message(MessageType.PREFERENCES_CFG_UPDATED))
31+ proxy.sendMessage(Message(MessageType.PREFERENCES_CONF_UPDATED))
32 proxy.disconnectFromMessageBus()
33 except socket.error:
34 error = gtk.MessageDialog(
35
36=== modified file 'tools/messagebus-notifier'
37--- tools/messagebus-notifier 2009-01-05 05:20:40 +0000
38+++ tools/messagebus-notifier 2009-02-26 22:58:43 +0000
39@@ -35,8 +35,8 @@
40 'MESSAGE_TYPE' should be replaced one of the followings:
41 - UPDATE_FEEDS
42 - FEED_DB_UPDATED
43- - CONTENT_CFG_UPDATED
44- - PREFERENCES_CFG_UPDATED
45+ - CONTENT_CONF_UPDATED
46+ - PREFERENCES_CONF_UPDATED
47 - REBUILD_IMAGE_CACHE
48 - REBUILD_MUSIC_CACHE
49 - REBUILD_VIDEO_CACHE

Subscribers

People subscribed via source and target branches