evolution-rss r294 - trunk/src
- From: lucilanga svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution-rss r294 - trunk/src
- Date: Tue, 17 Jun 2008 05:36:48 +0000 (UTC)
Author: lucilanga
Date: Tue Jun 17 05:36:47 2008
New Revision: 294
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=294&view=rev
Log:
2008-06-15 Lucian Langa <lucilanga gnome org>
* redesigned add/edit feed dialog and
moved to glade xml file
Modified:
trunk/src/rss-config-factory.c
trunk/src/rss-ui.glade
trunk/src/rss.c
Modified: trunk/src/rss-config-factory.c
==============================================================================
--- trunk/src/rss-config-factory.c (original)
+++ trunk/src/rss-config-factory.c Tue Jun 17 05:36:47 2008
@@ -273,6 +273,7 @@
guint del_feed = 0;
guint del_days = 10;
guint del_messages = 10;
+ GtkAccelGroup *accel_group = gtk_accel_group_new ();
gladefile = g_build_filename (EVOLUTION_GLADEDIR,
"rss-ui.glade",
@@ -281,6 +282,7 @@
g_free (gladefile);
GtkWidget *dialog1 = (GtkWidget *)glade_xml_get_widget (gui, "feed_dialog");
+ gtk_widget_show(dialog1);
gtk_window_set_keep_above(GTK_WINDOW(dialog1), TRUE);
if (text != NULL)
gtk_window_set_title (GTK_WINDOW (dialog1), _("Edit Feed"));
@@ -369,6 +371,23 @@
GtkWidget *checkbutton4 = (GtkWidget *)glade_xml_get_widget (gui, "storage_unread");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton4), del_unread);
+ GtkWidget *ok = (GtkWidget *)glade_xml_get_widget (gui, "ok_button");
+ gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), ok, GTK_RESPONSE_OK);
+ GTK_WIDGET_SET_FLAGS (ok, GTK_CAN_DEFAULT);
+
+ GtkWidget *cancel = (GtkWidget *)glade_xml_get_widget (gui, "cancel_button");
+ gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), cancel, GTK_RESPONSE_CANCEL);
+ GTK_WIDGET_SET_FLAGS (cancel, GTK_CAN_DEFAULT);
+
+ gtk_widget_add_accelerator (ok, "activate", accel_group,
+ GDK_Return, (GdkModifierType) 0,
+ GTK_ACCEL_VISIBLE);
+ gtk_widget_add_accelerator (ok, "activate", accel_group,
+ GDK_KP_Enter, (GdkModifierType) 0,
+ GTK_ACCEL_VISIBLE);
+ gtk_window_add_accel_group (GTK_WINDOW (dialog1), accel_group);
+
+
gint result = gtk_dialog_run(GTK_DIALOG(dialog1));
switch (result)
{
Modified: trunk/src/rss-ui.glade
==============================================================================
--- trunk/src/rss-ui.glade (original)
+++ trunk/src/rss-ui.glade Tue Jun 17 05:36:47 2008
@@ -495,34 +495,42 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="label84">
+ <widget class="GtkEntry" id="entry8">
<property name="visible">True</property>
- <property name="label" translatable="yes">HTTP proxy:</property>
+ <property name="can_focus">True</property>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="host_proxy">
+ <widget class="GtkLabel" id="label91">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">No proxy for:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label85">
+ <widget class="GtkButton" id="details">
<property name="visible">True</property>
- <property name="label" translatable="yes">Port:</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Details</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@@ -541,43 +549,35 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="details">
+ <widget class="GtkLabel" id="label85">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Details</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
+ <property name="label" translatable="yes">Port:</property>
</widget>
<packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label91">
+ <widget class="GtkEntry" id="host_proxy">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">No proxy for:</property>
+ <property name="can_focus">True</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry8">
+ <widget class="GtkLabel" id="label84">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="label" translatable="yes">HTTP proxy:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -641,26 +641,16 @@
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkLabel" id="label89">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Username:</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label90">
+ <widget class="GtkEntry" id="proxy_pass">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Password: </property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -676,16 +666,26 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="proxy_pass">
+ <widget class="GtkLabel" id="label90">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Password: </property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label89">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Username:</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1300,6 +1300,7 @@
<widget class="GtkDialog" id="feed_dialog">
<property name="border_width">5</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="destroy_with_parent">True</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@@ -1646,7 +1647,7 @@
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="button7">
+ <widget class="GtkButton" id="cancel_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1656,7 +1657,7 @@
</widget>
</child>
<child>
- <widget class="GtkButton" id="button8">
+ <widget class="GtkButton" id="ok_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c (original)
+++ trunk/src/rss.c Tue Jun 17 05:36:47 2008
@@ -2413,8 +2413,8 @@
if (!deleted)
{
-// if (g_hash_table_lookup(rf->hrdel_feed, lookup_key(user_data)))
-// get_feed_age(user_data, lookup_key(user_data));
+ if (g_hash_table_lookup(rf->hrdel_feed, lookup_key(user_data)))
+ get_feed_age(user_data, lookup_key(user_data));
}
//tout:
@@ -4324,6 +4324,7 @@
CamelMessageInfo *info;
GPtrArray *uids;
guint i, j = 0, imax = 0;
+ guint q = 0;
guint32 flags;
time_t date, min_date = 0;
uids = camel_folder_get_uids (folder);
@@ -4339,11 +4340,11 @@
goto out;
if (flags & CAMEL_MESSAGE_SEEN)
{
-
- if (!j++)
+ if (!j)
{
min_date = date;
imax = i;
+ j++;
}
if (date < min_date)
{
@@ -4355,10 +4356,11 @@
{
if (unread)
{
- if (!j++)
+ if (!q)
{
min_date = date;
imax = i;
+ q++;
}
if (date < min_date)
{
@@ -4368,17 +4370,17 @@
}
}
}
-out: camel_message_info_free(info);
+ d(g_print("uid:%d j:%d/%d, imax:%d\n", i, j, q, imax));
+out: camel_message_info_free(info);
}
-// camel_folder_freeze(folder);
+ camel_folder_freeze(folder);
if (min_date)
{
- g_print("delete uid %d\n", imax);
camel_folder_delete_message (folder, uids->pdata[imax]);
}
// camel_folder_sync (folder, TRUE, NULL);
// camel_folder_expunge (folder, NULL);
- // camel_folder_thaw(folder);
+ camel_folder_thaw(folder);
while (gtk_events_pending())
gtk_main_iteration ();
camel_folder_free_uids (folder, uids);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
