[Xfce4-commits] r23093 - thunar/trunk
Author: benny Date: 2006-09-06 16:57:10 + (Wed, 06 Sep 2006) New Revision: 23093 Modified: thunar/trunk/ChangeLog thunar/trunk/configure.in.in Log: 2006-09-06 Benedikt Meurer [EMAIL PROTECTED] * configure.in.in: Fix typo, -DNDEBUG instead of -NDEBUG. Modified: thunar/trunk/ChangeLog === --- thunar/trunk/ChangeLog 2006-09-06 16:51:32 UTC (rev 23092) +++ thunar/trunk/ChangeLog 2006-09-06 16:57:10 UTC (rev 23093) @@ -1,3 +1,7 @@ +2006-09-06 Benedikt Meurer [EMAIL PROTECTED] + + * configure.in.in: Fix typo, -DNDEBUG instead of -NDEBUG. + 2006-09-05 Benedikt Meurer [EMAIL PROTECTED] * thunar/thunar-session-client.c(thunar_session_client_connect): Make Modified: thunar/trunk/configure.in.in === --- thunar/trunk/configure.in.in2006-09-06 16:51:32 UTC (rev 23092) +++ thunar/trunk/configure.in.in2006-09-06 16:57:10 UTC (rev 23093) @@ -311,7 +311,7 @@ AC_MSG_RESULT([$enable_debug]) dnl Disable debugging (release build) - PLATFORM_CPPFLAGS=$PLATFORM_CPPFLAGS -NDEBUG + PLATFORM_CPPFLAGS=$PLATFORM_CPPFLAGS -DNDEBUG dnl Disable object cast checks PLATFORM_CPPFLAGS=$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23094 - in installit/trunk: . backends tools
Author: jannis Date: 2006-09-06 17:03:51 + (Wed, 06 Sep 2006) New Revision: 23094 Modified: installit/trunk/ChangeLog installit/trunk/backends/Source.py installit/trunk/tools/env.py installit/trunk/tools/shell.py Log: * tools/env.py: Log linking errors to i2t.log. Use reversed prefix history for all path expansions (so that the latest used prefix is first in all environment variables). * tools/shell.py: Prepend, not append custom environment variables to the command environment. * backends/Source.py: Fix manual program and library resolving (lambda's caused some problems with wrong variables being passed). Append installation prefix of a package to the prefix history when installation was successful. Modified: installit/trunk/ChangeLog === --- installit/trunk/ChangeLog 2006-09-06 16:57:10 UTC (rev 23093) +++ installit/trunk/ChangeLog 2006-09-06 17:03:51 UTC (rev 23094) @@ -1,3 +1,15 @@ +2006-09-06 Jannis Pohlmann [EMAIL PROTECTED] + + * tools/env.py: Log linking errors to i2t.log. Use reversed prefix + history for all path expansions (so that the latest used prefix is + first in all environment variables). + * tools/shell.py: Prepend, not append custom environment variables to + the command environment. + * backends/Source.py: Fix manual program and library resolving (lambda's + caused some problems with wrong variables being passed). Append + installation prefix of a package to the prefix history when + installation was successful. + 2006-09-04 Jannis Pohlmann [EMAIL PROTECTED] * tools/pkgconfig.py: Move getCompilerFlags and getLinkerFlags methods Modified: installit/trunk/backends/Source.py === --- installit/trunk/backends/Source.py 2006-09-06 16:57:10 UTC (rev 23093) +++ installit/trunk/backends/Source.py 2006-09-06 17:03:51 UTC (rev 23094) @@ -663,9 +663,6 @@ # Sets of unresolved programs/libraries self.programs = set() self.libraries = set() - -self.locations = dict() -self.statusButtons = dict() def activate(self, wizard): SourceWizardPage.activate(self, wizard) @@ -680,9 +677,6 @@ self.box.add(container) container.show() -self.locations.clear() -self.statusButtons.clear() - # Determine programs this package depends on self.programs = self.package.dependencies.programs @@ -709,8 +703,9 @@ # Status button status = gtk.Button() -status.connect(clicked, lambda button: -self._locateProgram(program)) +status.connect(clicked, self._locateProgram) +status.program = program +status.status = status status.set_relief(gtk.RELIEF_NONE) if program.isResolved(): status.set_image(gtk.image_new_from_stock(gtk.STOCK_YES, @@ -721,8 +716,6 @@ hbox.pack_start(status, False, True, 0) status.show() -self.statusButtons[program] = status - # Program label label = gtk.Label() label.set_markup(b%s/b % program.name) @@ -733,8 +726,9 @@ # Locate manually via file chooser if not program.isResolved(): button = gtk.Button(_(Locate manually...)) -button.connect(clicked, lambda button: -self._locateProgram(program)) +button.connect(clicked, self._locateProgram) +button.program = program +button.status = status button.set_image(gtk.image_new_from_stock(gtk.STOCK_FIND, gtk.ICON_SIZE_BUTTON)) table.attach(button, 1, 2, i, i+1, gtk.SHRINK) @@ -768,8 +762,9 @@ # Status button status = gtk.Button() -status.connect(clicked, lambda button: -self._locateLibrary(library)) +status.connect(clicked, self._locateLibrary) +status.library = library +status.status = status status.set_relief(gtk.RELIEF_NONE) if isinstance(library, Package) or \ isinstance(library, PkgConfigModule) or \ @@ -782,8 +777,6 @@ hbox.pack_start(status, False, True, 0) status.show() -self.statusButtons[library] = status - # Library label label = gtk.Label() label.set_markup(b%s/b % library.name) @@ -796,8 +789,9 @@
[Xfce4-commits] r23095 - xfdesktop/trunk/menueditor
Author: pollux
Date: 2006-09-06 17:08:58 + (Wed, 06 Sep 2006)
New Revision: 23095
Modified:
xfdesktop/trunk/menueditor/Makefile.am
xfdesktop/trunk/menueditor/menueditor-add-dialog.c
xfdesktop/trunk/menueditor/menueditor-edit-dialog.c
xfdesktop/trunk/menueditor/menueditor-main-window.c
Log:
use the icon chooser if libexo is available (bug #2220)
Modified: xfdesktop/trunk/menueditor/Makefile.am
===
--- xfdesktop/trunk/menueditor/Makefile.am 2006-09-06 17:03:51 UTC (rev
23094)
+++ xfdesktop/trunk/menueditor/Makefile.am 2006-09-06 17:08:58 UTC (rev
23095)
@@ -15,9 +15,11 @@
xfce4_menueditor_CFLAGS = \
+ -DEXO_API_SUBJECT_TO_CHANGE \
-I$(top_srcdir) \
-I$(top_srcdir)/common \
-I$(top_srcdir)/pixmaps \
+ $(LIBEXO_CFLAGS)\
$(LIBX11_CFLAGS)\
$(LIBXFCEGUI4_CFLAGS) \
-DLOCALEDIR=\$(localedir)\\
@@ -29,6 +31,7 @@
xfce4_menueditor_LDADD = \
$(top_builddir)/common/libxfdesktop.la \
+ $(LIBEXO_LIBS) \
$(LIBX11_LDFLAGS) \
$(LIBX11_LIBS) \
$(LIBXFCE4MCS_CLIENT_LIBS) \
Modified: xfdesktop/trunk/menueditor/menueditor-add-dialog.c
===
--- xfdesktop/trunk/menueditor/menueditor-add-dialog.c 2006-09-06 17:03:51 UTC
(rev 23094)
+++ xfdesktop/trunk/menueditor/menueditor-add-dialog.c 2006-09-06 17:08:58 UTC
(rev 23095)
@@ -28,6 +28,10 @@
#include gtk/gtk.h
#include libxfcegui4/libxfcegui4.h
+#ifdef HAVE_LIBEXO
+#include exo/exo.h
+#endif
+
#include menueditor-add-dialog.h
#define MENUEDITOR_ADD_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE
((obj), MENUEDITOR_TYPE_ADD_DIALOG, MenuEditorAddDialogPrivate))
@@ -39,10 +43,14 @@
GtkWidget *entry_name;
GtkWidget *label_command;
GtkWidget *entry_command;
+#ifdef HAVE_LIBEXO
+ GtkWidget *button_icon;
+#else
GtkWidget *radio_button_themed_icon;
GtkWidget *entry_themed_icon;
GtkWidget *radio_button_icon;
GtkWidget *chooser_icon;
+#endif
GtkWidget *check_button_snotify;
GtkWidget *check_button_interm;
} MenuEditorAddDialogPrivate;
@@ -51,11 +59,15 @@
static void menueditor_add_dialog_class_init (MenuEditorAddDialogClass *);
static void menueditor_add_dialog_init (MenuEditorAddDialog *);
+static void cb_combo_changed (GtkComboBox *, MenuEditorAddDialog *);
+static void cb_browse_button_clicked (GtkButton *, MenuEditorAddDialog *);
+#ifdef HAVE_LIBEXO
+static void cb_icon_button_clicked (GtkWidget *, MenuEditorAddDialog *);
+#else
static void cb_chooser_icon_update_preview (GtkFileChooser *, GtkImage *);
-static void cb_browse_button_clicked (GtkButton *, MenuEditorAddDialog *);
-static void cb_combo_changed (GtkComboBox *, MenuEditorAddDialog *);
static void cb_radio_button_themed_icon_toggled (GtkToggleButton *,
MenuEditorAddDialog *);
static void cb_radio_button_icon_toggled (GtkToggleButton *,
MenuEditorAddDialog *);
+#endif
/* globals */
static XfceTitledDialogClass *parent_class = NULL;
@@ -101,14 +113,18 @@
{
MenuEditorAddDialogPrivate *priv = MENUEDITOR_ADD_DIALOG_GET_PRIVATE
(dialog);
+#ifdef HAVE_LIBEXO
+ GtkWidget *align;
+#else
+ GtkFileFilter *filter;
+ GtkWidget *preview;
+ GSList *radio_button_group = NULL;
+#endif
GtkWidget *table;
GtkWidget *label;
gchar *label_text = NULL;
GtkWidget *hbox;
GtkWidget *button_browse;
- GtkFileFilter *filter;
- GtkWidget *preview;
- GSList *radio_button_group = NULL;
gtk_window_set_title (GTK_WINDOW (dialog), _(Add menu entry));
gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
@@ -180,6 +196,25 @@
gtk_table_attach (GTK_TABLE (table), hbox, 1, 2, 2, 3, GTK_EXPAND |
GTK_FILL, GTK_FILL, 0, 6);
+#ifdef HAVE_LIBEXO
+ /* Icon chooser */
+ label = gtk_label_new (_(Icon:));
+ label_text = g_strdup_printf (span weight='bold'%s/span, _(Icon:));
+ gtk_label_set_markup (GTK_LABEL (label), label_text);
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, GTK_FILL, GTK_FILL,
0, 0);
+ gtk_widget_show (label);
+ g_free (label_text);
+
+ align = gtk_alignment_new (0.0f, 0.5f, 0.0f, 0.0f);
+ gtk_table_attach (GTK_TABLE (table), align, 1, 2, 3, 4, GTK_EXPAND |
GTK_FILL,
[Xfce4-commits] r23096 - in xfcalendar/trunk: po src
Author: juha
Date: 2006-09-06 20:44:07 + (Wed, 06 Sep 2006)
New Revision: 23096
Modified:
xfcalendar/trunk/po/fi.po
xfcalendar/trunk/src/ical-code.c
xfcalendar/trunk/src/main.c
xfcalendar/trunk/src/mainbox.c
Log:
1) fixed typo in fi translation
2) removed some noisy messages
3) added week start day handling
Modified: xfcalendar/trunk/po/fi.po
===
--- xfcalendar/trunk/po/fi.po 2006-09-06 17:08:58 UTC (rev 23095)
+++ xfcalendar/trunk/po/fi.po 2006-09-06 20:44:07 UTC (rev 23096)
@@ -550,7 +550,7 @@
Joka kuukauden toinen keskiviikko:\n
\tToisto = Kuukausittain,\n
\tViikonpäivät = valitse vain keskiviikko,\n
-\tmonesko päivä = valitse 2 keskiviikon alapuolella olevast laatikosta
+\tmonesko päivä = valitse 2 keskiviikon alapuolella olevasta laatikosta
#. date only appointment
#: ../src/event-list.c:199
Modified: xfcalendar/trunk/src/ical-code.c
===
--- xfcalendar/trunk/src/ical-code.c2006-09-06 17:08:58 UTC (rev 23095)
+++ xfcalendar/trunk/src/ical-code.c2006-09-06 20:44:07 UTC (rev 23096)
@@ -89,9 +89,8 @@
extern gboolean local_icaltimezone_utc;
static int lookback = 0;
-
extern GList *alarm_list;
-
+extern gint ical_weekstartday;
/* Remember to keep this string table in sync with zones.tab
* This is used only for translations purposes. It makes
@@ -1158,8 +1157,9 @@
} /* trg_found */
} /* EVENTS */
alarm_list = g_list_sort(alarm_list, alarm_order);
-g_message(Orage **: Build alarm list: Processed %d events.\n\tFound %d
alarms of which %d are active. (Searched %d recurring alarms.)
-, cnt_event, cnt_alarm, cnt_act_alarm, cnt_repeat);
+if (first_list_today)
+g_message(Orage **: Build alarm list: Processed %d events.\n\tFound
%d alarms of which %d are active. (Searched %d recurring alarms.)
+, cnt_event, cnt_alarm, cnt_act_alarm, cnt_repeat);
}
void xfical_alarm_build_list(gboolean first_list_today)
@@ -1371,6 +1371,9 @@
g_warning(appt_add_internal: Unsupported freq);
icalrecurrencetype_clear(rrule);
}
+if (appt-interval 1) { /* not default, need to insert it */
+recur_p += g_sprintf(recur_p, ;INTERVAL=%d, appt-interval);
+}
if (appt-recur_limit == 1) {
recur_p += g_sprintf(recur_p, ;COUNT=%d, appt-recur_count);
}
@@ -1397,8 +1400,17 @@
*recur_p2 = *recur_p; /* ...reset to null... */
recur_p = recur_p2; /* ...no need for BYDAY then */
}
-if (appt-interval 1) { /* not default, need to insert it */
-recur_p += g_sprintf(recur_p, ;INTERVAL=%d, appt-interval);
+else if (appt-interval 1 appt-freq == XFICAL_FREQ_WEEKLY) {
+/* we have BYDAY rule, let's check week starting date:
+ * WKST has meaning only in two cases:
+ * 1) WEEKLY rule interval 1 BYDAY rule is in use
+ * 2) YEARLY rule BYWEEKNO rule is in use
+ * BUT Orage is not using BYWEEKNO rule, so we only check 1)
+ * Monday is default, so we can skip that, too
+ * */
+if (ical_weekstartday)
+recur_p += g_sprintf(recur_p, ;WKST=%s
+, byday_a[ical_weekstartday]);
}
rrule = icalrecurrencetype_from_string(recur_str);
icalcomponent_add_property(ievent, icalproperty_new_rrule(rrule));
Modified: xfcalendar/trunk/src/main.c
===
--- xfcalendar/trunk/src/main.c 2006-09-06 17:08:58 UTC (rev 23095)
+++ xfcalendar/trunk/src/main.c 2006-09-06 20:44:07 UTC (rev 23096)
@@ -78,9 +78,13 @@
/* main calendar window position */
gint pos_x = 0, pos_y = 0;
+
/* latest event-list window size */
gint event_win_size_x = 400, event_win_size_y = 200;
+/* Ical week start day (0 = Monday, 1 = Tuesday,... 6 = Sunday) */
+gint ical_weekstartday = 0;
+
/* List of active alarms */
GList *alarm_list = NULL;
@@ -130,6 +134,8 @@
{
gchar *fpath;
FILE *fp;
+char *weekday[10] = { MONDAY, TUESDAY, WEDNESDAY, THURSDAY
+, FRIDAY, SATURDAY, SUNDAY };
xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, UTF-8);
/* Save settings here */
@@ -157,6 +163,8 @@
fprintf(fp, 0\n);
fprintf(fp, [Use Dynamic Icon]\n);
fprintf(fp, X=%i, Y=%i\n, icon_size_x, icon_size_y);
+fprintf(fp, [Ical Week Start Day]\n);
+fprintf(fp, %s\n, weekday[ical_weekstartday]);
fclose(fp);
}
g_free(fpath);
Modified: xfcalendar/trunk/src/mainbox.c
===
--- xfcalendar/trunk/src/mainbox.c 2006-09-06 17:08:58 UTC (rev 23095)
+++
