rename empathy-new-message-dialog.ui to empathy-contact-selector-dialog.ui

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 3b6aa8c4423dcd0df83535b56ce53aefb9a6f918..f81780d1344887500b302f2b87fcfc59440e87a7 100644 (file)
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -156,7 +156,7 @@ ui_DATA =                                   \
        empathy-status-preset-dialog.ui         \
        empathy-log-window.ui                   \
        empathy-chat.ui                         \
-       empathy-new-message-dialog.ui
+       empathy-contact-selector-dialog.ui
 
 empathy-gtk-marshal.list: $(libempathy_gtk_la_SOURCES) Makefile.am
        $(QUIET_GEN)( cd $(srcdir) && \

diff --git a/libempathy-gtk/empathy-contact-selector-dialog.c b/libempathy-gtk/empathy-contact-selector-dialog.c
index 249e84481f33a0b1145e42d3d5eb90840b1d5a80..de9964dc88d76d19547e88fc8b528e0dcd592bb5 100644 (file)
--- a/libempathy-gtk/empathy-contact-selector-dialog.c
+++ b/libempathy-gtk/empathy-contact-selector-dialog.c
@@ -231,7 +231,7 @@ empathy_contact_selector_dialog_init (EmpathyContactSelectorDialog *dialog)
   /* create a contact manager */
   priv->contact_manager = empathy_contact_manager_dup_singleton ();
 
-  filename = empathy_file_lookup ("empathy-new-message-dialog.ui",
+  filename = empathy_file_lookup ("empathy-contact-selector-dialog.ui",
           "libempathy-gtk");
   gui = empathy_builder_get_file (filename,
                 "table_contact", &priv->table_contact,

diff --git a/libempathy-gtk/empathy-contact-selector-dialog.ui b/libempathy-gtk/empathy-contact-selector-dialog.ui
new file mode 100644 (file)
index 0000000..009028e
--- /dev/null
+++ b/libempathy-gtk/empathy-contact-selector-dialog.ui
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkTable" id="table_contact">
+    <property name="visible">True</property>
+    <property name="n_rows">2</property>
+    <property name="n_columns">2</property>
+    <property name="column_spacing">6</property>
+    <property name="row_spacing">6</property>
+    <child>
+      <object class="GtkLabel" id="label1">
+        <property name="visible">True</property>
+        <property name="xalign">0</property>
+        <property name="label" translatable="yes">Account:</property>
+      </object>
+      <packing>
+        <property name="x_options"></property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="label2">
+        <property name="visible">True</property>
+        <property name="xalign">0</property>
+        <property name="label" translatable="yes">Contact ID:</property>
+      </object>
+      <packing>
+        <property name="top_attach">1</property>
+        <property name="bottom_attach">2</property>
+        <property name="x_options"></property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkEntry" id="entry_id">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="invisible_char">&#x2022;</property>
+        <property name="activates_default">True</property>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="right_attach">2</property>
+        <property name="top_attach">1</property>
+        <property name="bottom_attach">2</property>
+      </packing>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+  </object>
+</interface>

diff --git a/libempathy-gtk/empathy-new-message-dialog.ui b/libempathy-gtk/empathy-new-message-dialog.ui
deleted file mode 100644 (file)
index 009028e..0000000
--- a/libempathy-gtk/empathy-new-message-dialog.ui
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <!-- interface-requires gtk+ 2.12 -->
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkTable" id="table_contact">
-    <property name="visible">True</property>
-    <property name="n_rows">2</property>
-    <property name="n_columns">2</property>
-    <property name="column_spacing">6</property>
-    <property name="row_spacing">6</property>
-    <child>
-      <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">Account:</property>
-      </object>
-      <packing>
-        <property name="x_options"></property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label2">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">Contact ID:</property>
-      </object>
-      <packing>
-        <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options"></property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkEntry" id="entry_id">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="invisible_char">&#x2022;</property>
-        <property name="activates_default">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
-        <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-      </packing>
-    </child>
-    <child>
-      <placeholder/>
-    </child>
-  </object>
-</interface>

diff --git a/po/POTFILES.in b/po/POTFILES.in
index ef2fcfd0807f2cbc82adaee77a1302e2ea227da4..b20058c354221fcd503ba77015a2dad38838e69c 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -39,7 +39,7 @@ libempathy-gtk/empathy-contact-widget.c
 libempathy-gtk/empathy-irc-network-dialog.c
 libempathy-gtk/empathy-log-window.c
 [type: gettext/glade]libempathy-gtk/empathy-log-window.ui
-[type: gettext/glade]libempathy-gtk/empathy-new-message-dialog.ui
+[type: gettext/glade]libempathy-gtk/empathy-contact-selector-dialog.ui
 libempathy-gtk/empathy-new-message-dialog.c
 libempathy-gtk/empathy-presence-chooser.c
 libempathy-gtk/empathy-sound.c