aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@gnome.org>2012-02-29 21:07:54 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-03-03 22:02:34 +0800
commit147687c60f59d6b8a9d484750119102329b6be04 (patch)
tree69a7a7f9c6c788ef3a0ac182c3c4f473fa99d391 /e-util
parent14f82dde3448261b5b01fbf298b5c12a0e25d676 (diff)
downloadgsoc2013-evolution-147687c60f59d6b8a9d484750119102329b6be04.tar.gz
gsoc2013-evolution-147687c60f59d6b8a9d484750119102329b6be04.tar.zst
gsoc2013-evolution-147687c60f59d6b8a9d484750119102329b6be04.zip
Use libevolution-utils all over evolution.
Diffstat (limited to 'e-util')
-rw-r--r--e-util/Makefile.am1
-rw-r--r--e-util/e-util.c67
-rw-r--r--e-util/e-util.h4
3 files changed, 1 insertions, 71 deletions
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 44803872d9..0087a21776 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -116,6 +116,7 @@ libeutil_la_SOURCES = \
libeutil_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
libeutil_la_LIBADD = \
+ $(top_builddir)/libevolution-utils/libevolution-utils.la \
$(ICONV_LIBS) \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 717f99ba74..109ee1ba15 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -478,73 +478,6 @@ e_lookup_action_group (GtkUIManager *ui_manager,
}
/**
- * e_builder_get_widget:
- * @builder: a #GtkBuilder
- * @widget_name: name of a widget in @builder
- *
- * Gets the widget named @widget_name. Note that this function does not
- * increment the reference count of the returned widget. If @widget_name
- * could not be found in the @builder<!-- -->'s object tree, a run-time
- * warning is emitted since this usually indicates a programming error.
- *
- * This is a convenience function to work around the awkwardness of
- * #GtkBuilder returning #GObject pointers, when the vast majority of
- * the time you want a #GtkWidget pointer.
- *
- * If you need something from @builder other than a #GtkWidget, or you
- * want to test for the existence of some widget name without incurring
- * a run-time warning, use gtk_builder_get_object().
- *
- * Returns: the widget named @widget_name, or %NULL
- **/
-GtkWidget *
-e_builder_get_widget (GtkBuilder *builder,
- const gchar *widget_name)
-{
- GObject *object;
-
- g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
- g_return_val_if_fail (widget_name != NULL, NULL);
-
- object = gtk_builder_get_object (builder, widget_name);
- if (object == NULL) {
- g_warning ("Could not find widget '%s'", widget_name);
- return NULL;
- }
-
- return GTK_WIDGET (object);
-}
-
-/**
- * e_load_ui_builder_definition:
- * @builder: a #GtkBuilder
- * @basename: basename of the UI definition file
- *
- * Loads a UI definition into @builder from Evolution's UI directory.
- * Failure here is fatal, since the application can't function without
- * its UI definitions.
- **/
-void
-e_load_ui_builder_definition (GtkBuilder *builder,
- const gchar *basename)
-{
- gchar *filename;
- GError *error = NULL;
-
- g_return_if_fail (GTK_IS_BUILDER (builder));
- g_return_if_fail (basename != NULL);
-
- filename = g_build_filename (EVOLUTION_UIDIR, basename, NULL);
- gtk_builder_add_from_file (builder, filename, &error);
- g_free (filename);
-
- if (error != NULL) {
- g_error ("%s: %s", basename, error->message);
- g_assert_not_reached ();
- }
-}
-
-/**
* e_action_compare_by_label:
* @action1: a #GtkAction
* @action2: a #GtkAction
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 1bca2eaa11..bd9ad2dc05 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -64,10 +64,6 @@ GtkAction * e_lookup_action (GtkUIManager *ui_manager,
const gchar *action_name);
GtkActionGroup *e_lookup_action_group (GtkUIManager *ui_manager,
const gchar *group_name);
-GtkWidget * e_builder_get_widget (GtkBuilder *builder,
- const gchar *widget_name);
-void e_load_ui_builder_definition (GtkBuilder *builder,
- const gchar *basename);
gint e_action_compare_by_label (GtkAction *action1,
GtkAction *action2);
void e_action_group_remove_all_actions