aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/empathy-accounts-dialog.c17
-rw-r--r--src/empathy-accounts-dialog.h2
-rw-r--r--src/empathy-accounts.c1
-rw-r--r--src/empathy-chat-window.c15
-rw-r--r--src/empathy-chat-window.ui2
-rw-r--r--src/empathy-debugger.c1
-rw-r--r--src/empathy-main-window.c8
-rw-r--r--src/empathy.c14
8 files changed, 13 insertions, 47 deletions
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 3e8daf340..b8c6d4a5b 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -2286,13 +2286,10 @@ empathy_accounts_dialog_show (GtkWindow *parent,
void
empathy_accounts_dialog_show_application (GdkScreen *screen,
- GChildWatchFunc application_exit_cb,
- gpointer user_data,
TpAccount *selected_account,
gboolean if_needed,
gboolean hidden)
{
- gint command_pid;
GError *error = NULL;
gchar *argv[4] = { NULL, };
gint i = 0;
@@ -2314,7 +2311,7 @@ empathy_accounts_dialog_show_application (GdkScreen *screen,
argv[i++] = path;
- if (selected_account)
+ if (selected_account != NULL)
{
const gchar *account_path;
@@ -2336,20 +2333,14 @@ empathy_accounts_dialog_show_application (GdkScreen *screen,
selected_account == NULL ? "<none selected>" :
tp_proxy_get_object_path (TP_PROXY (selected_account)));
- gdk_spawn_on_screen (screen, NULL, argv, NULL,
- G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL,
- &command_pid, &error);
- if (error)
+ gdk_spawn_on_screen (screen, NULL, argv, NULL, G_SPAWN_SEARCH_PATH,
+ NULL, NULL, NULL, &error);
+ if (error != NULL)
{
g_warning ("Failed to open accounts dialog: %s", error->message);
g_error_free (error);
}
- /* XXX: unportable cast to GPid; then again, gdk_spawn_on_screen() seems
- * unportable since it always takes a gint* for the PID */
- if (application_exit_cb)
- g_child_watch_add ((GPid) command_pid, application_exit_cb, NULL);
-
g_free (account_option);
g_free (path);
}
diff --git a/src/empathy-accounts-dialog.h b/src/empathy-accounts-dialog.h
index f7442345c..5fe6f51f7 100644
--- a/src/empathy-accounts-dialog.h
+++ b/src/empathy-accounts-dialog.h
@@ -61,8 +61,6 @@ void empathy_account_dialog_cancel (EmpathyAccountsDialog *dialog);
gboolean empathy_accounts_dialog_is_creating (EmpathyAccountsDialog *dialog);
void empathy_accounts_dialog_show_application (GdkScreen *screen,
- GChildWatchFunc application_exit_cb,
- gpointer user_data,
TpAccount *selected_account,
gboolean if_needed,
gboolean hidden);
diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 0eaa8553e..62fcaa0e8 100644
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -247,6 +247,7 @@ main (int argc, char *argv[])
g_set_application_name (_("Empathy Accounts"));
gtk_window_set_default_icon_name ("empathy");
+ textdomain (GETTEXT_PACKAGE);
unique_app = unique_app_new (EMPATHY_ACCOUNTS_DBUS_NAME, NULL);
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 282c40e24..c9e04b554 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -341,8 +341,6 @@ chat_window_menu_context_update (EmpathyChatWindowPriv *priv,
last_page = (page_num == (num_pages - 1));
is_connected = empathy_chat_get_tp_chat (priv->current_chat) != NULL;
- DEBUG ("Update window : Menu Contexts (Tabs & Conv)");
-
gtk_action_set_sensitive (priv->menu_tabs_next, TRUE);
gtk_action_set_sensitive (priv->menu_tabs_prev, TRUE);
gtk_action_set_sensitive (priv->menu_tabs_detach, num_pages > 1);
@@ -387,8 +385,6 @@ chat_window_contact_menu_update (EmpathyChatWindowPriv *priv,
"/chats_menubar/menu_contact");
orig_submenu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu));
- DEBUG ("Update window : Contact Menu");
-
if (orig_submenu == NULL || !GTK_WIDGET_VISIBLE (orig_submenu)) {
submenu = empathy_chat_get_contact_menu (priv->current_chat);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu), submenu);
@@ -487,8 +483,6 @@ chat_window_title_update (EmpathyChatWindowPriv *priv)
{
gchar *name;
- DEBUG ("Update window : Title");
-
name = get_window_title_name (priv);
gtk_window_set_title (GTK_WINDOW (priv->dialog), name);
g_free (name);
@@ -504,8 +498,6 @@ chat_window_icon_update (EmpathyChatWindowPriv *priv)
n_chats = g_list_length (priv->chats);
- DEBUG ("Update window : Icon");
-
/* Update window icon */
if (priv->chats_new_msg) {
gtk_window_set_icon_name (GTK_WINDOW (priv->dialog),
@@ -537,8 +529,6 @@ chat_window_close_button_update (EmpathyChatWindowPriv *priv,
GtkWidget *chat_close_button;
gint i;
- DEBUG ("Update window : Close Button");
-
if (num_pages == 1) {
chat = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), 0);
chat_close_button = g_object_get_data (G_OBJECT (chat),
@@ -562,8 +552,6 @@ chat_window_update (EmpathyChatWindow *window)
num_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook));
- DEBUG ("Update window");
-
/* Update Tab menu */
chat_window_menu_context_update (priv,
num_pages);
@@ -1192,7 +1180,6 @@ chat_window_set_urgency_hint (EmpathyChatWindow *window,
priv = GET_PRIV (window);
- DEBUG ("Turning %s urgency hint", urgent ? "on" : "off");
gtk_window_set_urgency_hint (GTK_WINDOW (priv->dialog), urgent);
}
@@ -1530,8 +1517,6 @@ chat_window_focus_in_event_cb (GtkWidget *widget,
{
EmpathyChatWindowPriv *priv;
- DEBUG ("Focus in event, updating title");
-
priv = GET_PRIV (window);
priv->chats_new_msg = g_list_remove (priv->chats_new_msg, priv->current_chat);
diff --git a/src/empathy-chat-window.ui b/src/empathy-chat-window.ui
index 4ba3502f2..2172b6181 100644
--- a/src/empathy-chat-window.ui
+++ b/src/empathy-chat-window.ui
@@ -116,11 +116,13 @@
<property name="name">menu_tabs_left</property>
<property name="label" translatable="yes">Move Tab _Left</property>
</object>
+ <accelerator key="Page_Down" modifiers="GDK_CONTROL_MASK|GDK_SHIFT_MASK"/>
</child>
<child>
<object class="GtkAction" id="menu_tabs_right">
<property name="name">menu_tabs_right</property>
<property name="label" translatable="yes">Move Tab _Right</property>
+ <accelerator key="Page_Up" modifiers="GDK_CONTROL_MASK|GDK_SHIFT_MASK"/>
</object>
</child>
<child>
diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c
index a4e6a9ca2..9ff142b1c 100644
--- a/src/empathy-debugger.c
+++ b/src/empathy-debugger.c
@@ -40,6 +40,7 @@ main (int argc,
g_set_application_name (_("Empathy Debugger"));
gtk_window_set_default_icon_name ("empathy");
+ textdomain (GETTEXT_PACKAGE);
window = empathy_debug_window_new (NULL);
g_signal_connect (window, "destroy", gtk_main_quit, NULL);
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index fe9af9c4d..77414e985 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -362,7 +362,7 @@ main_window_error_edit_clicked_cb (GtkButton *button,
account = g_object_get_data (G_OBJECT (button), "account");
empathy_accounts_dialog_show_application (
- gtk_widget_get_screen (GTK_WIDGET (button)), NULL, NULL,
+ gtk_widget_get_screen (GTK_WIDGET (button)),
account, FALSE, FALSE);
main_window_remove_error (window, account);
@@ -1068,7 +1068,7 @@ main_window_edit_accounts_cb (GtkAction *action,
EmpathyMainWindow *window)
{
empathy_accounts_dialog_show_application (gdk_screen_get_default (),
- NULL, NULL, NULL, FALSE, FALSE);
+ NULL, FALSE, FALSE);
}
static void
@@ -1116,7 +1116,7 @@ main_window_help_debug_cb (GtkAction *action,
argv[i++] = path;
gdk_spawn_on_screen (screen, NULL, argv, NULL,
- G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
+ G_SPAWN_SEARCH_PATH,
NULL, NULL, NULL, &error);
if (error) {
@@ -1146,7 +1146,7 @@ main_window_throbber_button_press_event_cb (GtkWidget *throbber_ebox,
empathy_accounts_dialog_show_application (
gtk_widget_get_screen (GTK_WIDGET (throbber_ebox)),
- NULL, NULL, NULL, FALSE, FALSE);
+ NULL, FALSE, FALSE);
return FALSE;
}
diff --git a/src/empathy.c b/src/empathy.c
index f84791423..377feea30 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -241,23 +241,11 @@ migrate_config_to_xdg_dir (void)
}
static void
-accounts_application_exited_cb (GPid pid,
- gint status,
- gpointer data)
-{
- if (status)
- {
- g_warning ("accounts application exited with status %d: '%s'",
- status, g_strerror (status));
- }
-}
-
-static void
show_accounts_ui (GdkScreen *screen,
gboolean if_needed)
{
empathy_accounts_dialog_show_application (screen,
- accounts_application_exited_cb, NULL, NULL, if_needed, start_hidden);
+ NULL, if_needed, start_hidden);
}
static UniqueResponse
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 10:35:43 +0800