aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2011-08-19 15:33:42 +0800
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2011-08-19 15:33:42 +0800
commit335d9576a93088c11a44de1cdb9c3884a285d95e (patch)
treee5d1dd16a2a3b4d5433ac182863b15af737e86a1 /libempathy-gtk
parentfb56e32dcdc0ad78c59c3d34d500a24c954a6ab0 (diff)
parent6b35d5c27162fdf750a6d1e193e31e51dfe225dd (diff)
downloadgsoc2013-empathy-335d9576a93088c11a44de1cdb9c3884a285d95e.tar
gsoc2013-empathy-335d9576a93088c11a44de1cdb9c3884a285d95e.tar.gz
gsoc2013-empathy-335d9576a93088c11a44de1cdb9c3884a285d95e.tar.bz2
gsoc2013-empathy-335d9576a93088c11a44de1cdb9c3884a285d95e.tar.lz
gsoc2013-empathy-335d9576a93088c11a44de1cdb9c3884a285d95e.tar.xz
gsoc2013-empathy-335d9576a93088c11a44de1cdb9c3884a285d95e.tar.zst
gsoc2013-empathy-335d9576a93088c11a44de1cdb9c3884a285d95e.zip
Merge branch 'trivia'
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-log-window.c6
-rw-r--r--libempathy-gtk/empathy-log-window.ui4
2 files changed, 5 insertions, 5 deletions
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index d0f57a6de..6cdf22292 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -614,7 +614,7 @@ empathy_log_window_init (EmpathyLogWindow *self)
GtkBuilder *gui;
gchar *filename;
GFile *gfile;
- GtkWidget *vbox, *accounts, *search, *label, *quit;
+ GtkWidget *vbox, *accounts, *search, *label, *closeitem;
GtkWidget *scrolledwindow_events;
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
@@ -643,7 +643,7 @@ empathy_log_window_init (EmpathyLogWindow *self)
"toolbutton_video", &self->priv->button_video,
"toolbutton_accounts", &accounts,
"toolbutton_search", &search,
- "imagemenuitem_quit", &quit,
+ "imagemenuitem_close", &closeitem,
"treeview_who", &self->priv->treeview_who,
"treeview_what", &self->priv->treeview_what,
"treeview_when", &self->priv->treeview_when,
@@ -665,7 +665,7 @@ empathy_log_window_init (EmpathyLogWindow *self)
g_object_unref (gui);
- g_signal_connect_swapped (quit, "activate",
+ g_signal_connect_swapped (closeitem, "activate",
G_CALLBACK (gtk_widget_destroy), self);
/* Account chooser for chats */
diff --git a/libempathy-gtk/empathy-log-window.ui b/libempathy-gtk/empathy-log-window.ui
index 08af5b65b..8c84eedf1 100644
--- a/libempathy-gtk/empathy-log-window.ui
+++ b/libempathy-gtk/empathy-log-window.ui
@@ -20,8 +20,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkImageMenuItem" id="imagemenuitem_quit">
- <property name="label">gtk-quit</property>
+ <object class="GtkImageMenuItem" id="imagemenuitem_close">
+ <property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>