[evolution-rss] fix interface files errors
- From: Lucian Langa <lucilanga src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-rss] fix interface files errors
- Date: Sun, 4 Apr 2010 09:26:04 +0000 (UTC)
commit bd19f21fdf45cd3f05efb20e9f41541b2024d1e3
Author: Lucian Langa <lucilanga gnome org>
Date: Sun Apr 4 12:22:26 2010 +0300
fix interface files errors
src/Makefile.am | 4 +-
src/rss-config-factory.c | 82 ++++++++++++++------
...-html-rendering.glade => rss-html-rendering.ui} | 20 ++----
src/{rss-ui.glade => rss-main.ui} | 77 +++++++++++-------
4 files changed, 114 insertions(+), 69 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index ee8429a..d445000 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -142,8 +142,8 @@ uninstall-local:
DISTCLEANFILES = $(schema_DATA)
glade_DATA = \
- rss-ui.glade \
- rss-html-rendering.glade
+ rss-main.ui \
+ rss-html-rendering.ui
BUILT_SOURCES = $(server_DATA)
CLEANFILES = $(BUILT_SOURCES) \
diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
index bbb9390..ec229b5 100644
--- a/src/rss-config-factory.c
+++ b/src/rss-config-factory.c
@@ -30,8 +30,12 @@
#include <gconf/gconf-client.h>
#include <gdk/gdkkeysyms.h>
+#if (DATASERVER_VERSION >= 2031001)
+#include <camel/camel.h>
+#else
#include <camel/camel-store.h>
#include <camel/camel-provider.h>
+#endif
#include <mail/em-config.h>
@@ -469,7 +473,7 @@ build_dialog_add(gchar *url, gchar *feed_text)
feed->enabled = TRUE;
gladefile = g_build_filename (EVOLUTION_GLADEDIR,
- "rss-ui.glade",
+ "rss-main.ui",
NULL);
gui = gtk_builder_new ();
if (!gtk_builder_add_from_file (gui, gladefile, &error)) {
@@ -2909,12 +2913,15 @@ export_cb (GtkWidget *widget, gpointer data)
if (g_hash_table_size(rf->hrname)<1) {
#if EVOLUTION_VERSION < 22904
e_error_run(GTK_WINDOW(export),
+ "org-gnome-evolution-rss:generr",
+ _("No RSS feeds configured!\nUnable to export."),
+ NULL);
#else
e_alert_run_dialog_for_args(GTK_WINDOW(export),
-#endif
"org-gnome-evolution-rss:generr",
_("No RSS feeds configured!\nUnable to export."),
NULL);
+#endif
return;
}
gtk_widget_show(export);
@@ -2966,11 +2973,11 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
gdouble adj;
GError* error = NULL;
gchar *toplevel[] = {(gchar *)"settingsbox", NULL};
-
+ GtkAdjustment *adjustment;
gladefile = g_build_filename (EVOLUTION_GLADEDIR,
- "rss-html-rendering.glade",
+ "rss-html-rendering.ui",
NULL);
ui->xml = gtk_builder_new ();
if (!gtk_builder_add_objects_from_file (ui->xml, gladefile, toplevel, &error)) {
@@ -3045,21 +3052,26 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
gtk_builder_get_object(ui->xml, "enable_java"));
gtk_toggle_button_set_active (
GTK_TOGGLE_BUTTON (ui->check),
- gconf_client_get_bool(rss_gconf, GCONF_KEY_HTML_JAVA, NULL));
+ gconf_client_get_bool(
+ rss_gconf, GCONF_KEY_HTML_JAVA, NULL));
g_signal_connect(ui->check,
"clicked",
G_CALLBACK(start_check_cb),
(gpointer)GCONF_KEY_HTML_JAVA);
- ui->check = GTK_WIDGET (gtk_builder_get_object(ui->xml, "image_resize"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ui->check),
- gconf_client_get_bool(rss_gconf, GCONF_KEY_IMAGE_RESIZE, NULL));
+ ui->check = GTK_WIDGET (
+ gtk_builder_get_object(ui->xml, "image_resize"));
+ gtk_toggle_button_set_active (
+ GTK_TOGGLE_BUTTON (ui->check),
+ gconf_client_get_bool(
+ rss_gconf, GCONF_KEY_IMAGE_RESIZE, NULL));
g_signal_connect(ui->check,
"clicked",
G_CALLBACK(start_check_cb),
(gpointer)GCONF_KEY_IMAGE_RESIZE);
- ui->check = GTK_WIDGET (gtk_builder_get_object(ui->xml, "enable_js"));
+ ui->check = GTK_WIDGET (
+ gtk_builder_get_object(ui->xml, "enable_js"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ui->check),
gconf_client_get_bool(rss_gconf, GCONF_KEY_HTML_JS, NULL));
g_signal_connect(ui->check,
@@ -3067,14 +3079,18 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
G_CALLBACK(start_check_cb),
(gpointer)GCONF_KEY_HTML_JS);
- ui->check = GTK_WIDGET (gtk_builder_get_object(ui->xml, "accept_cookies"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ui->check),
- gconf_client_get_bool(rss_gconf, GCONF_KEY_ACCEPT_COOKIES, NULL));
+ ui->check = GTK_WIDGET (
+ gtk_builder_get_object(ui->xml, "accept_cookies"));
+ gtk_toggle_button_set_active (
+ GTK_TOGGLE_BUTTON (ui->check),
+ gconf_client_get_bool(
+ rss_gconf, GCONF_KEY_ACCEPT_COOKIES, NULL));
g_signal_connect(ui->check,
"clicked",
G_CALLBACK(accept_cookies_cb),
ui->import);
- ui->import = GTK_WIDGET (gtk_builder_get_object(ui->xml, "import_cookies"));
+ ui->import = GTK_WIDGET (
+ gtk_builder_get_object(ui->xml, "import_cookies"));
//we have to have ui->import looked up
#if LIBSOUP_VERSION >= 2026000
@@ -3088,13 +3104,26 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
gtk_widget_set_sensitive(ui->check, FALSE);
#endif
- ui->nettimeout = GTK_WIDGET (gtk_builder_get_object(ui->xml, "nettimeout"));
+ ui->nettimeout = GTK_WIDGET (
+ gtk_builder_get_object(
+ ui->xml, "nettimeout"));
+ /*setup the adjustment*/
+ adjustment = (GtkAdjustment *)gtk_adjustment_new(
+ NETWORK_MIN_TIMEOUT,
+ NETWORK_MIN_TIMEOUT,
+ 3600,
+ 1,
+ 1,
+ 0);
+ gtk_spin_button_set_adjustment(
+ (GtkSpinButton *)ui->nettimeout,
+ adjustment);
adj = gconf_client_get_float(
rss_gconf,
GCONF_KEY_NETWORK_TIMEOUT,
NULL);
if (adj < NETWORK_MIN_TIMEOUT) {
- adj = 60;
+ adj = NETWORK_MIN_TIMEOUT;
gconf_client_set_float (
rss_gconf,
GCONF_KEY_NETWORK_TIMEOUT,
@@ -3102,7 +3131,8 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
NULL);
}
if (adj)
- gtk_spin_button_set_value((GtkSpinButton *)ui->nettimeout, adj);
+ gtk_spin_button_set_value(
+ (GtkSpinButton *)ui->nettimeout, adj);
g_signal_connect(
ui->nettimeout,
"changed",
@@ -3115,21 +3145,27 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
ui->nettimeout);
//feed notification
- ui->check = GTK_WIDGET (gtk_builder_get_object(ui->xml, "status_icon"));
+ ui->check = GTK_WIDGET (
+ gtk_builder_get_object(ui->xml, "status_icon"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ui->check),
- gconf_client_get_bool(rss_gconf, GCONF_KEY_STATUS_ICON, NULL));
+ gconf_client_get_bool(
+ rss_gconf, GCONF_KEY_STATUS_ICON, NULL));
g_signal_connect(ui->check,
"clicked",
G_CALLBACK(start_check_cb),
(gpointer)GCONF_KEY_STATUS_ICON);
- ui->check = GTK_WIDGET (gtk_builder_get_object(ui->xml, "blink_icon"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ui->check),
- gconf_client_get_bool(rss_gconf, GCONF_KEY_BLINK_ICON, NULL));
+ ui->check = GTK_WIDGET (
+ gtk_builder_get_object(ui->xml, "blink_icon"));
+ gtk_toggle_button_set_active (
+ GTK_TOGGLE_BUTTON (ui->check),
+ gconf_client_get_bool(
+ rss_gconf, GCONF_KEY_BLINK_ICON, NULL));
g_signal_connect(ui->check,
"clicked",
G_CALLBACK(start_check_cb),
(gpointer)GCONF_KEY_BLINK_ICON);
- ui->check = GTK_WIDGET (gtk_builder_get_object(ui->xml, "feed_icon"));
+ ui->check = GTK_WIDGET (
+ gtk_builder_get_object(ui->xml, "feed_icon"));
gtk_toggle_button_set_active (
GTK_TOGGLE_BUTTON (ui->check),
gconf_client_get_bool(rss_gconf, GCONF_KEY_FEED_ICON, NULL));
@@ -3427,7 +3463,7 @@ rss_config_control_new (void)
gladefile = g_build_filename (
EVOLUTION_GLADEDIR,
- "rss-ui.glade",
+ "rss-main.ui",
NULL);
sf->gui = gtk_builder_new ();
if (!gtk_builder_add_from_file (sf->gui, gladefile, &error)) {
diff --git a/src/rss-html-rendering.glade b/src/rss-html-rendering.ui
similarity index 96%
rename from src/rss-html-rendering.glade
rename to src/rss-html-rendering.ui
index 6b0f71f..501830c 100644
--- a/src/rss-html-rendering.glade
+++ b/src/rss-html-rendering.ui
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkWindow" id="window1">
<child>
<object class="GtkVBox" id="settingsbox">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkFrame" id="html-rendering">
<property name="visible">True</property>
@@ -18,6 +18,7 @@
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkHBox" id="hbox1">
@@ -48,6 +49,7 @@
<child>
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkCheckButton" id="checkbutton1">
<property name="label" translatable="yes">Block pop-up windows</property>
@@ -108,7 +110,7 @@
<property name="label" translatable="yes">Import Cookies</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="receives_default">True</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -159,7 +161,7 @@
<object class="GtkSpinButton" id="nettimeout">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">adjustment1</property>
+ <property name="invisible_char">●</property>
<property name="climb_rate">1</property>
</object>
<packing>
@@ -211,6 +213,7 @@
<child>
<object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkCheckButton" id="status_icon">
<property name="label" translatable="yes">Show icon in notification area</property>
@@ -272,18 +275,7 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
- <object class="GtkAdjustment" id="adjustment1">
- <property name="value">60</property>
- <property name="lower">60</property>
- <property name="upper">3600</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
</interface>
diff --git a/src/rss-ui.glade b/src/rss-main.ui
similarity index 96%
rename from src/rss-ui.glade
rename to src/rss-main.ui
index b614a79..23b2f90 100644
--- a/src/rss-ui.glade
+++ b/src/rss-main.ui
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkListStore" id="liststore1">
<columns>
@@ -29,6 +28,7 @@
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
<property name="border_width">6</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox6">
@@ -60,6 +60,7 @@
<child>
<object class="GtkVButtonBox" id="vbuttonbox1">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>
<child>
@@ -232,10 +233,12 @@
<child>
<object class="GtkVBox" id="vbox_HTML">
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkVBox" id="vbox24">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label94">
<property name="visible">True</property>
@@ -251,6 +254,7 @@
<child>
<object class="GtkVBox" id="vbox25">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkHBox" id="hbox17">
@@ -350,10 +354,12 @@
<object class="GtkVBox" id="vbox12">
<property name="visible">True</property>
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkVBox" id="vbox13">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label80">
@@ -370,6 +376,7 @@
<child>
<object class="GtkVBox" id="vbox14">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="hbox15">
<property name="visible">True</property>
@@ -404,7 +411,7 @@
<child>
<object class="GtkLabel" id="label78">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="to translators: label part of Check for new articles every X minutes" message">minutes</property>
+ <property comments="to translators: label part of Check for new articles every X minutes" message" name="label" translatable="yes">minutes</property>
</object>
<packing>
<property name="expand">False</property>
@@ -505,10 +512,12 @@
<child>
<object class="GtkVBox" id="vbox_NETWORK">
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkVBox" id="vbox18">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">15</property>
<property name="homogeneous">True</property>
<child>
@@ -539,8 +548,8 @@
<property name="label" translatable="yes">HTTP proxy:</property>
</object>
<packing>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -551,7 +560,7 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -562,8 +571,8 @@
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -576,7 +585,7 @@
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -590,8 +599,8 @@
<packing>
<property name="left_attach">4</property>
<property name="right_attach">5</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -603,8 +612,8 @@
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -617,7 +626,7 @@
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -664,10 +673,12 @@
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox4">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkVBox" id="vbox21">
<property name="visible">True</property>
<property name="border_width">15</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkCheckButton" id="proxy_auth">
<property name="label" translatable="yes">Use authentication</property>
@@ -696,8 +707,8 @@
<property name="label" translatable="yes">Username:</property>
</object>
<packing>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -709,8 +720,8 @@
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -721,7 +732,7 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -735,7 +746,7 @@
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
</object>
@@ -806,6 +817,7 @@
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox5">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">24</property>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area5">
@@ -862,9 +874,11 @@
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox6">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkVBox" id="vbox22">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label92">
<property name="visible">True</property>
@@ -950,12 +964,13 @@
<property name="modal">True</property>
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
- <property name="show_hidden">True</property>
<property name="local_only">False</property>
<property name="action">save</property>
+ <property name="show_hidden">True</property>
<child internal-child="vbox">
<object class="GtkVBox" id="vbox26">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">24</property>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="hbuttonbox1">
@@ -1016,10 +1031,12 @@
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox9">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">20</property>
<child>
<object class="GtkVBox" id="vbox2">
@@ -1041,7 +1058,7 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1078,7 +1095,7 @@
<packing>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1371,7 +1388,7 @@
<child>
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="To translators: this label is part of the following message: "Delete all but the last X messages.">messages</property>
+ <property comments="To translators: this label is part of the following message: "Delete all but the last X messages." name="label" translatable="yes">messages</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1423,7 +1440,7 @@
<child>
<object class="GtkLabel" id="label13">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="for translators: this label is part of the "Delete articles older than X days" message.">days</property>
+ <property comments="for translators: this label is part of the "Delete articles older than X days" message." name="label" translatable="yes">days</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1510,8 +1527,8 @@
<property name="label" translatable="yes">Username:</property>
</object>
<packing>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1523,7 +1540,7 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1538,7 +1555,7 @@
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1550,8 +1567,8 @@
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
