[gitg] Specify --gresource to vala compiler
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg] Specify --gresource to vala compiler
- Date: Wed, 5 Jun 2013 15:37:50 +0000 (UTC)
commit fbe5dd9e58e85a7088b0b6c090e0e1475ea170a9
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Wed Jun 5 17:37:09 2013 +0200
Specify --gresource to vala compiler
gitg/Makefile.am | 3 ++-
gitg/gitg-window.vala | 15 ++++++++-------
gitg/resources/ui/gitg-window.ui | 9 +++++----
3 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/gitg/Makefile.am b/gitg/Makefile.am
index f127ae5..9be0390 100644
--- a/gitg/Makefile.am
+++ b/gitg/Makefile.am
@@ -33,7 +33,8 @@ AM_VALAFLAGS = \
--vapidir "$(top_builddir)/libgd" \
--vapidir "$(top_builddir)/libgitg" \
--vapidir "$(top_builddir)/libgitg-ext" \
- --vapidir "$(top_builddir)/libgitg-gtk"
+ --vapidir "$(top_builddir)/libgitg-gtk" \
+ --gresources "$(top_srcdir)/gitg/resources/gitg-resources.xml"
VALASOURCES = \
gitg.vala \
diff --git a/gitg/gitg-window.vala b/gitg/gitg-window.vala
index 39cdc69..c4edd6a 100644
--- a/gitg/gitg-window.vala
+++ b/gitg/gitg-window.vala
@@ -109,15 +109,21 @@ public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable
}
[GtkCallback]
- private void search_entry_changed(Gtk.Entry entry)
+ private void search_entry_changed(Gtk.Editable entry)
{
// FIXME: this is a weird way to know the dash is visible
if (d_repository == null)
{
- d_dash_view.filter_text(entry.text);
+ d_dash_view.filter_text((entry as Gtk.Entry).text);
}
}
+ [GtkCallback]
+ private void dash_view_repository_activated(Repository r)
+ {
+ repository = r;
+ }
+
construct
{
add_action_entries(win_entries, this);
@@ -140,11 +146,6 @@ public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable
d_views_model = Resource.load_object<MenuModel>("ui/gitg-menus.ui", menuname + "-views");
d_search_button.bind_property("active", d_search_revealer, "reveal-child");
-
- // FIXME: for some reason if I create a signal in the ui file for this it crashes
- d_dash_view.repository_activated.connect((r) => {
- repository = r;
- });
}
private void on_close_activated()
diff --git a/gitg/resources/ui/gitg-window.ui b/gitg/resources/ui/gitg-window.ui
index 765543e..89d84b5 100644
--- a/gitg/resources/ui/gitg-window.ui
+++ b/gitg/resources/ui/gitg-window.ui
@@ -18,7 +18,7 @@
<property name="visible">False</property>
<property name="valign">center</property>
<property name="can_focus">False</property>
- <signal name="clicked" handler="dash_button_clicked" object="GitgWindow" swapped="no"/>
+ <signal name="clicked" handler="dash_button_clicked" swapped="no"/>
<style>
<class name="image-button"/>
</style>
@@ -40,7 +40,7 @@
<property name="valign">center</property>
<property name="can_focus">False</property>
<property name="action_name">win.search</property>
- <signal name="toggled" handler="search_button_toggled" object="GitgWindow" swapped="no"/>
+ <signal name="toggled" handler="search_button_toggled" swapped="no"/>
<style>
<class name="image-button"/>
</style>
@@ -100,7 +100,7 @@
<property name="visible">True</property>
<property name="valign">center</property>
<property name="relief">none</property>
- <signal name="clicked" handler="close_button_clicked" object="GitgWindow" swapped="no"/>
+ <signal name="clicked" handler="close_button_clicked" swapped="no"/>
<style>
<class name="image-button"/>
</style>
@@ -151,7 +151,7 @@
<property name="invisible_char">●</property>
<property name="invisible_char_set">True</property>
<property name="width-request">500</property>
- <signal name="changed" handler="search_entry_changed" object="GitgWindow"
swapped="no"/>
+ <signal name="changed" handler="search_entry_changed" swapped="no"/>
</object>
</child>
</object>
@@ -194,6 +194,7 @@
<object class="GitgGtkDashView" id="d_dash_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <signal name="repository_activated" handler="dash_view_repository_activated"
swapped="no"/>
</object>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]