diff options
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-account-widget.c | 30 | ||||
| -rw-r--r-- | src/empathy-accounts-dialog.c | 20 |
3 files changed, 34 insertions, 32 deletions
diff --git a/configure.ac b/configure.ac index 4df19bd12..709dd090c 100644 --- a/configure.ac +++ b/configure.ac @@ -336,20 +336,22 @@ AC_ARG_ENABLE(moblin, if test "x$enable_moblin" != "xno"; then PKG_CHECK_MODULES(MOBLIN, - [nbtk-gtk-1.2], have_nbtk="yes", have_nbtk="no") + [ + nbtk-gtk-1.2 + ], have_moblin="yes", have_moblin="no") - if test "x$have_nbtk" = "xyes"; then - AC_DEFINE(HAVE_NBTK, 1, [Define if you have nbtk]) + if test "x$have_moblin" = "xyes"; then + AC_DEFINE(HAVE_MOBLIN, 1, [Define if you have moblin]) fi else - have_nbtk="no" + have_moblin="no" fi -if test "x$enable_moblin" = "xyes" -a "x$have_nbtk" != "xyes"; then +if test "x$enable_moblin" = "xyes" -a "x$have_moblin" != "xyes"; then AC_MSG_ERROR([Couldn't find moblin dependencies.]) fi -AM_CONDITIONAL(HAVE_NBTK, test "x$have_nbtk" = "xyes") +AM_CONDITIONAL(HAVE_MOBLIN, test "x$have_moblin" = "xyes") AC_SUBST(MOBLIN_CFLAGS) AC_SUBST(MOBLIN_LIBS) @@ -551,7 +553,7 @@ Configure summary: Display maps (libchamplain).: ${have_libchamplain} Location awareness (Geoclue): ${have_geoclue} Adium themes (Webkit).......: ${have_webkit} - Moblin widgets (Nbtk).......: ${have_nbtk} + Moblin widgets .............: ${have_moblin} Connectivity: NetworkManager integration..: ${have_nm} diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index d1704286d..a750d471a 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -30,7 +30,7 @@ #include <gtk/gtk.h> #include <glib/gi18n-lib.h> -#ifdef HAVE_NBTK +#ifdef HAVE_MOBLIN #include <nbtk/nbtk-gtk.h> #endif @@ -621,7 +621,7 @@ account_widget_applied_cb (GObject *source_object, gboolean enabled_checked; enabled_checked = -#ifndef HAVE_NBTK +#ifndef HAVE_MOBLIN gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (priv->enabled_checkbox)); #else @@ -1057,30 +1057,30 @@ empathy_account_widget_enabled_cb (EmpathyAccount *account, if (priv->enabled_checkbox != NULL) { -#ifndef HAVE_NBTK +#ifndef HAVE_MOBLIN gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->enabled_checkbox), enabled); #else nbtk_gtk_light_switch_set_active ( NBTK_GTK_LIGHT_SWITCH (priv->enabled_checkbox), enabled); -#endif /* HAVE_NBTK */ +#endif /* HAVE_MOBLIN */ } } static void -#ifndef HAVE_NBTK +#ifndef HAVE_MOBLIN account_widget_enabled_released_cb (GtkToggleButton *toggle_button, gpointer user_data) #else account_widget_switch_flipped_cb (NbtkGtkLightSwitch *sw, gboolean state, gpointer user_data) -#endif /* HAVE_NBTK */ +#endif /* HAVE_MOBLIN */ { EmpathyAccountWidgetPriv *priv = GET_PRIV (user_data); EmpathyAccount *account; -#ifndef HAVE_NBTK +#ifndef HAVE_MOBLIN gboolean state; state = gtk_toggle_button_get_active (toggle_button); @@ -1245,7 +1245,7 @@ do_constructed (GObject *obj) priv->apply_button = gtk_button_new_from_stock ( priv->creating_account ? GTK_STOCK_CONNECT : GTK_STOCK_APPLY); -#ifdef HAVE_NBTK +#ifdef HAVE_MOBLIN if (priv->creating_account) /* Translators: this is used only when built on a moblin platform */ gtk_button_set_label (GTK_BUTTON (priv->apply_button), @@ -1289,7 +1289,7 @@ do_constructed (GObject *obj) /* handle the "Enabled" checkbox. We only add it when modifying an account */ if (!priv->creating_account && priv->table_common_settings != NULL) { -#ifdef HAVE_NBTK +#ifdef HAVE_MOBLIN GtkWidget *w; #endif guint nb_rows, nb_columns; @@ -1297,7 +1297,7 @@ do_constructed (GObject *obj) is_enabled = empathy_account_is_enabled (account); -#ifndef HAVE_NBTK +#ifndef HAVE_MOBLIN priv->enabled_checkbox = gtk_check_button_new_with_label (_("Enabled")); @@ -1314,7 +1314,7 @@ do_constructed (GObject *obj) NBTK_GTK_LIGHT_SWITCH (priv->enabled_checkbox), is_enabled); gtk_widget_show (w); -#endif /* HAVE_NBTK */ +#endif /* HAVE_MOBLIN */ g_object_get (priv->table_common_settings, "n-rows", &nb_rows, "n-columns", &nb_columns, NULL); @@ -1322,7 +1322,7 @@ do_constructed (GObject *obj) gtk_table_resize (GTK_TABLE (priv->table_common_settings), ++nb_rows, nb_columns); -#ifndef HAVE_NBTK +#ifndef HAVE_MOBLIN gtk_table_attach (GTK_TABLE (priv->table_common_settings), priv->enabled_checkbox, 0, nb_columns, nb_rows - 1, nb_rows, @@ -1336,17 +1336,17 @@ do_constructed (GObject *obj) priv->enabled_checkbox, 1, nb_columns, nb_rows - 1, nb_rows, GTK_EXPAND | GTK_FILL, 0, 0, 0); -#endif /* HAVE_NBTK */ +#endif /* HAVE_MOBLIN */ gtk_widget_show (priv->enabled_checkbox); -#ifndef HAVE_NBTK +#ifndef HAVE_MOBLIN g_signal_connect (G_OBJECT (priv->enabled_checkbox), "released", G_CALLBACK (account_widget_enabled_released_cb), self); #else g_signal_connect (G_OBJECT (priv->enabled_checkbox), "switch-flipped", G_CALLBACK (account_widget_switch_flipped_cb), self); -#endif /* HAVE_NBTK */ +#endif /* HAVE_MOBLIN */ } /* hook up to widget destruction to unref ourselves */ diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index 028866bcc..ea61732c4 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -394,7 +394,7 @@ accounts_dialog_protocol_changed_cb (GtkWidget *widget, return; } -#ifndef HAVE_NBTK +#ifndef HAVE_MOBLIN if (tp_connection_manager_protocol_can_register (proto) && !is_gtalk) { gtk_widget_show (priv->radiobutton_register); @@ -799,17 +799,17 @@ accounts_dialog_view_delete_activated_cb (EmpathyCellRendererActivatable *cell, } question_dialog_primary_text = g_strdup_printf ( -#ifndef HAVE_NBTK +#ifndef HAVE_MOBLIN _("You are about to remove your %s account!\n" "Are you sure you want to proceed?"), #else /* Translators: this is used only when built on a moblin platform */ _("Do you want to remove %s from your computer?"), -#endif /* HAVE_NBTK */ +#endif /* HAVE_MOBLIN */ empathy_account_get_display_name (account)); accounts_dialog_show_question_dialog (dialog, question_dialog_primary_text, -#ifndef HAVE_NBTK +#ifndef HAVE_MOBLIN _("Any associated conversations and chat rooms will NOT be " "removed if you decide to proceed.\n" "\n" @@ -818,7 +818,7 @@ accounts_dialog_view_delete_activated_cb (EmpathyCellRendererActivatable *cell, #else /* Translators: this is used only when built on a moblin platform */ _("This will not remove your account on the server."), -#endif /* HAVE_NBTK */ +#endif /* HAVE_MOBLIN */ G_CALLBACK (accounts_dialog_delete_account_response_cb), dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_NO, @@ -857,7 +857,7 @@ accounts_dialog_model_add_columns (EmpathyAccountsDialog *dialog) accounts_dialog_model_pixbuf_data_func, dialog, NULL); -#ifdef HAVE_NBTK +#ifdef HAVE_MOBLIN g_object_set (cell, "ypad", 4, NULL); #endif @@ -882,7 +882,7 @@ accounts_dialog_model_add_columns (EmpathyAccountsDialog *dialog) gtk_tree_view_column_pack_start (column, cell, FALSE); g_object_set (cell, "icon-name", GTK_STOCK_DELETE, -#ifdef HAVE_NBTK +#ifdef HAVE_MOBLIN "show-on-select", TRUE, #endif NULL); @@ -1433,7 +1433,7 @@ accounts_dialog_button_create_clicked_cb (GtkWidget *button, g_free (str); -#ifndef HAVE_NBTK +#ifndef HAVE_MOBLIN if (tp_connection_manager_protocol_can_register (proto)) { gboolean active; @@ -1642,7 +1642,7 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog) GtkBuilder *gui; gchar *filename; EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog); -#ifdef HAVE_NBTK +#ifdef HAVE_MOBLIN GtkWidget *action_area; #endif @@ -1680,7 +1680,7 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog) g_object_unref (gui); -#ifdef HAVE_NBTK +#ifdef HAVE_MOBLIN action_area = gtk_dialog_get_action_area (GTK_DIALOG (priv->window)); gtk_widget_hide (action_area); |