use only g[PREFIX] to display

diff --git a/docs/conf.py b/docs/conf.py
index 628c223025e6161bab126b9e887bca189ad01754..03182df62ff0a06cd339ff206c354dfb5e820719 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@ copyright = u'2014, Vu Nhat Minh'
 # built documents.
 #
 # The short X.Y version.
 # built documents.
 #
 # The short X.Y version.

-version = '1.1.9'
+version = '1.2.0'

 # The full version, including alpha/beta/rc tags.
 # The full version, including alpha/beta/rc tags.

-release = '1.1.9'
+release = '1.2.0'

 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index f06b510aa708d39896a8fa0ef1f07ba9b7b15514..236c1b831e1c8b46688d81e3d9f3955c12ce1394 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -204,8 +204,7 @@ def init(args):
     name = credential['name']
     if not get_config('PREFIX'):
         set_config('PREFIX', screen_name)
     name = credential['name']
     if not get_config('PREFIX'):
         set_config('PREFIX', screen_name)

-    c['PREFIX'] = emojize(c['PREFIX'])
-    g['PREFIX'] = u2str(c['PREFIX'])
+    g['PREFIX'] = u2str(emojize(c['PREFIX']))

     c['original_name'] = g['original_name'] = screen_name[1:]
     g['full_name'] = name
     g['decorated_name'] = lambda x: color_func(
     c['original_name'] = g['original_name'] = screen_name[1:]
     g['full_name'] = name
     g['decorated_name'] = lambda x: color_func(


@@ -1964,7 +1963,7 @@ def reconn_notice():
         light_green("h stream") + \
         light_magenta(" for more details.")
     printNicely(guide)
         light_green("h stream") + \
         light_magenta(" for more details.")
     printNicely(guide)

-    sys.stdout.write(g['decorated_name'](c['PREFIX']))
+    sys.stdout.write(g['decorated_name'](g['PREFIX']))

     sys.stdout.flush()
 
 
     sys.stdout.flush()
 
 


@@ -2053,10 +2052,10 @@ def stream(domain, args, name='Rainbow Stream'):
                 # the 1st character of that word
                 if current_buffer and g['cmd'] != current_buffer:
                     sys.stdout.write(
                 # the 1st character of that word
                 if current_buffer and g['cmd'] != current_buffer:
                     sys.stdout.write(

-                        g['decorated_name'](c['PREFIX']) + str2u(current_buffer))
+                        g['decorated_name'](g['PREFIX']) + current_buffer)

                     sys.stdout.flush()
                 elif not c['HIDE_PROMPT']:
                     sys.stdout.flush()
                 elif not c['HIDE_PROMPT']:

-                    sys.stdout.write(g['decorated_name'](c['PREFIX']))
+                    sys.stdout.write(g['decorated_name'](g['PREFIX']))

                     sys.stdout.flush()
             elif tweet.get('direct_message'):
                 # Check the semaphore pause and lock (stream process only)
                     sys.stdout.flush()
             elif tweet.get('direct_message'):
                 # Check the semaphore pause and lock (stream process only)


@@ -2073,7 +2072,7 @@ def stream(domain, args, name='Rainbow Stream'):
         printNicely(
             magenta("We have connection problem with twitter'stream API right now :("))
         detail_twitter_error(e)
         printNicely(
             magenta("We have connection problem with twitter'stream API right now :("))
         detail_twitter_error(e)

-        sys.stdout.write(g['decorated_name'](c['PREFIX']))
+        sys.stdout.write(g['decorated_name'](g['PREFIX']))

         sys.stdout.flush()
 
 
         sys.stdout.flush()
 
 

diff --git a/setup.py b/setup.py
index 0e347393c31431eb7e8dcf9bee1e98a2333af405..ed0362c7151abe5c2192578cd21359fb83da58bb 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ import os
 import os.path
 
 # Bumped version
 import os.path
 
 # Bumped version

-version = '1.1.9'
+version = '1.2.0'

 
 # Require
 install_requires = [
 
 # Require
 install_requires = [