aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2008-11-08 06:25:30 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-11-08 06:25:30 +0800
commit6760cc72334346b8654fcd9fe1440890db55ac1b (patch)
tree577dee1f67b2d7bcf0423a89b03ef0b20b6730e2 /e-util
parentd6445f8abfa78c0a9c8680a3ba7422d331391f8f (diff)
downloadgsoc2013-evolution-6760cc72334346b8654fcd9fe1440890db55ac1b.tar.gz
gsoc2013-evolution-6760cc72334346b8654fcd9fe1440890db55ac1b.tar.zst
gsoc2013-evolution-6760cc72334346b8654fcd9fe1440890db55ac1b.zip
Merge revisions 36730:36736 from trunk.
svn path=/branches/kill-bonobo/; revision=36764
Diffstat (limited to 'e-util')
-rw-r--r--e-util/ChangeLog37
-rw-r--r--e-util/e-non-intrusive-error-dialog.c1
2 files changed, 37 insertions, 1 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 00e2a0aac1..f61b43a003 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,40 @@
+<<<<<<< .working
+=======
+2008-11-04 Akhil Laddha <lakhil@novell.com>
+
+ * e-non-intrusive-error-dialog.c (eni_query_tooltip_cb),
+ (eni_render_pixbuf), (eni_render_date), (eni_append_logs),
+ (eni_config_get_error_level), (eni_config_get_error_timeout),
+ (eni_error_timeout_changed), (eni_error_level_value_changed),
+ (eni_show_logger):
+ * e-non-intrusive-error-dialog.h:
+ Missed commiting these files in the previous commit.
+
+2008-11-03 Ashish Shrivastava <shashish@novell.com>
+
+ ** Support for Non-intrusive error in calendar.
+
+ * Makefile.am: Added new files:
+ * e-non-intrusive-error-dialog.c, e-non-intrusive-error-dialog.h:
+
+2008-11-02 Matthew Barnes <mbarnes@redhat.com>
+
+ * e-util.c (do_format_number_as_float):
+ Remove this unused internal function.
+
+2008-10-30 Matthew Barnes <mbarnes@redhat.com>
+
+ * e-icon-factory.c:
+ Only include the toplevel GTK+ header.
+
+2008-10-29 Sankar P <psankar@novell.com>
+
+License Changes
+
+ * e-plugin-ui.c:
+ * e-plugin-ui.h:
+
+>>>>>>> .merge-right.r36736
2008-10-06 Sankar P <psankar@novell.com>
* widgets/table/e-cell-float.c:
diff --git a/e-util/e-non-intrusive-error-dialog.c b/e-util/e-non-intrusive-error-dialog.c
index 070c1e9bef..5fd98cacd2 100644
--- a/e-util/e-non-intrusive-error-dialog.c
+++ b/e-util/e-non-intrusive-error-dialog.c
@@ -305,4 +305,3 @@ eni_show_logger(ELogger *logger, GtkWidget *top,const char *error_timeout_path,
gtk_widget_show_all (window);
}
-