Merge lp:~codygarver/pantheon-terminal/about-dialog-fixes into lp:~kekun-plazas/pantheon-terminal/trunk

[Cody Garver]

Add icon to About. Fix license typos. Set window icon.

=== modified file 'src/Resources.vala'
--- src/Resources.vala	2011-06-20 11:05:25 +0000
+++ src/Resources.vala	2011-08-14 03:13:25 +0000
@@ -17,22 +17,21 @@
 		null
 		};
 	
-	public const string ICON_ABOUT_LOGO = "";
+	public const string ICON_ABOUT_LOGO = "terminal";
 	
 	public const string LICENSE = """
-Strip is free software; you can redistribute it and/or modify it under the 
+Pantheon Terminal is free software; you can redistribute it and/or modify it under the 
 terms of the GNU Lesser General Public License as published by the Free 
 Software Foundation; either version 3 of the License, or (at your option) 
 any later version.
 
-Marlin is distributed in the hope that it will be useful, but WITHOUT 
+Pantheon Terminal is distributed in the hope that it will be useful, but WITHOUT 
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for 
 more details.
 
 You should have received a copy of the GNU Lesser General Public License 
-along with Marlin; if not, write to the Free Software Foundation, Inc., 
+along with Pantheon Terminal; if not, write to the Free Software Foundation, Inc., 
 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 """;
-
 }

=== modified file 'src/main.vala'
--- src/main.vala	2011-08-01 09:41:16 +0000
+++ src/main.vala	2011-08-14 03:13:25 +0000
@@ -59,9 +59,9 @@
         
     //~     Notify.Notification notification;
 		
-		// Control and Shift keys
-		bool ctrlL = false;
-		bool ctrlR = false;
+	// Control and Shift keys
+	bool ctrlL = false;
+	bool ctrlR = false;
         bool shiftL = false;
         bool shiftR = false;
         bool arrow = false;
@@ -74,9 +74,10 @@
 				stdout.printf("%s\n", arg);
             
 //~             Gtk.Settings.get_default().gtk_application_prefer_dark_theme = true;
-            set_title("Terminal");
+            title = "Terminal";
             default_width = 640;
             default_height = 400;
+	    icon_name = "terminal";
             destroy.connect(close);
             
             // Check if the window have the focus
@@ -100,11 +101,6 @@
             add_button.set_tooltip_text("Open a new tab");
             add_button.clicked.connect(() => { new_tab(false); } );
             right_box.pack_start(add_button, false, false, 0);
-                    
-            // Try to set the icon FIXME
-            Pixbuf icon = new Pixbuf(Colorspace.RGB, true, 8, 1, 1);
-            try { IconTheme.get_default().load_icon("terminal", 16, IconLookupFlags.FORCE_SVG); } catch (Error er) {}
-            set_icon(icon);
             
             // Set the theme
             set_theme();
@@ -303,6 +299,13 @@
         
         public void about()
         {
+	    Gdk.Pixbuf logo = null;
+	    try {
+	        logo = IconTheme.get_default ().load_icon ("terminal", 64, 0);
+		} catch (Error err) {
+	            stderr.printf ("Unable to load terminal icon: %s", err.message);
+		}
+
             show_about_dialog(this,
                 "program-name", Resources.APP_TITLE,
                 "version", Resources.VERSION,
@@ -313,7 +316,7 @@
                 "website-label",  Resources.WEBSITE_LABEL,
                 "authors", Resources.AUTHORS,
                 "artists", Resources.ARTISTS,
-//~     				"logo", new Pixbuf.from_file(Resources.ICON_ABOUT_LOGO),
+        	"logo", logo,
 //~      				"translator-credits", _("translator-credits"), // FIXME
                 null);
         }