Merge lp:~gabor-karsay/awn-extras/build-fixes into lp:awn-extras

[Gabor Karsay]

1. This branch adds the generated *.c files from Digital Clock, which is a Vala applet, to .bzrignore just like the other Vala applets do.

2. It fixes a small compiler warning in Places: expected ‘struct GtkMenu *’ but argument is of type ‘struct GtkWidget *’

3. Fixes a compiler warning in Awn Terminal: The gettext macro _ has to be changed to Gettext._
After that, <glib/gi18n-lib.h> is not included in the .c-file but <glib/gi18n.h> still is. There were warnings, that one redefined the functions of the other.

[Michal Hruby (mhr3)]

Sorry, missed this review... But it looks good, thanks Gabor!

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2010-02-22 05:31:00 +0000
+++ .bzrignore	2010-08-13 22:02:40 +0000
@@ -36,6 +36,7 @@
 py-compile
 stamp-h1
 applets/maintained/awnterm/awn-terminal.c
+applets/maintained/digital-clock/*.c
 applets/maintained/garbage/*.c
 applets/maintained/notification-area/na-prefs.c
 applets/maintained/notification-area/notification-area.c

=== modified file 'applets/maintained/awnterm/awn-terminal.vala'
--- applets/maintained/awnterm/awn-terminal.vala	2010-03-25 11:01:44 +0000
+++ applets/maintained/awnterm/awn-terminal.vala	2010-08-13 22:02:40 +0000
@@ -97,7 +97,7 @@
         {
           this.model.set (iter, 1,
             this._keybinding != null && this._keybinding.size () > 0 ?
-              this._keybinding : _ ("Disabled"));
+              this._keybinding : Gettext._ ("Disabled"));
         }
       }
     }
@@ -407,7 +407,7 @@
     }
 
     this.prefs_window = new Gtk.Window (Gtk.WindowType.TOPLEVEL);
-    this.prefs_window.set_title (_ ("Preferences"));
+    this.prefs_window.set_title (Gettext._ ("Preferences"));
     this.prefs_window.set_default_icon_name ("terminal");
     this.prefs_window.set_border_width (6);
 
@@ -422,7 +422,7 @@
     this.prefs_window.add (box);
 
     Gtk.Widget widget = new Gtk.Label ("");
-    (widget as Gtk.Label).set_markup ("<b>%s</b>".printf (_ ("Behavior")));
+    (widget as Gtk.Label).set_markup ("<b>%s</b>".printf (Gettext._ ("Behavior")));
     (widget as Gtk.Label).set_alignment (0.0f, 0.5f);
     box.pack_start (widget, false, false, 0);
 
@@ -434,7 +434,7 @@
     align.add (box2);
 
     // focus out behavior checkbox
-    widget = new Gtk.CheckButton.with_label (_ ("Hide when focus is lost"));
+    widget = new Gtk.CheckButton.with_label (Gettext._ ("Hide when focus is lost"));
     (widget as CheckButton).set_active (this.hide_on_unfocus);
     (widget as CheckButton).toggled.connect ((w) =>
     {
@@ -453,7 +453,7 @@
     treeview.set_model (this.model);
 
     ren = new CellRendererText ();
-    col = new TreeViewColumn.with_attributes (_ ("Action"), ren, "text", 0);
+    col = new TreeViewColumn.with_attributes (Gettext._ ("Action"), ren, "text", 0);
     treeview.append_column (col);
 
     ren = new CellRendererAccel ();
@@ -473,13 +473,13 @@
     {
       this.keybinding = "";
     });
-    col = new TreeViewColumn.with_attributes (_ ("Shortcut"), ren, "text",1);
+    col = new TreeViewColumn.with_attributes (Gettext._ ("Shortcut"), ren, "text",1);
     treeview.append_column (col);
 
     // add the actual item
     Gtk.TreeIter iter;
     this.model.append (out iter);
-    this.model.set (iter, 0, _ ("Activate"));
+    this.model.set (iter, 0, Gettext._ ("Activate"));
     // this will set the keybinding in the model
     this.keybinding = this._keybinding;
 
@@ -488,7 +488,7 @@
     box.pack_start (section_box, false, false, 0);
 
     widget = new Gtk.Label ("");
-    (widget as Gtk.Label).set_markup ("<b>%s</b>".printf (_ ("Background image")));
+    (widget as Gtk.Label).set_markup ("<b>%s</b>".printf (Gettext._ ("Background image")));
     (widget as Gtk.Label).set_alignment (0.0f, 0.5f);
     section_box.pack_start (widget, false, false, 0);
 
@@ -500,7 +500,7 @@
     align.add (box2);
 
     this.preview_image = new Gtk.Image ();
-    this.chooser = new Gtk.FileChooserButton (_ ("Select a file"),
+    this.chooser = new Gtk.FileChooserButton (Gettext._ ("Select a file"),
                                         Gtk.FileChooserAction.OPEN);
     this.chooser.set_filename (this.background_image);
     this.chooser.set_preview_widget (this.preview_image);
@@ -542,7 +542,7 @@
     box.pack_start (section_box, false, false, 0);
 
     widget = new Gtk.Label ("");
-    (widget as Gtk.Label).set_markup ("<b>%s</b>".printf (_ ("Terminal opacity")));
+    (widget as Gtk.Label).set_markup ("<b>%s</b>".printf (Gettext._ ("Terminal opacity")));
     (widget as Gtk.Label).set_alignment (0.0f, 0.5f);
     section_box.pack_start (widget, false, false, 3);
 
@@ -569,7 +569,7 @@
     box.pack_start (section_box, false, false, 0);
 
     widget = new Gtk.Label ("");
-    (widget as Gtk.Label).set_markup ("<b>%s</b>".printf (_ ("External Terminal")));
+    (widget as Gtk.Label).set_markup ("<b>%s</b>".printf (Gettext._ ("External Terminal")));
     (widget as Gtk.Label).set_alignment (0.0f, 0.5f);
     section_box.pack_start (widget, false, false, 3);
 

=== modified file 'applets/maintained/places/applet.c'
--- applets/maintained/places/applet.c	2010-04-09 23:18:24 +0000
+++ applets/maintained/places/applet.c	2010-08-13 22:02:40 +0000
@@ -1204,7 +1204,7 @@
                                                   AWN_APPLET_LICENSE_GPLV2,
                                                   VERSION);
       gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-      awn_utils_show_menu_images (menu);
+      awn_utils_show_menu_images (GTK_MENU(menu));
     }
     
     gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event_button->button, event_button->time);