diff options
author | Xan Lopez <xan@igalia.com> | 2012-03-27 19:31:56 +0800 |
---|---|---|
committer | Xan Lopez <xan@igalia.com> | 2012-03-28 03:42:41 +0800 |
commit | 98e31b7886bad0eae162ec7c6513a1d20f306727 (patch) | |
tree | 714c4d1d1341f9947ce9d12168a55f6609ce1a42 /lib | |
parent | d892edb5d13028c4d150acba9edf3792eb000194 (diff) | |
download | gsoc2013-epiphany-98e31b7886bad0eae162ec7c6513a1d20f306727.tar gsoc2013-epiphany-98e31b7886bad0eae162ec7c6513a1d20f306727.tar.gz gsoc2013-epiphany-98e31b7886bad0eae162ec7c6513a1d20f306727.tar.bz2 gsoc2013-epiphany-98e31b7886bad0eae162ec7c6513a1d20f306727.tar.lz gsoc2013-epiphany-98e31b7886bad0eae162ec7c6513a1d20f306727.tar.xz gsoc2013-epiphany-98e31b7886bad0eae162ec7c6513a1d20f306727.tar.zst gsoc2013-epiphany-98e31b7886bad0eae162ec7c6513a1d20f306727.zip |
Use glib resources to bundle our UI files
https://bugzilla.gnome.org/show_bug.cgi?id=672907
Diffstat (limited to 'lib')
-rw-r--r-- | lib/ephy-dialog.c | 12 | ||||
-rw-r--r-- | lib/ephy-dialog.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/ephy-dialog.c b/lib/ephy-dialog.c index 1ca4d0daa..3948fb527 100644 --- a/lib/ephy-dialog.c +++ b/lib/ephy-dialog.c @@ -140,7 +140,7 @@ dialog_destroy_cb (GtkWidget *widget, EphyDialog *dialog) static void impl_construct (EphyDialog *dialog, - const char *file, + const char *resource, const char *name, const char *domain) { @@ -150,10 +150,10 @@ impl_construct (EphyDialog *dialog, builder = gtk_builder_new (); gtk_builder_set_translation_domain (builder, domain); - gtk_builder_add_from_file (builder, file, &error); + gtk_builder_add_from_resource (builder, resource, &error); if (error) { - g_warning ("Unable to load UI file %s: %s", file, error->message); + g_warning ("Unable to load UI resource %s: %s", resource, error->message); g_error_free (error); return; } @@ -234,7 +234,7 @@ ephy_dialog_set_size_group (EphyDialog *dialog, /** * ephy_dialog_construct: * @dialog: an #EphyDialog - * @file: the path to a #GtkBuilder file + * @resource: the path to the UI resource * @name: name of the widget to use for @dialog, found in @file * @domain: translation domain to set for @dialog * @@ -243,12 +243,12 @@ ephy_dialog_set_size_group (EphyDialog *dialog, **/ void ephy_dialog_construct (EphyDialog *dialog, - const char *file, + const char *resource, const char *name, const char *domain) { EphyDialogClass *klass = EPHY_DIALOG_GET_CLASS (dialog); - klass->construct (dialog, file, name, domain); + klass->construct (dialog, resource, name, domain); } /** diff --git a/lib/ephy-dialog.h b/lib/ephy-dialog.h index 0373ea834..797690a3e 100644 --- a/lib/ephy-dialog.h +++ b/lib/ephy-dialog.h @@ -54,7 +54,7 @@ struct _EphyDialogClass /* Methods */ void (* construct) (EphyDialog *dialog, - const char *file, + const char *resource, const char *name, const char *domain); void (* show) (EphyDialog *dialog); @@ -75,7 +75,7 @@ EphyDialog *ephy_dialog_new (void); EphyDialog *ephy_dialog_new_with_parent (GtkWidget *parent_window); void ephy_dialog_construct (EphyDialog *dialog, - const char *file, + const char *resource, const char *name, const char *domain); |