Use empathy_file_lookup for glade files since some are in libempathy-gtk/ and others in src/

svn path=/trunk/; revision=813

7 files changed, 30 insertions, 8 deletions

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index c7f202ee3..70bcb3e5f 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -450,13 +450,15 @@ empathy_call_window_new (EmpathyTpCall *call)
   EmpathyCallWindow *window;
   GladeXML *glade;
   guint status;
+  gchar *filename;
 
   g_return_val_if_fail (EMPATHY_IS_TP_CALL (call), NULL);
 
   window = g_slice_new0 (EmpathyCallWindow);
   window->call = g_object_ref (call);
 
-  glade = empathy_glade_get_file ("empathy-call-window.glade",
+  filename = empathy_file_lookup ("empathy-call-window.glade", "src");
+  glade = empathy_glade_get_file (filename,
       "window",
       NULL,
       "window", &window->window,
@@ -471,6 +473,7 @@ empathy_call_window_new (EmpathyTpCall *call)
       "output_video_frame", &window->output_video_frame,
       "video_button", &window->video_button,
       NULL);
+  g_free (filename);
 
   empathy_glade_connect (glade,
       window,
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 33be0ea82..65a706c17 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -280,10 +280,12 @@ empathy_chat_window_init (EmpathyChatWindow *window)
 	GtkWidget            *menu;
 	gint                  i;
 	GtkWidget            *chat_vbox;
+	gchar                *filename;
 
 	priv = GET_PRIV (window);
 
-	glade = empathy_glade_get_file ("empathy-chat.glade",
+	filename = empathy_file_lookup ("empathy-chat.glade", "libempathy-gtk");
+	glade = empathy_glade_get_file (filename,
 				       "chat_window",
 				       NULL,
 				       "chat_window", &priv->dialog,
@@ -315,6 +317,7 @@ empathy_chat_window_init (EmpathyChatWindow *window)
 				       "menu_help_contents", &priv->menu_help_contents,
 				       "menu_help_about", &priv->menu_help_about,
 				       NULL);
+	g_free (filename);
 
 	empathy_glade_connect (glade,
 			      window,
diff --git a/src/empathy-chatrooms-window.c b/src/empathy-chatrooms-window.c
index 0511098c3..474a3ef10 100644
--- a/src/empathy-chatrooms-window.c
+++ b/src/empathy-chatrooms-window.c
@@ -108,6 +108,7 @@ empathy_chatrooms_window_show (GtkWindow *parent)
 {
 	static EmpathyChatroomsWindow *window = NULL;
 	GladeXML                     *glade;
+	gchar                        *filename;
 
 	if (window) {
 		gtk_window_present (GTK_WINDOW (window->window));
@@ -116,7 +117,8 @@ empathy_chatrooms_window_show (GtkWindow *parent)
 
 	window = g_new0 (EmpathyChatroomsWindow, 1);
 
-	glade = empathy_glade_get_file ("empathy-chatrooms-window.glade",
+	filename = empathy_file_lookup ("empathy-chatrooms-window.glade", "src");
+	glade = empathy_glade_get_file (filename,
 				       "chatrooms_window",
 				       NULL,
 				       "chatrooms_window", &window->window,
@@ -127,6 +129,7 @@ empathy_chatrooms_window_show (GtkWindow *parent)
 				       "button_remove", &window->button_remove,
 				       "button_close", &window->button_close,
 				       NULL);
+	g_free (filename);
 
 	empathy_glade_connect (glade,
 			      window,
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 6f3ad5481..79fb1d392 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -186,6 +186,7 @@ empathy_main_window_show (void)
 	gboolean                  show_avatars;
 	gboolean                  compact_contact_list;
 	gint                      x, y, w, h;
+	gchar                    *filename;
 
 	if (window) {
 		empathy_window_present (GTK_WINDOW (window->window), TRUE);
@@ -195,7 +196,8 @@ empathy_main_window_show (void)
 	window = g_new0 (EmpathyMainWindow, 1);
 
 	/* Set up interface */
-	glade = empathy_glade_get_file ("empathy-main-window.glade",
+	filename = empathy_file_lookup ("empathy-main-window.glade", "src");
+	glade = empathy_glade_get_file (filename,
 				       "main_window",
 				       NULL,
 				       "main_window", &window->window,
@@ -210,6 +212,7 @@ empathy_main_window_show (void)
 				       "presence_toolbar", &window->presence_toolbar,
 				       "roster_scrolledwindow", &sw,
 				       NULL);
+	g_free (filename);
 
 	empathy_glade_connect (glade,
 			      window,
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index b8be23add..1b1dd653f 100644
--- a/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@ -122,6 +122,7 @@ empathy_new_chatroom_dialog_show (GtkWindow *parent)
 	EmpathyNewChatroomDialog *dialog;
 	GladeXML                 *glade;
 	GtkSizeGroup             *size_group;
+	gchar                    *filename;
 
 	if (dialog_p) {
 		gtk_window_present (GTK_WINDOW (dialog_p->window));
@@ -130,7 +131,8 @@ empathy_new_chatroom_dialog_show (GtkWindow *parent)
 
 	dialog_p = dialog = g_new0 (EmpathyNewChatroomDialog, 1);
 
-	glade = empathy_glade_get_file ("empathy-new-chatroom-dialog.glade",
+	filename = empathy_file_lookup ("empathy-new-chatroom-dialog.glade", "src");
+	glade = empathy_glade_get_file (filename,
 				       "new_chatroom_dialog",
 				       NULL,
 				       "new_chatroom_dialog", &dialog->window,
@@ -148,6 +150,7 @@ empathy_new_chatroom_dialog_show (GtkWindow *parent)
 				       "treeview", &dialog->treeview,
 				       "button_join", &dialog->button_join,
 				       NULL);
+	g_free (filename);
 
 	empathy_glade_connect (glade,
 			      dialog,
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 1304c58ef..4d3fe1784 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -30,6 +30,8 @@
 #include <glade/glade.h>
 #include <glib/gi18n.h>
 
+#include <libempathy/empathy-utils.h>
+
 #include <libempathy-gtk/empathy-conf.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 #include <libempathy-gtk/empathy-theme-manager.h>
@@ -951,6 +953,7 @@ empathy_preferences_show (GtkWindow *parent)
 {
 	static EmpathyPreferences *preferences;
 	GladeXML                 *glade;
+	gchar                    *filename;
 
 	if (preferences) {
 		gtk_window_present (GTK_WINDOW (preferences->dialog));
@@ -959,8 +962,8 @@ empathy_preferences_show (GtkWindow *parent)
 
 	preferences = g_new0 (EmpathyPreferences, 1);
 
-	glade = empathy_glade_get_file (
-		"empathy-preferences.glade",
+	filename = empathy_file_lookup ("empathy-preferences.glade", "src");
+	glade = empathy_glade_get_file (filename,
 		"preferences_dialog",
 		NULL,
 		"preferences_dialog", &preferences->dialog,
@@ -980,6 +983,7 @@ empathy_preferences_show (GtkWindow *parent)
 		"checkbutton_popups_when_available", &preferences->checkbutton_popups_when_available,
 		"treeview_spell_checker", &preferences->treeview_spell_checker,
 		NULL);
+	g_free (filename);
 
 	empathy_glade_connect (glade,
 			      preferences,
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 07224b06c..7cd623b45 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -651,10 +651,12 @@ status_icon_create_menu (EmpathyStatusIcon *icon)
 {
 	EmpathyStatusIconPriv *priv;
 	GladeXML              *glade;
+	gchar                 *filename;
 
 	priv = GET_PRIV (icon);
 
-	glade = empathy_glade_get_file ("empathy-status-icon.glade",
+	filename = empathy_file_lookup ("empathy-status-icon.glade", "src");
+	glade = empathy_glade_get_file (filename,
 				       "tray_menu",
 				       NULL,
 				       "tray_menu", &priv->popup_menu,
@@ -662,6 +664,7 @@ status_icon_create_menu (EmpathyStatusIcon *icon)
 				       "tray_new_message", &priv->message_item,
 				       "tray_status", &priv->status_item,
 				       NULL);
+	g_free (filename);
 
 	empathy_glade_connect (glade,
 			      icon,