Update of /cvsroot/player/app/gtk
In directory cvs:/tmp/cvs-serv27726

Modified Files:
      Tag: hxclient_1_4_4_neptunex
	about.cpp about_interface.c README.realplay.in 
Log Message:
bugid=4831
patch by jerry.tan at sun.com
reviewed by Eric hyche
update patent info, migrate the patch from bingo_10_0_3


Index: about_interface.c
===================================================================
RCS file: /cvsroot/player/app/gtk/about_interface.c,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.4.6.1
diff -u -d -r1.10.2.4 -r1.10.2.4.6.1
--- about_interface.c	18 Oct 2004 18:53:31 -0000	1.10.2.4
+++ about_interface.c	2 Mar 2006 23:51:27 -0000	1.10.2.4.6.1
@@ -40,6 +40,7 @@
   GtkWidget *had_copyright;
   GtkWidget *vbox2;
   GtkWidget *had_misc_build_info;
+  GtkWidget *had_patent_info;
   GtkWidget *label1;
   GtkWidget *scrolledwindow1;
   GtkWidget *had_copyrights;
@@ -89,7 +90,7 @@
   gtk_widget_show (had_url);
   gtk_box_pack_start (GTK_BOX (vbox1), had_url, FALSE, FALSE, 2);
 
-  had_copyright = gtk_label_new (_("<span size=\"small\"> Copyright \302\251 2004 RealNetworks</span>"));
+  had_copyright = gtk_label_new (_("<span size=\"small\"> Copyright \302\251 2006 RealNetworks</span>"));
   gtk_widget_set_name (had_copyright, "had_copyright");
   gtk_widget_show (had_copyright);
   gtk_box_pack_start (GTK_BOX (vbox1), had_copyright, FALSE, FALSE, 0);
@@ -106,6 +107,12 @@
   gtk_box_pack_start (GTK_BOX (vbox2), had_misc_build_info, FALSE, FALSE, 0);
   gtk_label_set_use_markup (GTK_LABEL (had_misc_build_info), TRUE);
 
+  had_patent_info = gtk_label_new (_("<span size=\"small\"> </span>"));
+  gtk_widget_set_name (had_patent_info, "had_patent_info");
+  gtk_widget_show (had_patent_info);
+  gtk_box_pack_start (GTK_BOX (vbox2), had_patent_info, FALSE, FALSE, 0);
+  gtk_label_set_use_markup (GTK_LABEL (had_patent_info), TRUE);
+
   label1 = gtk_label_new (_("<b>Copyrights:</b>"));
   gtk_widget_set_name (label1, "label1");
   gtk_widget_show (label1);
@@ -150,6 +157,7 @@
   GLADE_HOOKUP_OBJECT (hxplayer_about_dialog, had_copyright, "had_copyright");
   GLADE_HOOKUP_OBJECT (hxplayer_about_dialog, vbox2, "vbox2");
   GLADE_HOOKUP_OBJECT (hxplayer_about_dialog, had_misc_build_info, "had_misc_build_info");
+  GLADE_HOOKUP_OBJECT (hxplayer_about_dialog, had_patent_info, "had_patent_info");
   GLADE_HOOKUP_OBJECT (hxplayer_about_dialog, label1, "label1");
   GLADE_HOOKUP_OBJECT (hxplayer_about_dialog, scrolledwindow1, "scrolledwindow1");
   GLADE_HOOKUP_OBJECT (hxplayer_about_dialog, had_copyrights, "had_copyrights");

Index: README.realplay.in
===================================================================
RCS file: /cvsroot/player/app/gtk/README.realplay.in,v
retrieving revision 1.1.2.8.4.2
retrieving revision 1.1.2.8.4.3
diff -u -d -r1.1.2.8.4.2 -r1.1.2.8.4.3
--- README.realplay.in	21 Feb 2006 02:16:39 -0000	1.1.2.8.4.2
+++ README.realplay.in	2 Mar 2006 23:51:27 -0000	1.1.2.8.4.3
@@ -3,7 +3,7 @@
 
                 Release Notes
 
-               February 2006
+               March 2006
 
   System Requirements
 
@@ -133,7 +133,6 @@
        zh_CN/zh_TW/ja locale.
        To solve this problem, use UTF-8 locale
        instead in gnome-terminal.  
-     * Licence is only available in English currently.   
      * Realplayer for Solaris has been given the L10N waiver 
        for Swedish.      
 

Index: about.cpp
===================================================================
RCS file: /cvsroot/player/app/gtk/about.cpp,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.9.6.1
diff -u -d -r1.1.2.9 -r1.1.2.9.6.1
--- about.cpp	18 Oct 2004 18:53:31 -0000	1.1.2.9
+++ about.cpp	2 Mar 2006 23:51:27 -0000	1.1.2.9.6.1
@@ -170,12 +170,14 @@
     GtkWidget* dialog;
     GtkWidget* version;
     GtkWidget* misc_build_info;
+    GtkWidget* patent_info;
     GtkWidget* url_label;
     GtkWidget* copyrights_text_view;
     GtkWidget* distcode_origcode_label;
     gchar* filename;
     gchar* version_markup;
     gchar* misc_build_info_markup;
+    gchar* patent_info_markup;
     gchar* dialog_title;
     gchar* origcode_distcode;
     HXAboutDialog* about;
@@ -191,13 +193,14 @@
 
     version = glade_xml_get_widget(about->xml, "had_version");
     misc_build_info = glade_xml_get_widget(about->xml, "had_misc_build_info");
+    patent_info = glade_xml_get_widget(about->xml, "had_patent_info");
     url_label = glade_xml_get_widget(about->xml, "had_url");
 
     distcode_origcode_label = glade_xml_get_widget(about->xml, "had_distcode_origcode");
 
     copyrights_text_view = glade_xml_get_widget (about->xml, "had_copyrights");
 
-    g_return_val_if_fail(dialog && version && misc_build_info &&
+    g_return_val_if_fail(dialog && version && misc_build_info && patent_info &&
                          url_label && copyrights_text_view &&
                          distcode_origcode_label, NULL);
 
@@ -240,6 +243,23 @@
     gtk_label_set_markup(GTK_LABEL(misc_build_info), misc_build_info_markup);        
     g_free(misc_build_info_markup);
 
+#ifdef HELIX_FEATURE_REAL_BRANDING
+    patent_info_markup = g_strdup_printf(_(
+        "<span size=\"small\">Protected by one or more of the following patents:\n"
+        "5,734,961; 5,793,980; 5,917,835; 6,151,634; 6,314,466; 6,487,663;\n"
+        "6,597,961; 6,633,918; 6,724,433; 6,731,600; 6,731,818; 6,735,338;\n"
+        "6,753,865; 6,760,378; 6,760,721; 6,934,837; 6,765,964; 6,937,814;\n"
+        "6,968,387; 6,985,932; 6,996,627; Other Patents Pending.</span>"
+        ));
+#else
+    patent_info_markup = g_strdup_printf(_(
+        "<span size=\"small\">Protected by one or more of the following patents:\n"
+        "5,793,980; 5,917,835; 6,151,634; 6,731,600; 6,731,818; 6,735,338;\n"
+        "6,760,721; 6,937,814; 6,985,932; Other Patents Pending.</span>"
+        ));
+#endif
+    gtk_label_set_markup(GTK_LABEL(patent_info), patent_info_markup);
+    g_free(patent_info_markup);
     populate_copyrights_text_view(copyrights_text_view, player);
     
     g_signal_connect (G_OBJECT (dialog), "destroy",