[gnome-flashback] libend-session-dialog: fix broken dialog
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-flashback] libend-session-dialog: fix broken dialog
- Date: Fri, 29 Aug 2014 20:34:28 +0000 (UTC)
commit df49360cccff7df64af5b3794073888c1ffff842
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Fri Aug 29 23:33:27 2014 +0300
libend-session-dialog: fix broken dialog
gnome-flashback/libend-session-dialog/Makefile.am | 4 ++--
.../flashback-inhibit-dialog.c | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gnome-flashback/libend-session-dialog/Makefile.am
b/gnome-flashback/libend-session-dialog/Makefile.am
index aee8382..f6ea2a0 100644
--- a/gnome-flashback/libend-session-dialog/Makefile.am
+++ b/gnome-flashback/libend-session-dialog/Makefile.am
@@ -28,9 +28,9 @@ dbus-end-session-dialog.c: org.gnome.SessionManager.EndSessionDialog.xml Makefil
org.gnome.SessionManager.EndSessionDialog.xml
flashback-resources.c: flashback.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)
--generate-dependencies $(srcdir)/flashback.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name flashback
$<
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name flashback
--manual-register $<
flashback-resources.h: flashback.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)
--generate-dependencies $(srcdir)/flashback.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name flashback
$<
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name flashback
--manual-register $<
BUILT_SOURCES = \
dbus-end-session-dialog.h \
diff --git a/gnome-flashback/libend-session-dialog/flashback-inhibit-dialog.c
b/gnome-flashback/libend-session-dialog/flashback-inhibit-dialog.c
index a6ed9ad..c6d613f 100644
--- a/gnome-flashback/libend-session-dialog/flashback-inhibit-dialog.c
+++ b/gnome-flashback/libend-session-dialog/flashback-inhibit-dialog.c
@@ -30,6 +30,7 @@
#include "config.h"
#include "flashback-inhibit-dialog.h"
+#include "flashback-resources.h"
#define IS_STRING_EMPTY(string) ((string) == NULL || (string)[0] == '\0')
@@ -683,6 +684,8 @@ flashback_inhibit_dialog_class_init (FlashbackInhibitDialogClass *klass)
binding_set = gtk_binding_set_by_class (klass);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0, "close", 0);
+ flashback_register_resource ();
+
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/gnome-flashback/flashback-inhibit-dialog.ui");
gtk_widget_class_bind_template_child_private (widget_class, FlashbackInhibitDialog, main_box);
gtk_widget_class_bind_template_child_private (widget_class, FlashbackInhibitDialog,
inhibitors_treeview);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]