|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
diff -up evolution-2.10.3/widgets/misc/e-pilot-settings.c.e-source-combo-box evolution-2.10.3/widgets/misc/e-pilot-settings.c
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
--- evolution-2.10.3/widgets/misc/e-pilot-settings.c.e-source-combo-box 2007-04-09 09:10:24.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
+++ evolution-2.10.3/widgets/misc/e-pilot-settings.c 2007-08-30 09:59:24.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
@@ -27,7 +27,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <gtk/gtk.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libgnome/gnome-i18n.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-#include <libedataserverui/e-source-option-menu.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+#include <libedataserverui/e-source-combo-box.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include "e-pilot-settings.h"
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
struct _EPilotSettingsPrivate
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -102,7 +102,7 @@ build_ui (EPilotSettings *ps, ESourceLis
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
lbl = gtk_label_new (_("Sync with:"));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- priv->source = e_source_option_menu_new (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ priv->source = e_source_combo_box_new (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, 0, 1);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
gtk_table_attach_defaults (GTK_TABLE (ps), priv->source, 1, 2, 0, 1);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
gtk_widget_show (lbl);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -152,8 +152,9 @@ e_pilot_settings_get_source (EPilotSetti
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), FALSE);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
priv = ps->priv;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- return e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (priv->source));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ return e_source_combo_box_get_active (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ E_SOURCE_COMBO_BOX (priv->source));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
void
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -166,7 +167,8 @@ e_pilot_settings_set_source (EPilotSetti
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
priv = ps->priv;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source), source);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_source_combo_box_set_active (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ E_SOURCE_COMBO_BOX (priv->source), source);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
gboolean
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
diff -up evolution-2.10.3/plugins/itip-formatter/itip-formatter.c.e-source-combo-box evolution-2.10.3/plugins/itip-formatter/itip-formatter.c
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
--- evolution-2.10.3/plugins/itip-formatter/itip-formatter.c.e-source-combo-box 2007-04-09 09:09:15.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
+++ evolution-2.10.3/plugins/itip-formatter/itip-formatter.c 2007-08-30 09:59:24.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
@@ -39,7 +39,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <camel/camel-store.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libecal/e-cal.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libecal/e-cal-time-util.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-#include <libedataserverui/e-source-option-menu.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+#include <libedataserverui/e-source-combo-box.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libedataserverui/e-source-selector.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <gtkhtml/gtkhtml-embedded.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <mail/em-format-hook.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
diff -up evolution-2.10.3/plugins/itip-formatter/itip-view.c.e-source-combo-box evolution-2.10.3/plugins/itip-formatter/itip-view.c
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
--- evolution-2.10.3/plugins/itip-formatter/itip-view.c.e-source-combo-box 2007-04-09 09:09:15.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
+++ evolution-2.10.3/plugins/itip-formatter/itip-view.c 2007-08-30 09:59:24.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
@@ -35,7 +35,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <camel/camel-mime-message.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libedataserver/e-time-utils.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libedataserver/e-data-server-util.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-#include <libedataserverui/e-source-option-menu.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+#include <libedataserverui/e-source-combo-box.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libecal/e-cal.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libecal/e-cal-time-util.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <gtkhtml/gtkhtml-embedded.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -104,8 +104,8 @@ struct _ItipViewPrivate {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
char *description;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GtkWidget *selector_box;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- GtkWidget *esom;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- GtkWidget *esom_header;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ GtkWidget *escb;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ GtkWidget *escb_header;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
ESourceList *source_list;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GtkWidget *rsvp_box;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -1664,10 +1664,12 @@ itip_view_clear_lower_info_items (ItipVi
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
static void
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-source_selected_cb (ESourceOptionMenu *esom, ESource *source, gpointer data)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+source_changed_cb (ESourceComboBox *escb, ItipView *view)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
{
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- ItipView *view = data;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ ESource *source;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ source = e_source_combo_box_get_active (escb);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
g_signal_emit (view, signals[SOURCE_SELECTED], 0, source);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -1684,40 +1686,42 @@ itip_view_set_source_list (ItipView *vie
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (priv->source_list)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
g_object_unref (priv->source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- if (priv->esom)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gtk_widget_destroy (priv->esom);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ if (priv->escb)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gtk_widget_destroy (priv->escb);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (!source_list) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- if (priv->esom_header)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gtk_widget_destroy (priv->esom_header);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ if (priv->escb_header)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gtk_widget_destroy (priv->escb_header);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
priv->source_list = NULL;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- priv->esom = NULL;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- priv->esom_header = NULL;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ priv->escb = NULL;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ priv->escb_header = NULL;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
return;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
priv->source_list = g_object_ref (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- priv->esom = e_source_option_menu_new (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gtk_widget_show (priv->esom);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- g_signal_connect (priv->esom, "source_selected", G_CALLBACK (source_selected_cb), view);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ priv->escb = e_source_combo_box_new (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gtk_widget_show (priv->escb);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ g_signal_connect (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ priv->escb, "changed",
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ G_CALLBACK (source_changed_cb), view);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- if (!priv->esom_header) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ if (!priv->escb_header) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (priv->type == E_CAL_SOURCE_TYPE_EVENT)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- priv->esom_header = gtk_label_new_with_mnemonic (_("_Calendar:"));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ priv->escb_header = gtk_label_new_with_mnemonic (_("_Calendar:"));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
else if (priv->type == E_CAL_SOURCE_TYPE_TODO)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- priv->esom_header = gtk_label_new_with_mnemonic (_("_Tasks :"));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ priv->escb_header = gtk_label_new_with_mnemonic (_("_Tasks :"));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
else if (priv->type == E_CAL_SOURCE_TYPE_JOURNAL)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- priv->esom_header = gtk_label_new_with_mnemonic (_("Memos :"));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ priv->escb_header = gtk_label_new_with_mnemonic (_("Memos :"));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gtk_label_set_mnemonic_widget (GTK_LABEL (priv->esom_header), priv->esom);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gtk_widget_show (priv->esom_header);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gtk_label_set_mnemonic_widget (GTK_LABEL (priv->escb_header), priv->escb);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gtk_widget_show (priv->escb_header);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gtk_box_pack_start (GTK_BOX (priv->selector_box), priv->esom_header, FALSE, TRUE, 6);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gtk_box_pack_start (GTK_BOX (priv->selector_box), priv->esom, FALSE, TRUE, 0);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gtk_box_pack_start (GTK_BOX (priv->selector_box), priv->escb_header, FALSE, TRUE, 6);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gtk_box_pack_start (GTK_BOX (priv->selector_box), priv->escb, FALSE, TRUE, 0);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
ESourceList *
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -1743,10 +1747,11 @@ itip_view_set_source (ItipView *view, ES
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
priv = view->priv;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- if (!priv->esom)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ if (!priv->escb)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
return;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->esom), source);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_source_combo_box_set_active (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ E_SOURCE_COMBO_BOX (priv->escb), source);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
ESource *
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -1759,10 +1764,11 @@ itip_view_get_source (ItipView *view)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
priv = view->priv;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- if (!priv->esom)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ if (!priv->escb)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
return NULL;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- return e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (priv->esom));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ return e_source_combo_box_get_active (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ E_SOURCE_COMBO_BOX (priv->escb));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
void
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
diff -up evolution-2.10.3/plugins/bbdb/gaimbuddies.c.e-source-combo-box evolution-2.10.3/plugins/bbdb/gaimbuddies.c
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
--- evolution-2.10.3/plugins/bbdb/gaimbuddies.c.e-source-combo-box 2007-05-25 02:43:33.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
+++ evolution-2.10.3/plugins/bbdb/gaimbuddies.c 2007-08-30 09:59:24.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
@@ -44,7 +44,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <string.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libebook/e-book.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-#include <libedataserverui/e-source-option-menu.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+#include <libedataserverui/e-source-combo-box.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <sys/time.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <sys/stat.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
diff -up evolution-2.10.3/plugins/bbdb/bbdb.c.e-source-combo-box evolution-2.10.3/plugins/bbdb/bbdb.c
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
--- evolution-2.10.3/plugins/bbdb/bbdb.c.e-source-combo-box 2007-06-30 15:29:42.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
+++ evolution-2.10.3/plugins/bbdb/bbdb.c 2007-08-30 10:03:58.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
@@ -40,7 +40,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <string.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libebook/e-book.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-#include <libedataserverui/e-source-option-menu.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+#include <libedataserverui/e-source-combo-box.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <e-util/e-config.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <mail/em-config.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -71,10 +71,49 @@ static gboolean bbdb_timeout (gpointer d
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
static void bbdb_do_it (EBook *book, const char *name, const char *email);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
static void add_email_to_contact (EContact *contact, const char *email);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
static void enable_toggled_cb (GtkWidget *widget, gpointer data);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
-static void source_changed_cb (GtkWidget *widget, ESource *source, gpointer data);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+static void source_changed_cb (ESourceComboBox *source_combo_box, struct bbdb_stuff *stuff);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
static GtkWidget *create_addressbook_option_menu (struct bbdb_stuff *stuff, int type);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
static void cleanup_cb (GObject *o, gpointer data);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+static ESource *
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+find_esource_by_uri (ESourceList *source_list, const gchar *target_uri)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+{
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ GSList *groups;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ /* XXX This would be unnecessary if the plugin had stored
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ * the addressbook's UID instead of the URI in GConf.
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ * Too late to change it now, I suppose. */
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ if (source_list == NULL || target_uri == NULL)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ return NULL;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ groups = e_source_list_peek_groups (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ while (groups != NULL) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ GSList *sources;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ sources = e_source_group_peek_sources (groups->data);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ while (sources != NULL) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ gchar *uri;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ gboolean match;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ uri = e_source_get_uri (sources->data);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ match = (strcmp (uri, target_uri) == 0);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ g_free (uri);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ if (match)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ return sources->data;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ sources = g_slist_next (sources);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ }
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ groups = g_slist_next (groups);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ }
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ return NULL;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
int
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
e_plugin_lib_enable (EPluginLib *ep, int enable)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
{
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
@@ -353,8 +392,23 @@ enable_toggled_cb (GtkWidget *widget, gp
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
gtk_widget_set_sensitive (stuff->option_menu, active);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (active && !gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, NULL)) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- selected_source = e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (stuff->option_menu));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
- gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, e_source_get_uri (selected_source), NULL);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ const gchar *uri = NULL;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ GError *error = NULL;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ selected_source = e_source_combo_box_get_active (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ E_SOURCE_COMBO_BOX (stuff->option_menu));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ if (selected_source != NULL)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ uri = e_source_get_uri (selected_source);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ gconf_client_set_string (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ stuff->target->gconf,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ GCONF_KEY_WHICH_ADDRESSBOOK,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ uri, &error);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ if (error != NULL) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ g_warning ("%s", error->message);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ g_error_free (error);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ }
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
@@ -372,7 +426,8 @@ enable_gaim_toggled_cb (GtkWidget *widge
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
gtk_widget_set_sensitive (stuff->gaim_option_menu, active);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (active && !gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, NULL)) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- selected_source = e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (stuff->gaim_option_menu));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ selected_source = e_source_combo_box_get_active (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ E_SOURCE_COMBO_BOX (stuff->gaim_option_menu));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, e_source_get_uri (selected_source), NULL);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
@@ -384,48 +439,77 @@ synchronize_button_clicked_cb (GtkWidget
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
static void
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
-source_changed_cb (GtkWidget *widget, ESource *source, gpointer data)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+source_changed_cb (ESourceComboBox *source_combo_box,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ struct bbdb_stuff *stuff)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
{
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
- struct bbdb_stuff *stuff = (struct bbdb_stuff *) data;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
-
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
- gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, e_source_get_uri (source), NULL);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ ESource *source;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ GError *error = NULL;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ source = e_source_combo_box_get_active (source_combo_box);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ g_return_if_fail (source != NULL);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ gconf_client_set_string (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ stuff->target->gconf,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ GCONF_KEY_WHICH_ADDRESSBOOK,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ e_source_get_uri (source), &error);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ if (error != NULL) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ g_warning ("%s", error->message);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ g_error_free (error);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ }
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
static void
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
-gaim_source_changed_cb (GtkWidget *widget, ESource *source, gpointer data)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+gaim_source_changed_cb (ESourceComboBox *source_combo_box,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ struct bbdb_stuff *stuff)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
{
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
- struct bbdb_stuff *stuff = (struct bbdb_stuff *) data;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
- gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, e_source_get_uri (source), NULL);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ ESource *source;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ GError *error = NULL;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ source = e_source_combo_box_get_active (source_combo_box);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ g_return_if_fail (source != NULL);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ gconf_client_set_string (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ stuff->target->gconf,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ GCONF_KEY_WHICH_ADDRESSBOOK_GAIM,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ e_source_get_uri (source), &error);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ if (error != NULL) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ g_warning ("%s", error->message);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ g_error_free (error);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ }
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
static GtkWidget *
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
create_addressbook_option_menu (struct bbdb_stuff *stuff, int type)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
{
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- GtkWidget *menu;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ GtkWidget *combo_box;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
ESourceList *source_list;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
- char *selected_source_uri;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
ESource *selected_source;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ char *selected_source_uri;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GConfClient *gconf = stuff->target->gconf;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
source_list = e_source_list_new_for_gconf (gconf, "/apps/evolution/addressbook/sources");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- menu = e_source_option_menu_new (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ combo_box = e_source_combo_box_new (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (type == GAIM_ADDRESSBOOK)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
selected_source_uri = gconf_client_get_string (gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, NULL);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
else
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
selected_source_uri = gconf_client_get_string (gconf, GCONF_KEY_WHICH_ADDRESSBOOK, NULL);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
- if (selected_source_uri != NULL) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- selected_source = e_source_new_with_absolute_uri ("", selected_source_uri);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- e_source_option_menu_select (E_SOURCE_OPTION_MENU (menu), selected_source);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
- g_free (selected_source_uri);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
- }
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ selected_source = find_esource_by_uri (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ source_list, selected_source_uri);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ g_free (selected_source_uri);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ if (selected_source != NULL)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_source_combo_box_set_active (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ E_SOURCE_COMBO_BOX (combo_box), selected_source);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gtk_widget_show (menu);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gtk_widget_show (combo_box);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
stuff->source_list = source_list;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- return menu;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ return combo_box;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GtkWidget *
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
@@ -491,7 +575,7 @@ bbdb_page_factory (EPlugin *ep, EConfigH
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
/* Source selection option menu */
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
option = create_addressbook_option_menu (stuff, AUTOMATIC_CONTACTS_ADDRESSBOOK);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
- g_signal_connect (option, "source_selected", G_CALLBACK (source_changed_cb), stuff);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ g_signal_connect (option, "changed", G_CALLBACK (source_changed_cb), stuff);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
gtk_widget_set_sensitive (option, gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE, NULL));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
gtk_box_pack_start (GTK_BOX (inner_vbox), option, FALSE, FALSE, 0);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
stuff->option_menu = option;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
@@ -527,7 +611,7 @@ bbdb_page_factory (EPlugin *ep, EConfigH
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
/* Gaim Source Selection Option Menu */
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
gaim_option = create_addressbook_option_menu (stuff, GAIM_ADDRESSBOOK);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
- g_signal_connect (gaim_option, "source_selected", G_CALLBACK (gaim_source_changed_cb), stuff);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ g_signal_connect (gaim_option, "changed", G_CALLBACK (gaim_source_changed_cb), stuff);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
gtk_widget_set_sensitive (gaim_option, gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE_GAIM, NULL));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
gtk_box_pack_start (GTK_BOX (inner_vbox), gaim_option, FALSE, FALSE, 0);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
stuff->gaim_option_menu = gaim_option;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
diff -up evolution-2.10.3/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box evolution-2.10.3/addressbook/gui/contact-list-editor/contact-list-editor.glade
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
--- evolution-2.10.3/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box 2007-05-27 14:11:02.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
+++ evolution-2.10.3/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-08-30 09:59:24.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
@@ -158,9 +158,9 @@
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
</child>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<child>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- <widget class="Custom" id="source-option-menu-source">
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ <widget class="Custom" id="source-combo-box-source">
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<property name="visible">True</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- <property name="creation_function">e_contact_list_editor_create_source_option_menu</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ <property name="creation_function">e_contact_list_editor_create_source_combo_box</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<property name="int1">0</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<property name="int2">0</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<property name="last_modification_time">Tue, 01 Jun 2004 18:22:38 GMT</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
diff -up evolution-2.10.3/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box evolution-2.10.3/addressbook/gui/contact-list-editor/e-contact-list-editor.c
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
--- evolution-2.10.3/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box 2007-04-09 09:07:42.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
+++ evolution-2.10.3/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-08-30 09:59:24.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
@@ -33,7 +33,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <gtk/gtktogglebutton.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <gtk/gtkdialog.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-#include <libedataserverui/e-source-option-menu.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+#include <libedataserverui/e-source-combo-box.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libgnomevfs/gnome-vfs-ops.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -78,7 +78,7 @@ static void select_cb (GtkWidget *w, ECo
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
static void list_name_changed_cb (GtkWidget *w, EContactListEditor *editor);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
static void list_image_changed_cb (GtkWidget *w, EContactListEditor *editor);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
static void visible_addrs_toggled_cb (GtkWidget *w, EContactListEditor *editor);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-static void source_selected (GtkWidget *source_option_menu, ESource *source, EContactListEditor *editor);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+static void source_changed_cb (ESourceComboBox *source_combo_box, EContactListEditor *editor);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
static gboolean email_key_pressed (GtkWidget *w, GdkEventKey *event, EContactListEditor *editor);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
static void email_match_selected (GtkWidget *w, EDestination *destination, EContactListEditor *editor);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -233,7 +233,7 @@ e_contact_list_editor_init (EContactList
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
editor->list_name_entry = glade_xml_get_widget (gui, "list-name-entry");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
editor->list_image = glade_xml_get_widget (gui, "list-image");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
editor->visible_addrs_checkbutton = glade_xml_get_widget (gui, "visible-addrs-checkbutton");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- editor->source_menu = glade_xml_get_widget (gui, "source-option-menu-source");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ editor->source_menu = glade_xml_get_widget (gui, "source-combo-box-source");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
editor->ok_button = glade_xml_get_widget (gui, "ok-button");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
editor->cancel_button = glade_xml_get_widget (gui, "cancel-button");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -276,7 +276,7 @@ e_contact_list_editor_init (EContactList
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
"changed", G_CALLBACK(list_image_changed_cb), editor);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
g_signal_connect (editor->source_menu,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- "source_selected", G_CALLBACK (source_selected), editor);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ "changed", G_CALLBACK (source_changed_cb), editor);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
command_state_changed (editor);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -306,8 +306,9 @@ new_target_cb (EBook *new_book, EBookSta
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (status != E_BOOK_ERROR_OK || new_book == NULL) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
eab_load_error_dialog (NULL, e_book_get_source (new_book), status);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- e_source_option_menu_select (E_SOURCE_OPTION_MENU (editor->source_menu),
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- e_book_get_source (editor->book));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_source_combo_box_set_active (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ E_SOURCE_COMBO_BOX (editor->source_menu),
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_book_get_source (editor->book));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (new_book)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
g_object_unref (new_book);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -332,8 +333,12 @@ cancel_load (EContactListEditor *editor)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
static void
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-source_selected (GtkWidget *source_option_menu, ESource *source, EContactListEditor *editor)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+source_changed_cb (ESourceComboBox *source_combo_box, EContactListEditor *editor)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
{
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ ESource *source;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ source = e_source_combo_box_get_active (source_combo_box);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
cancel_load (editor);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (e_source_equal (e_book_get_source (editor->book), source))
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -795,28 +800,28 @@ select_cb (GtkWidget *w, EContactListEdi
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GtkWidget *
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-e_contact_list_editor_create_source_option_menu (gchar *name,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gchar *string1, gchar *string2,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gint int1, gint int2);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+e_contact_list_editor_create_source_combo_box (gchar *name,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gchar *string1, gchar *string2,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gint int1, gint int2);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GtkWidget *
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-e_contact_list_editor_create_source_option_menu (gchar *name,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gchar *string1, gchar *string2,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gint int1, gint int2)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+e_contact_list_editor_create_source_combo_box (gchar *name,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gchar *string1, gchar *string2,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gint int1, gint int2)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
{
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- GtkWidget *menu;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ GtkWidget *combo_box;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GConfClient *gconf_client;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
ESourceList *source_list;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
gconf_client = gconf_client_get_default ();
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- menu = e_source_option_menu_new (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ combo_box = e_source_combo_box_new (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
g_object_unref (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gtk_widget_show (menu);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- return menu;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gtk_widget_show (combo_box);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ return combo_box;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GtkWidget *
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -1262,10 +1267,9 @@ fill_in_info(EContactListEditor *editor)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (editor->book) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- ESource *source;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- source = e_book_get_source (editor->book);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- e_source_option_menu_select (E_SOURCE_OPTION_MENU (editor->source_menu), source);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_source_combo_box_set_active (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ E_SOURCE_COMBO_BOX (editor->source_menu),
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_book_get_source (editor->book));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
gtk_widget_set_sensitive (editor->source_menu, editor->is_new_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "source-label"), editor->is_new_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
diff -up evolution-2.10.3/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box evolution-2.10.3/addressbook/gui/contact-editor/contact-editor.glade
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
--- evolution-2.10.3/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box 2007-04-09 09:07:40.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
+++ evolution-2.10.3/addressbook/gui/contact-editor/contact-editor.glade 2007-08-30 09:59:24.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
@@ -356,9 +356,9 @@
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
</child>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<child>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- <widget class="Custom" id="source-option-menu-source">
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ <widget class="Custom" id="source-combo-box-source">
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<property name="visible">True</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- <property name="creation_function">e_contact_editor_create_source_option_menu</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ <property name="creation_function">e_contact_editor_create_source_combo_box</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<property name="int1">0</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<property name="int2">0</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<property name="last_modification_time">Tue, 13 Apr 2004 20:47:50 GMT</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
diff -up evolution-2.10.3/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box evolution-2.10.3/addressbook/gui/contact-editor/e-contact-editor.c
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
--- evolution-2.10.3/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box 2007-05-27 12:54:09.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
+++ evolution-2.10.3/addressbook/gui/contact-editor/e-contact-editor.c 2007-08-30 09:59:24.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
@@ -46,7 +46,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <text/e-entry.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libebook/e-address-western.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-#include <libedataserverui/e-source-option-menu.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+#include <libedataserverui/e-source-combo-box.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <camel/camel.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -590,15 +590,16 @@ static void
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
fill_in_source_field (EContactEditor *editor)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
{
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GtkWidget *source_menu;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- ESource *source;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (!editor->target_book)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
return;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- source_menu = glade_xml_get_widget (editor->gui, "source-option-menu-source");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- source = e_book_get_source (editor->target_book);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ source_menu = glade_xml_get_widget (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ editor->gui, "source-combo-box-source");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- e_source_option_menu_select (E_SOURCE_OPTION_MENU (source_menu), source);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_source_combo_box_set_active (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ E_SOURCE_COMBO_BOX (source_menu),
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_book_get_source (editor->target_book));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
static void
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -2525,13 +2526,15 @@ new_target_cb (EBook *new_book, EBookSta
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
editor->load_book = NULL;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (status != E_BOOK_ERROR_OK || new_book == NULL) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- GtkWidget *source_option_menu;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ GtkWidget *source_combo_box;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
eab_load_error_dialog (NULL, e_book_get_source (new_book), status);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- source_option_menu = glade_xml_get_widget (editor->gui, "source-option-menu-source");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- e_source_option_menu_select (E_SOURCE_OPTION_MENU (source_option_menu),
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- e_book_get_source (editor->target_book));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ source_combo_box = glade_xml_get_widget (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ editor->gui, "source-combo-box-source");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_source_combo_box_set_active (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ E_SOURCE_COMBO_BOX (source_combo_box),
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_book_get_source (editor->target_book));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (new_book)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
g_object_unref (new_book);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -2555,8 +2558,12 @@ cancel_load (EContactEditor *editor)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
static void
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-source_selected (GtkWidget *source_option_menu, ESource *source, EContactEditor *editor)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+source_changed (ESourceComboBox *source_combo_box, EContactEditor *editor)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
{
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ ESource *source;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ source = e_source_combo_box_get_active (source_combo_box);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
cancel_load (editor);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (e_source_equal (e_book_get_source (editor->target_book), source))
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -3329,8 +3336,8 @@ e_contact_editor_init (EContactEditor *e
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
g_signal_connect (widget, "clicked", G_CALLBACK (full_name_clicked), e_contact_editor);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
widget = glade_xml_get_widget(e_contact_editor->gui, "button-categories");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
g_signal_connect (widget, "clicked", G_CALLBACK (categories_clicked), e_contact_editor);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- widget = glade_xml_get_widget (e_contact_editor->gui, "source-option-menu-source");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- g_signal_connect (widget, "source_selected", G_CALLBACK (source_selected), e_contact_editor);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ widget = glade_xml_get_widget (e_contact_editor->gui, "source-combo-box-source");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ g_signal_connect (widget, "changed", G_CALLBACK (source_changed), e_contact_editor);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
label = glade_xml_get_widget (e_contact_editor->gui, "where-label");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
widget = glade_xml_get_widget (e_contact_editor->gui, "button-ok");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -3781,25 +3788,25 @@ e_contact_editor_create_web(gchar *name,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GtkWidget *
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-e_contact_editor_create_source_option_menu (gchar *name,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gchar *string1, gchar *string2,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gint int1, gint int2);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+e_contact_editor_create_source_combo_box (gchar *name,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ gchar *string1, gchar *string2,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ gint int1, gint int2);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GtkWidget *
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-e_contact_editor_create_source_option_menu (gchar *name,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gchar *string1, gchar *string2,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gint int1, gint int2)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+e_contact_editor_create_source_combo_box (gchar *name,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ gchar *string1, gchar *string2,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ gint int1, gint int2)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
{
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- GtkWidget *menu;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ GtkWidget *combo_box;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GConfClient *gconf_client;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
ESourceList *source_list;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
gconf_client = gconf_client_get_default ();
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- menu = e_source_option_menu_new (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ combo_box = e_source_combo_box_new (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
g_object_unref (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gtk_widget_show (menu);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- return menu;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gtk_widget_show (combo_box);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ return combo_box;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
diff -up evolution-2.10.3/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box evolution-2.10.3/addressbook/gui/contact-editor/e-contact-quick-add.c
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
--- evolution-2.10.3/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box 2007-04-09 09:07:40.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
+++ evolution-2.10.3/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-08-30 09:59:24.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
@@ -37,7 +37,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libgnomeui/gnome-app.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libebook/e-book.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libebook/e-contact.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-#include <libedataserverui/e-source-option-menu.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+#include <libedataserverui/e-source-combo-box.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <addressbook/gui/component/addressbook.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <addressbook/util/eab-book-util.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include "e-contact-editor.h"
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -267,8 +267,12 @@ clicked_cb (GtkWidget *w, gint button, g
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
static void
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-source_selected (GtkWidget *source_option_menu, ESource *source, QuickAdd *qa)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+source_changed (ESourceComboBox *source_combo_box, QuickAdd *qa)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
{
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ ESource *source;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ source = e_source_combo_box_get_active (source_combo_box);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (qa->book) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
g_object_unref (qa->book);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
qa->book = NULL;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -317,16 +321,20 @@ build_quick_add_dialog (QuickAdd *qa)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
gconf_client = gconf_client_get_default ();
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- qa->option_menu = e_source_option_menu_new (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ qa->option_menu = e_source_combo_box_new (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
book = e_book_new_default_addressbook (NULL);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- e_source_option_menu_select (E_SOURCE_OPTION_MENU (qa->option_menu), e_book_get_source(book));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_source_combo_box_set_active (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ E_SOURCE_COMBO_BOX (qa->option_menu),
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_book_get_source (book));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (qa->book) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
g_object_unref (qa->book);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
qa->book = NULL;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
qa->book = book ;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- source_selected(qa->option_menu, e_source_option_menu_peek_selected ((ESourceOptionMenu *)qa->option_menu), qa);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- g_signal_connect (qa->option_menu, "source_selected", G_CALLBACK (source_selected), qa);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ source_changed (E_SOURCE_COMBO_BOX (qa->option_menu), qa);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ g_signal_connect (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ qa->option_menu, "changed",
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ G_CALLBACK (source_changed), qa);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
g_object_unref (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
diff -up evolution-2.10.3/calendar/gui/dialogs/memo-page.glade.e-source-combo-box evolution-2.10.3/calendar/gui/dialogs/memo-page.glade
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
--- evolution-2.10.3/calendar/gui/dialogs/memo-page.glade.e-source-combo-box 2007-04-09 09:10:28.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
+++ evolution-2.10.3/calendar/gui/dialogs/memo-page.glade 2007-08-30 09:59:24.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
@@ -141,7 +141,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<child>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<widget class="Custom" id="source">
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<property name="visible">True</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- <property name="creation_function">memo_page_create_source_option_menu</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ <property name="creation_function">memo_page_create_source_combo_box</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<property name="int1">0</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<property name="int2">0</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<property name="last_modification_time">Tue, 13 Jan 2004 22:00:00 GMT</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
diff -up evolution-2.10.3/calendar/gui/dialogs/event-page.glade.e-source-combo-box evolution-2.10.3/calendar/gui/dialogs/event-page.glade
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
--- evolution-2.10.3/calendar/gui/dialogs/event-page.glade.e-source-combo-box 2007-05-27 13:58:15.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
+++ evolution-2.10.3/calendar/gui/dialogs/event-page.glade 2007-08-30 09:59:24.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -775,7 +775,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<child>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<widget class="Custom" id="source">
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<property name="visible">True</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- <property name="creation_function">event_page_create_source_option_menu</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ <property name="creation_function">event_page_create_source_combo_box</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<property name="int1">0</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<property name="int2">0</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<property name="last_modification_time">Wed, 17 Dec 2003 18:20:26 GMT</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
diff -up evolution-2.10.3/calendar/gui/dialogs/task-page.glade.e-source-combo-box evolution-2.10.3/calendar/gui/dialogs/task-page.glade
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
--- evolution-2.10.3/calendar/gui/dialogs/task-page.glade.e-source-combo-box 2007-04-09 09:10:28.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
+++ evolution-2.10.3/calendar/gui/dialogs/task-page.glade 2007-08-30 09:59:24.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
@@ -618,7 +618,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<widget class="Custom" id="source">
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<property name="height_request">24</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<property name="visible">True</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- <property name="creation_function">task_page_create_source_option_menu</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ <property name="creation_function">task_page_create_source_combo_box</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<property name="int1">0</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<property name="int2">0</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
<property name="last_modification_time">Thu, 18 Dec 2003 01:58:48 GMT</property>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
diff -up evolution-2.10.3/calendar/gui/dialogs/memo-page.c.e-source-combo-box evolution-2.10.3/calendar/gui/dialogs/memo-page.c
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
--- evolution-2.10.3/calendar/gui/dialogs/memo-page.c.e-source-combo-box 2007-04-09 09:10:28.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
+++ evolution-2.10.3/calendar/gui/dialogs/memo-page.c 2007-08-30 09:59:24.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
@@ -35,7 +35,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <gtk/gtkmessagedialog.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libgnome/gnome-i18n.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <glade/glade.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-#include <libedataserverui/e-source-option-menu.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+#include <libedataserverui/e-source-combo-box.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libedataserverui/e-name-selector.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libedataserverui/e-name-selector-entry.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libedataserverui/e-name-selector-list.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -339,7 +339,6 @@ memo_page_fill_widgets (CompEditorPage *
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
ECalComponentDateTime d;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GSList *l;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
const char *categories;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- ESource *source;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
mpage = MEMO_PAGE (page);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
priv = mpage->priv;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -432,8 +431,9 @@ memo_page_fill_widgets (CompEditorPage *
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
/* Source */
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- source = e_cal_get_source (page->client);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), source);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_source_combo_box_set_active (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ E_SOURCE_COMBO_BOX (priv->source_selector),
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_cal_get_source (page->client));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
priv->updating = FALSE;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -844,13 +844,12 @@ field_changed_cb (GtkWidget *widget, gpo
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
static void
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-source_changed_cb (GtkWidget *widget, ESource *source, gpointer data)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+source_changed_cb (ESourceComboBox *source_combo_box, MemoPage *mpage)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
{
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- MemoPage *mpage;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- MemoPagePrivate *priv;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ MemoPagePrivate *priv = mpage->priv;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ ESource *source;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- mpage = MEMO_PAGE (data);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- priv = mpage->priv;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ source = e_source_combo_box_get_active (source_combo_box);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (!priv->updating) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
ECal *client;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -862,8 +861,9 @@ source_changed_cb (GtkWidget *widget, ES
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (client)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
g_object_unref (client);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector),
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- e_cal_get_source (COMP_EDITOR_PAGE (mpage)->client));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_source_combo_box_set_active (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ E_SOURCE_COMBO_BOX (priv->source_selector),
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_cal_get_source (COMP_EDITOR_PAGE (mpage)->client));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -973,7 +973,7 @@ init_widgets (MemoPage *mpage)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
G_CALLBACK (categories_clicked_cb), mpage);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
/* Source selector */
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- g_signal_connect((priv->source_selector), "source_selected",
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ g_signal_connect((priv->source_selector), "changed",
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
G_CALLBACK (source_changed_cb), mpage);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
/* Connect the default signal handler to use to make sure the "changed"
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -1167,21 +1167,22 @@ memo_page_create_date_edit (void)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
return dedit;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-GtkWidget *memo_page_create_source_option_menu (void);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+GtkWidget *memo_page_create_source_combo_box (void);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GtkWidget *
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-memo_page_create_source_option_menu (void)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+memo_page_create_source_combo_box (void)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
{
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- GtkWidget *menu;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ GtkWidget *combo_box;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GConfClient *gconf_client;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
ESourceList *source_list;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
gconf_client = gconf_client_get_default ();
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/memos/sources");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ source_list = e_source_list_new_for_gconf (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gconf_client, "/apps/evolution/memos/sources");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- menu = e_source_option_menu_new (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ combo_box = e_source_combo_box_new (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
g_object_unref (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gtk_widget_show (menu);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- return menu;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gtk_widget_show (combo_box);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ return combo_box;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
diff -up evolution-2.10.3/calendar/gui/dialogs/event-page.c.e-source-combo-box evolution-2.10.3/calendar/gui/dialogs/event-page.c
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
--- evolution-2.10.3/calendar/gui/dialogs/event-page.c.e-source-combo-box 2007-08-30 09:59:22.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
+++ evolution-2.10.3/calendar/gui/dialogs/event-page.c 2007-08-30 09:59:24.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
@@ -33,7 +33,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <gdk/gdkkeysyms.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libgnome/gnome-i18n.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <glade/glade.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-#include <libedataserverui/e-source-option-menu.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+#include <libedataserverui/e-source-combo-box.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include "common/authentication.h"
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include "e-util/e-categories-config.h"
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include "e-util/e-dialog-widgets.h"
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -967,7 +967,6 @@ event_page_fill_widgets (CompEditorPage
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
ECalComponentDateTime start_date, end_date;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
const char *location, *uid = NULL;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
const char *categories;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- ESource *source;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GSList *l;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
gboolean validated = TRUE;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -1163,8 +1162,9 @@ event_page_fill_widgets (CompEditorPage
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
e_dialog_editable_set (priv->categories, categories);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
/* Source */
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- source = e_cal_get_source (page->client);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), source);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_source_combo_box_set_active (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ E_SOURCE_COMBO_BOX (priv->source_selector),
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_cal_get_source (page->client));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
e_cal_component_get_uid (comp, &uid);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (!(COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -2566,7 +2566,8 @@ event_page_sendoptions_clicked_cb (Event
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (!priv->sod) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
priv->sod = e_sendoptions_dialog_new ();
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- source = e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (priv->source_selector));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ source = e_source_combo_box_get_active (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ E_SOURCE_COMBO_BOX (priv->source_selector));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
e_sendoptions_utils_set_default_data (priv->sod, source, "calendar");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
priv->sod->data->initialized = TRUE;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -2595,13 +2596,12 @@ field_changed_cb (GtkWidget *widget, gpo
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
static void
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-source_changed_cb (GtkWidget *widget, ESource *source, gpointer data)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+source_changed_cb (ESourceComboBox *source_combo_box, EventPage *epage)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
{
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- EventPage *epage;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- EventPagePrivate *priv;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ EventPagePrivate *priv = epage->priv;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ ESource *source;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- epage = EVENT_PAGE (data);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- priv = epage->priv;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ source = e_source_combo_box_get_active (source_combo_box);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (!priv->updating) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
ECal *client;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -2620,8 +2620,9 @@ source_changed_cb (GtkWidget *widget, ES
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (client)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
g_object_unref (client);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector),
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- e_cal_get_source (COMP_EDITOR_PAGE (epage)->client));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_source_combo_box_set_active (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ E_SOURCE_COMBO_BOX (priv->source_selector),
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_cal_get_source (COMP_EDITOR_PAGE (epage)->client));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -2847,7 +2848,7 @@ init_widgets (EventPage *epage)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
G_CALLBACK (categories_clicked_cb), epage);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
/* Source selector */
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- g_signal_connect((priv->source_selector), "source_selected",
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ g_signal_connect((priv->source_selector), "changed",
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
G_CALLBACK (source_changed_cb), epage);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
/* Alarms */
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
priv->alarm_list_store = e_alarm_list_new ();
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -3148,23 +3149,24 @@ make_timezone_entry (void)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
return w;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-GtkWidget *event_page_create_source_option_menu (void);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+GtkWidget *event_page_create_source_combo_box (void);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GtkWidget *
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-event_page_create_source_option_menu (void)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+event_page_create_source_combo_box (void)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
{
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- GtkWidget *menu;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ GtkWidget *combo_box;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GConfClient *gconf_client;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
ESourceList *source_list;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
gconf_client = gconf_client_get_default ();
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/calendar/sources");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ source_list = e_source_list_new_for_gconf (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gconf_client, "/apps/evolution/calendar/sources");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- menu = e_source_option_menu_new (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ combo_box = e_source_combo_box_new (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
g_object_unref (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gtk_widget_show (menu);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- return menu;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gtk_widget_show (combo_box);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ return combo_box;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GtkWidget *make_status_icons (void);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
diff -up evolution-2.10.3/calendar/gui/dialogs/task-page.c.e-source-combo-box evolution-2.10.3/calendar/gui/dialogs/task-page.c
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
--- evolution-2.10.3/calendar/gui/dialogs/task-page.c.e-source-combo-box 2007-04-09 09:10:28.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
+++ evolution-2.10.3/calendar/gui/dialogs/task-page.c 2007-08-30 09:59:24.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
@@ -35,7 +35,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <gtk/gtkmessagedialog.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libgnome/gnome-i18n.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <glade/glade.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-#include <libedataserverui/e-source-option-menu.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+#include <libedataserverui/e-source-combo-box.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <misc/e-dateedit.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <e-util/e-dialog-utils.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include "common/authentication.h"
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -513,7 +513,6 @@ task_page_fill_widgets (CompEditorPage *
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
icalcomponent *icalcomp;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
const char *categories, *uid;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
icaltimezone *zone, *default_zone;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- ESource *source;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
tpage = TASK_PAGE (page);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
priv = tpage->priv;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -657,8 +656,9 @@ task_page_fill_widgets (CompEditorPage *
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
e_dialog_editable_set (priv->categories, categories);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
/* Source */
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- source = e_cal_get_source (page->client);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), source);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_source_combo_box_set_active (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ E_SOURCE_COMBO_BOX (priv->source_selector),
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_cal_get_source (page->client));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (priv->is_assignment) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
ECalComponentOrganizer organizer;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -1617,13 +1617,12 @@ field_changed_cb (GtkWidget *widget, gpo
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
static void
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-source_changed_cb (GtkWidget *widget, ESource *source, gpointer data)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+source_changed_cb (ESourceComboBox *source_combo_box, TaskPage *tpage)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
{
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- TaskPage *tpage;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- TaskPagePrivate *priv;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ TaskPagePrivate *priv = tpage->priv;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ ESource *source;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- tpage = TASK_PAGE (data);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- priv = tpage->priv;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ source = e_source_combo_box_get_active (source_combo_box);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (!priv->updating) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
ECal *client;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -1642,8 +1641,9 @@ source_changed_cb (GtkWidget *widget, ES
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (client)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
g_object_unref (client);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector),
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- e_cal_get_source (COMP_EDITOR_PAGE (tpage)->client));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_source_combo_box_set_active (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ E_SOURCE_COMBO_BOX (priv->source_selector),
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_cal_get_source (COMP_EDITOR_PAGE (tpage)->client));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -1655,7 +1655,7 @@ source_changed_cb (GtkWidget *widget, ES
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
comp_editor_notify_client_changed (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
COMP_EDITOR (gtk_widget_get_toplevel (priv->main)),
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
client);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- field_changed_cb (widget, data);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ field_changed_cb (GTK_WIDGET (source_combo_box), tpage);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS) && priv->is_assignment)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
task_page_show_options (tpage);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
else
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -1679,7 +1679,8 @@ task_page_sendoptions_clicked_cb (TaskPa
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (!priv->sod) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
priv->sod = e_sendoptions_dialog_new ();
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
priv->sod->data->initialized = TRUE;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- source = e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (priv->source_selector));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ source = e_source_combo_box_get_active (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ E_SOURCE_COMBO_BOX (priv->source_selector));
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
e_sendoptions_utils_set_default_data (priv->sod, source, "task");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -1734,7 +1735,7 @@ init_widgets (TaskPage *tpage)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
G_CALLBACK (categories_clicked_cb), tpage);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
/* Source selector */
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- g_signal_connect((priv->source_selector), "source_selected",
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ g_signal_connect((priv->source_selector), "source_changed",
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
G_CALLBACK (source_changed_cb), tpage);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
/* Connect the default signal handler to use to make sure the "changed"
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -1955,21 +1956,23 @@ task_page_create_date_edit (void)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
return dedit;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-GtkWidget *task_page_create_source_option_menu (void);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+GtkWidget *task_page_create_source_combo_box (void);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GtkWidget *
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-task_page_create_source_option_menu (void)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+task_page_create_source_combo_box (void)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
{
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- GtkWidget *menu;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ GtkWidget *combo_box;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
GConfClient *gconf_client;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
ESourceList *source_list;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
gconf_client = gconf_client_get_default ();
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/tasks/sources");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ source_list = e_source_list_new_for_gconf (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gconf_client, "/apps/evolution/tasks/sources");
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- menu = e_source_option_menu_new (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ combo_box = e_source_combo_box_new (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
g_object_unref (source_list);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
+ g_object_unref (gconf_client);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gtk_widget_show (menu);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- return menu;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gtk_widget_show (combo_box);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ return combo_box;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
diff -up evolution-2.10.3/calendar/gui/e-itip-control.c.e-source-combo-box evolution-2.10.3/calendar/gui/e-itip-control.c
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
--- evolution-2.10.3/calendar/gui/e-itip-control.c.e-source-combo-box 2007-04-09 09:10:33.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
0e77303 |
+++ evolution-2.10.3/calendar/gui/e-itip-control.c 2007-08-30 09:59:24.000000000 -0400
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
@@ -44,7 +44,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <gtkhtml/gtkhtml-embedded.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <gtkhtml/gtkhtml-stream.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libedataserver/e-source-list.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-#include <libedataserverui/e-source-option-menu.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+#include <libedataserverui/e-source-combo-box.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libical/ical.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libecal/e-cal-component.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
#include <libecal/e-cal-time-util.h>
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -226,13 +226,13 @@ typedef struct {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
} EItipControlFindData;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
static void
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-source_selected_cb (ESourceOptionMenu *esom, ESource *source, gpointer data)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+source_changed_cb (ESourceComboBox *escb, EItipControl *itip)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
{
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- EItipControl *itip = data;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- EItipControlPrivate *priv;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
-
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- priv = itip->priv;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ EItipControlPrivate *priv = itip->priv;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ ESource *source;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ source = e_source_combo_box_get_active (escb);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (priv->ok)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
gtk_widget_set_sensitive (priv->ok, FALSE);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -273,7 +273,7 @@ find_cal_opened_cb (ECal *ecal, ECalenda
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
cleanup:
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (fd->count == 0) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (fd->show_selector && !priv->current_ecal && priv->vbox) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- GtkWidget *esom;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ GtkWidget *escb;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
char *uid;
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
switch (priv->type) {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
11e4fb1 |
@@ -297,17 +297,17 @@ find_cal_opened_cb (ECal *ecal, ECalenda
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (!source)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
source = e_source_list_peek_source_any (priv->source_lists[priv->type]);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- esom = e_source_option_menu_new (priv->source_lists[priv->type]);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- g_signal_connect_object (esom, "source_selected",
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- G_CALLBACK (source_selected_cb),
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- fd->itip, 0);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ escb = e_source_combo_box_new (priv->source_lists[priv->type]);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ g_signal_connect_object (
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ escb, "changed",
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ G_CALLBACK (source_changed_cb), fd->itip, 0);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gtk_box_pack_start (GTK_BOX (priv->vbox), esom, FALSE, TRUE, 0);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- gtk_widget_show (esom);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gtk_box_pack_start (GTK_BOX (priv->vbox), escb, FALSE, TRUE, 0);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ gtk_widget_show (escb);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
/* FIXME What if there is no source? */
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
if (source)
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
- e_source_option_menu_select (E_SOURCE_OPTION_MENU (esom), source);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
+ e_source_combo_box_set_active (E_SOURCE_COMBO_BOX (escb), source);
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
} else {
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
/* FIXME Display error message to user */
|
|
![](https://seccdn.libravatar.org/avatar/c9fb3a5716eb962b37e62519801a1ca5bc8e0db118c48b2bb748d8f5887f1030?s=16&d=retro) |
8c7c2b0 |
}
|