[Xfce4-commits] r26457 - in thunar/trunk: . thunar

[Benedikt Meurer]

Author: benny
Date: 2007-12-11 19:30:45 + (Tue, 11 Dec 2007)
New Revision: 26457

Modified:
   thunar/trunk/ChangeLog
   thunar/trunk/thunar/thunar-shortcuts-view.c
   thunar/trunk/thunar/thunar-tree-view.c
Log:
2007-12-11  Benedikt Meurer [EMAIL PROTECTED]

* thunar/thunar-shortcuts-view.c, thunar/thunar-tree-view.c:
  Display Eject in the context menu if the device of the
  volume requires an eject.




Modified: thunar/trunk/ChangeLog
===
--- thunar/trunk/ChangeLog  2007-12-10 22:27:15 UTC (rev 26456)
+++ thunar/trunk/ChangeLog  2007-12-11 19:30:45 UTC (rev 26457)
@@ -1,3 +1,9 @@
+2007-12-11 Benedikt Meurer [EMAIL PROTECTED]
+
+   * thunar/thunar-shortcuts-view.c, thunar/thunar-tree-view.c:
+ Display Eject in the context menu if the device of the
+ volume requires an eject.
+
 2007-12-03 Benedikt Meurer [EMAIL PROTECTED]
 
* thunar-vfs/thunar-vfs-exec.c: Make sure, processes spawned from

Modified: thunar/trunk/thunar/thunar-shortcuts-view.c
===
--- thunar/trunk/thunar/thunar-shortcuts-view.c 2007-12-10 22:27:15 UTC (rev 
26456)
+++ thunar/trunk/thunar/thunar-shortcuts-view.c 2007-12-11 19:30:45 UTC (rev 
26457)
@@ -834,13 +834,12 @@
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
   gtk_widget_show (item);
 
-  /* check if the volume is a disc */
-  if (thunar_vfs_volume_is_disc (volume))
+  /* check if the volume is ejectable */
+  if (thunar_vfs_volume_is_ejectable (volume))
 {
   /* append the Eject Volume menu action */
   item = gtk_image_menu_item_new_with_mnemonic (_(E_ject Volume));
   g_signal_connect_swapped (G_OBJECT (item), activate, G_CALLBACK 
(thunar_shortcuts_view_eject), view);
-  gtk_widget_set_sensitive (item, thunar_vfs_volume_is_ejectable 
(volume));
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
   gtk_widget_show (item);
 }

Modified: thunar/trunk/thunar/thunar-tree-view.c
===
--- thunar/trunk/thunar/thunar-tree-view.c  2007-12-10 22:27:15 UTC (rev 
26456)
+++ thunar/trunk/thunar/thunar-tree-view.c  2007-12-11 19:30:45 UTC (rev 
26457)
@@ -1041,13 +1041,12 @@
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
   gtk_widget_show (item);
 
-  /* check if the volume is a disc */
-  if (thunar_vfs_volume_is_disc (volume))
+  /* check if the volume is ejectable */
+  if (thunar_vfs_volume_is_ejectable (volume))
 {
   /* append the Eject Volume menu action */
   item = gtk_image_menu_item_new_with_mnemonic (_(E_ject Volume));
   g_signal_connect_swapped (G_OBJECT (item), activate, G_CALLBACK 
(thunar_tree_view_action_eject), view);
-  gtk_widget_set_sensitive (item, thunar_vfs_volume_is_ejectable 
(volume));
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
   gtk_widget_show (item);
 }

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r26458 - in xfcalendar/trunk: . src

[Juha Kautto]

Author: juha
Date: 2007-12-11 21:58:58 + (Tue, 11 Dec 2007)
New Revision: 26458

Modified:
   xfcalendar/trunk/NEWS
   xfcalendar/trunk/TODO
   xfcalendar/trunk/configure.in.in
   xfcalendar/trunk/src/event-list.c
   xfcalendar/trunk/src/ical-code.c
   xfcalendar/trunk/src/ical-code.h
   xfcalendar/trunk/src/interface.c
   xfcalendar/trunk/src/interface.h
   xfcalendar/trunk/src/main.c
   xfcalendar/trunk/src/parameters.c
   xfcalendar/trunk/src/parameters.h
Log:
made archiving a compile time option


Modified: xfcalendar/trunk/NEWS
===
--- xfcalendar/trunk/NEWS   2007-12-11 19:30:45 UTC (rev 26457)
+++ xfcalendar/trunk/NEWS   2007-12-11 21:58:58 UTC (rev 26458)
@@ -1,13 +1,3 @@
-20071002:
--
-* Orage version 4.5.9.7 released 
-* Day view added.
-
-20070519:
--
-* Orage version 4.5.9.5 released 
-* libnotify support added.
-
 20070104:
 -
 * Orage version 4.5.9 released 

Modified: xfcalendar/trunk/TODO
===
--- xfcalendar/trunk/TODO   2007-12-11 19:30:45 UTC (rev 26457)
+++ xfcalendar/trunk/TODO   2007-12-11 21:58:58 UTC (rev 26458)
@@ -40,10 +40,10 @@
 *** DONE 4.5 ***
 
 10) more alarm possibilities (like libnotify BUG 2831 and email)
-*** DONE 4.5 ***
+*** Partly DONE 4.5 ***
 
 11) Day, Week, Month view
-*** DONE 4.5 for day and week view ***
+*** Partly DONE 4.5 ***
 
 12) Exclude possiblity in repeating rule
 

Modified: xfcalendar/trunk/configure.in.in
===
--- xfcalendar/trunk/configure.in.in2007-12-11 19:30:45 UTC (rev 26457)
+++ xfcalendar/trunk/configure.in.in2007-12-11 21:58:58 UTC (rev 26458)
@@ -9,7 +9,7 @@
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.5.11.2-svn])
+m4_define([orage_version], [4.5.11.3-svn])
 
 m4_define([gtk_minimum_version], [2.6.0])
 m4_define([xfce_minimum_version], [4.4.0])
@@ -194,6 +194,20 @@
[notify_minimum_version], [libnotify], 
[LIBNOTIFY support])
 
+dnl 
+dnl *** Optional support for automatic archiving ***
+dnl 
+have_archive=no
+AC_ARG_ENABLE([archive],
+AC_HELP_STRING([--enable-archive], [use automatic archiving (defaut=yes)])
+AC_HELP_STRING([--disable-archive], [don't use automatic archiving]),
+  [], [enable_archive=yes])
+if test x$enable_archive = xyes; then
+AC_DEFINE([HAVE_ARCHIVE], [1], [Define to enable archiving])
+have_archive=yes
+fi
+
+
 dnl Check for debugging support
 dnl BM_DEBUG_SUPPORT()
 XDT_FEATURE_DEBUG
@@ -240,4 +254,5 @@
 else
 echo * LIBNOTIFY support: no
 fi
+echo * Automatic archiving:   $have_archive
 echo

Modified: xfcalendar/trunk/src/event-list.c
===
--- xfcalendar/trunk/src/event-list.c   2007-12-11 19:30:45 UTC (rev 26457)
+++ xfcalendar/trunk/src/event-list.c   2007-12-11 21:58:58 UTC (rev 26458)
@@ -90,29 +90,59 @@
 { STRING, 0, DRAG_TARGET_STRING }
 };
 
+static void start_appt_win(char *mode,  el_win *el
+, GtkTreeModel *model, GtkTreeIter *iter, GtkTreePath *path)
+{
+gchar *uid = NULL, *flags = NULL;
+appt_win *apptw;
+
+if (gtk_tree_model_get_iter(model, iter, path)) {
+gtk_tree_model_get(model, iter, COL_UID, uid, -1);
+#ifdef HAVE_ARCHIVE
+gtk_tree_model_get(model, iter, COL_FLAGS, flags, -1);
+if (flags  flags[3] == 'A') {
+xfical_unarchive_uid(uid);
+/* note that file id changes after archive */ 
+uid[0]='O';
+refresh_el_win(el);
+}
+g_free(flags);
+#endif
+apptw = create_appt_win(mode, uid, el);
+g_free(uid);
+}
+}
+
 static void editEvent(GtkTreeView *view, GtkTreePath *path
 , GtkTreeViewColumn *col, gpointer user_data)
 {
 el_win *el = (el_win *)user_data;
-appt_win *apptw;
 GtkTreeModel *model;
 GtkTreeIter   iter;
+/*
 gchar *uid = NULL, *flags = NULL;
+appt_win *apptw;
+*/
 
 model = gtk_tree_view_get_model(view);
+start_appt_win(UPDATE, el, model, iter, path);
+/*
 if (gtk_tree_model_get_iter(model, iter, path)) {
-gtk_tree_model_get(model, iter
-, COL_UID, uid, COL_FLAGS, flags, -1);
+gtk_tree_model_get(model, iter, COL_UID, uid, -1);
+#ifdef HAVE_ARCHIVE
+gtk_tree_model_get(model, iter, COL_FLAGS, flags, -1);
 if (flags  flags[3] == 'A') {
 xfical_unarchive_uid(uid);
-/* note that file id changes after archive */ 
+/ * note that file id changes after archive * / 
 uid[0]='O';
 refresh_el_win(el);
 }
+#endif
 apptw = create_appt_win(UPDATE, uid, el);
 g_free(uid);

[Xfce4-commits] r26459 - xfwm4/trunk/src

[Olivier Fourdan]

Author: olivier
Date: 2007-12-11 22:14:12 + (Tue, 11 Dec 2007)
New Revision: 26459

Modified:
   xfwm4/trunk/src/compositor.c
Log:
Avoid infinite loop when damaging the overlay window

Modified: xfwm4/trunk/src/compositor.c
===
--- xfwm4/trunk/src/compositor.c2007-12-11 21:58:58 UTC (rev 26458)
+++ xfwm4/trunk/src/compositor.c2007-12-11 22:14:12 UTC (rev 26459)
@@ -1947,7 +1947,11 @@
 new-shaped = is_shaped (display_info, id);
 new-viewable = (new-attr.map_state == IsViewable);
 
-if ((new-attr.class != InputOnly)  (id != screen_info-xroot))
+if ((new-attr.class != InputOnly)
+#if HAVE_OVERLAYS
+  ((!display_info-have_overlays) || (id != screen_info-overlay))
+#endif
+  (id != screen_info-output))
 {
 new-damage = XDamageCreate (display_info-dpy, id, 
XDamageReportNonEmpty);
 }

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits