[Xfce4-commits] r27625 - xfdesktop/trunk/src
Author: kelnos
Date: 2008-08-31 04:17:31 + (Sun, 31 Aug 2008)
New Revision: 27625
Removed:
xfdesktop/trunk/src/xfce-desktop-settings.c
xfdesktop/trunk/src/xfce-desktop-settings.h
Modified:
xfdesktop/trunk/src/Makefile.am
xfdesktop/trunk/src/main.c
xfdesktop/trunk/src/xfce-backdrop.c
xfdesktop/trunk/src/xfce-backdrop.h
xfdesktop/trunk/src/xfce-desktop.c
xfdesktop/trunk/src/xfce-desktop.h
xfdesktop/trunk/src/xfdesktop-file-icon-manager.c
xfdesktop/trunk/src/xfdesktop-file-icon-manager.h
Log:
convert xfdesktop itself to use xfconf property bindings
added GObject properties to XfceBackdrop, XfceDesktop, and
XfceFileIconManager for all xfconf properties, add bindings, remove a
*lot* of code
Modified: xfdesktop/trunk/src/Makefile.am
===
--- xfdesktop/trunk/src/Makefile.am 2008-08-31 04:17:14 UTC (rev 27624)
+++ xfdesktop/trunk/src/Makefile.am 2008-08-31 04:17:31 UTC (rev 27625)
@@ -12,8 +12,6 @@
xfce-desktop.h \
xfce-desktop-enum-types.c \
xfce-desktop-enum-types.h \
- xfce-desktop-settings.c \
- xfce-desktop-settings.h \
xfdesktop-marshal.c \
xfdesktop-marshal.h
Modified: xfdesktop/trunk/src/main.c
===
--- xfdesktop/trunk/src/main.c 2008-08-31 04:17:14 UTC (rev 27624)
+++ xfdesktop/trunk/src/main.c 2008-08-31 04:17:31 UTC (rev 27625)
@@ -57,7 +57,6 @@
#include "xfdesktop-common.h"
#include "xfce-backdrop.h"
#include "xfce-desktop.h"
-#include "xfce-desktop-settings.h"
#include "menu.h"
#include "windowlist.h"
@@ -210,6 +209,7 @@
XfconfChannel *channel = NULL;
const gchar *message = NULL;
gboolean already_running;
+gchar buf[1024];
GError *error = NULL;
/* bind gettext textdomain */
@@ -318,7 +318,9 @@
nscreens = gdk_display_get_n_screens(gdpy);
desktops = g_new(GtkWidget *, nscreens);
for(i = 0; i < nscreens; i++) {
-desktops[i] = xfce_desktop_new(gdk_display_get_screen(gdpy, i));
+g_snprintf(buf, sizeof(buf), "/backdrop/screen%d/", i);
+desktops[i] = xfce_desktop_new(gdk_display_get_screen(gdpy, i),
+ channel, buf);
gtk_widget_add_events(desktops[i], GDK_BUTTON_PRESS_MASK
| GDK_BUTTON_RELEASE_MASK | GDK_SCROLL_MASK);
g_signal_connect(G_OBJECT(desktops[i]), "scroll-event",
@@ -327,13 +329,6 @@
G_CALLBACK(client_message_received), NULL);
menu_attach(XFCE_DESKTOP(desktops[i]));
windowlist_attach(XFCE_DESKTOP(desktops[i]));
-if(channel) {
-g_signal_connect(G_OBJECT(channel), "property-changed",
- G_CALLBACK(xfce_desktop_settings_changed),
- desktops[i]);
-xfce_desktop_settings_load_initial(XFCE_DESKTOP(desktops[i]),
- channel);
-}
gtk_widget_show(desktops[i]);
gdk_window_lower(desktops[i]->window);
}
Modified: xfdesktop/trunk/src/xfce-backdrop.c
===
--- xfdesktop/trunk/src/xfce-backdrop.c 2008-08-31 04:17:14 UTC (rev 27624)
+++ xfdesktop/trunk/src/xfce-backdrop.c 2008-08-31 04:17:31 UTC (rev 27625)
@@ -37,6 +37,7 @@
#include "xfce-backdrop.h"
#include "xfce-desktop-enum-types.h"
+#include "xfdesktop-common.h" /* for DEFAULT_BACKDROP */
#ifndef abs
#define abs(x) ( (x) < 0 ? -(x) : (x) )
@@ -338,6 +339,7 @@
GParamSpec *pspec)
{
XfceBackdrop *backdrop = XFCE_BACKDROP(object);
+GdkColor *color;
switch(property_id) {
case PROP_COLOR_STYLE:
@@ -345,16 +347,21 @@
break;
case PROP_COLOR1:
-xfce_backdrop_set_first_color(backdrop, g_value_get_boxed(value));
+color = g_value_get_boxed(value);
+if(color)
+xfce_backdrop_set_first_color(backdrop, color);
break;
case PROP_COLOR2:
-xfce_backdrop_set_second_color(backdrop, g_value_get_boxed(value));
+color = g_value_get_boxed(value);
+if(color)
+xfce_backdrop_set_second_color(backdrop, color);
break;
case PROP_SHOW_IMAGE:
xfce_backdrop_set_show_image(backdrop, g_value_get_boolean(value));
break;
+
case PROP_IMAGE_STYLE:
xfce_backdrop_set_image_style(backdrop, g_value_get_enum(value));
break;
@@ -462,7 +469,9 @@
* Return value: A new #XfceBackdrop.
**/
XfceBackdrop *
-xfce_backdrop_new_with_size(GdkVisual *visual, gint width, gint height)
+xfce_backdrop_new_with_size(GdkVisual *visual,
+gint width,
+gint height)
{
XfceBackdrop *backdrop;
@@ -473,7 +482,7
[Xfce4-commits] r27624 - in xfdesktop/trunk: common settings
Author: kelnos
Date: 2008-08-31 04:17:14 + (Sun, 31 Aug 2008)
New Revision: 27624
Modified:
xfdesktop/trunk/common/xfdesktop-common.c
xfdesktop/trunk/common/xfdesktop-common.h
xfdesktop/trunk/settings/main.c
Log:
refactor and rename most of the stuff in common/. lot of cleanups
Modified: xfdesktop/trunk/common/xfdesktop-common.c
===
--- xfdesktop/trunk/common/xfdesktop-common.c 2008-08-31 04:17:00 UTC (rev
27623)
+++ xfdesktop/trunk/common/xfdesktop-common.c 2008-08-31 04:17:14 UTC (rev
27624)
@@ -32,6 +32,14 @@
#include
#endif
+#ifdef HAVE_UNISTD_H
+#include
+#endif
+
+#ifdef HAVE_ERRNO_H
+#include
+#endif
+
#include
#include
#include
@@ -40,7 +48,7 @@
#include "xfdesktop-common.h"
gboolean
-is_backdrop_list(const gchar *path)
+xfdesktop_backdrop_list_is_valid(const gchar *path)
{
FILE *fp;
gchar buf[512];
@@ -52,7 +60,7 @@
if(!(fp = fopen (path, "r")))
return FALSE;
-if(fgets(buf, size, fp) > 0 && !strncmp(LIST_TEXT, buf, size - 1))
+if(fgets(buf, size, fp) && !strncmp(LIST_TEXT, buf, size - 1))
is_list = TRUE;
fclose(fp);
@@ -60,35 +68,170 @@
}
gchar **
-get_list_from_file(const gchar *filename)
+xfdesktop_backdrop_list_load(const gchar *filename,
+ gint *n_items,
+ GError **error)
{
-gchar *contents;
-GError *error = NULL;
-gchar **files = NULL;
-gsize length;
-
-files = NULL;
-
-if(!g_file_get_contents(filename, &contents, &length, &error)) {
-xfce_err("Unable to get backdrop image list from file %s: %s",
-filename, error->message);
-g_error_free(error);
+gchar *contents = NULL, **files = NULL, *p, *q;
+gsize length = 0;
+gint arr_size = 10, count = 0;
+
+g_return_val_if_fail(filename && (!error || !*error), NULL);
+
+if(!g_file_get_contents(filename, &contents, &length, error))
return NULL;
-}
-
+
if(strncmp(LIST_TEXT, contents, sizeof(LIST_TEXT) - 1)) {
-xfce_err("Not a backdrop image list file: %s", filename);
-goto finished;
+if(error) {
+g_set_error(error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+_("Backdrop list file is not valid"));
+}
+g_free(contents);
+return NULL;
}
-
-files = g_strsplit(contents + sizeof(LIST_TEXT), "\n", -1);
-
-finished:
+
+/* i'd use g_strsplit() here, but then counting is slower. we can
+ * also filter out blank lines */
+files = g_malloc(sizeof(gchar *) * (arr_size+1));
+p = contents + sizeof(LIST_TEXT);
+while(p && *p) {
+q = strstr(p, "\n");
+if(q) {
+if(p == q) /* blank line */
+continue;
+*q = 0;
+} else
+q = contents + length; /* assume no trailing '\n' at EOF */
+
+if(count == arr_size) {
+arr_size += 10;
+files = g_realloc(files, sizeof(gchar *) * (arr_size+1));
+}
+
+files[count++] = g_strdup(p);
+if(q != contents + length)
+p = q + 1;
+}
+files[count] = NULL;
+
+if(n_items)
+*n_items = count;
+
g_free(contents);
-
+
return files;
}
+gboolean
+xfdesktop_backdrop_list_save(const gchar *filename,
+ const gchar **files,
+ GError **error)
+{
+gboolean ret = FALSE;
+gchar *filename_new;
+FILE *fp;
+gint i;
+
+g_return_val_if_fail(filename && files && (!error || !*error), FALSE);
+
+filename_new = g_strconcat(filename, ".new", NULL);
+fp = fopen(filename_new, "w");
+if(fp) {
+fprintf(fp, "%s\n", LIST_TEXT);
+for(i = 0; files[i]; ++i)
+fprintf(fp, "%s\n", files[i]);
+if(!fclose(fp)) {
+if(!rename(filename_new, filename))
+ret = TRUE;
+else {
+if(error) {
+g_set_error(error, G_FILE_ERROR,
+g_file_error_from_errno(errno),
+g_strerror(errno));
+}
+unlink(filename_new);
+}
+} else {
+if(error) {
+g_set_error(error, G_FILE_ERROR,
g_file_error_from_errno(errno),
+g_strerror(errno));
+}
+unlink(filename_new);
+}
+} else if(error) {
+g_set_error(error, G_FILE_ERROR, g_file_error_from_errno(errno),
+g_strerror(errno));
+}
+
+g_free(filename_new);
+
+return ret;
+}
+
+gchar *
+xfdesktop_backdrop_list_choose_random(const gchar *filename,
+ GError **error)
+{
+static gboolean __initialized = FALSE;
+static gint previndex = -1;
+gchar **files, *file = NULL;
+gint n_
[Xfce4-commits] r27623 - in xfdesktop/trunk: settings src
Author: kelnos
Date: 2008-08-31 04:17:00 + (Sun, 31 Aug 2008)
New Revision: 27623
Modified:
xfdesktop/trunk/settings/xfdesktop-settings.glade
xfdesktop/trunk/src/Makefile.am
xfdesktop/trunk/src/xfce-backdrop.c
xfdesktop/trunk/src/xfce-desktop-settings.c
xfdesktop/trunk/src/xfce-desktop.c
xfdesktop/trunk/src/xfce-desktop.h
Log:
add properties to Xfce{Backdrop,Desktop} for all setters/getters
idea here is i can use the xfconf binding functions rather than doing
all this stuff manually
Modified: xfdesktop/trunk/settings/xfdesktop-settings.glade
===
--- xfdesktop/trunk/settings/xfdesktop-settings.glade 2008-08-31 04:16:39 UTC
(rev 27622)
+++ xfdesktop/trunk/settings/xfdesktop-settings.glade 2008-08-31 04:17:00 UTC
(rev 27623)
@@ -1,6 +1,6 @@
-
+
@@ -996,7 +996,7 @@
True
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-35 8 192 1
10 0
+36 8 192 1
10 0
False
Modified: xfdesktop/trunk/src/Makefile.am
===
--- xfdesktop/trunk/src/Makefile.am 2008-08-31 04:16:39 UTC (rev 27622)
+++ xfdesktop/trunk/src/Makefile.am 2008-08-31 04:17:00 UTC (rev 27623)
@@ -10,6 +10,8 @@
xfce-backdrop.h \
xfce-desktop.c \
xfce-desktop.h \
+ xfce-desktop-enum-types.c \
+ xfce-desktop-enum-types.h \
xfce-desktop-settings.c \
xfce-desktop-settings.h \
xfdesktop-marshal.c \
@@ -114,8 +116,13 @@
BUILT_SOURCES = \
xfdesktop-marshal.c \
- xfdesktop-marshal.h
+ xfdesktop-marshal.h \
+ stamp-xfce-desktop-enum-types.h \
+ xfce-desktop-enum-types.c \
+ xfce-desktop-enum-types.h
+DISTCLEANFILES = $(BUILT_SOURCES)
+
xfdesktop-marshal.h: stamp-xfdesktop-marshal.h
@true
stamp-xfdesktop-marshal.h: xfdesktop-marshal.list Makefile
@@ -125,13 +132,40 @@
echo '#include "xfdesktop-marshal.h"' > xfdesktop-marshal.c
glib-genmarshal --prefix=xfdesktop_marshal xfdesktop-marshal.list
--body >> xfdesktop-marshal.c
+enum_headers = \
+ xfce-backdrop.h \
+ xfce-desktop.h
+xfce-desktop-enum-types.h: stamp-xfce-desktop-enum-types.h
+ @true
+stamp-xfce-desktop-enum-types.h: $(enum_headers) Makefile
+ ( cd $(srcdir) && glib-mkenums \
+ --fhead "#ifndef __XFCE_DESKTOP_ENUM_TYPES_H__\n#define
__XFCE_DESKTOP_ENUM_TYPES_H__\nG_BEGIN_DECLS\n" \
+ --fprod "/* enumerations from \"@[EMAIL PROTECTED]" */\n" \
+ --vhead "GType @[EMAIL PROTECTED] (void) G_GNUC_CONST;\n#define
[EMAIL PROTECTED]@ (@[EMAIL PROTECTED]())\n" \
+ --ftail "G_END_DECLS\n\n#endif /* !__XFCE_DESKTOP_ENUM_TYPES_H__
*/" \
+ $(enum_headers) ) >> xgen-xdeth \
+ && ( cmp -s xgen-xdeth xfce-desktop-enum-types.h || cp xgen-xdeth
xfce-desktop-enum-types.h ) \
+ && rm -f xgen-xdeth \
+ && echo timestamp > $(@F)
+xfce-desktop-enum-types.c: $(libthunar_vfs_headers) Makefile
+ ( cd $(srcdir) && glib-mkenums \
+ --fhead "#undef GTK_DISABLE_DEPRECATED\n#define
GTK_ENABLE_BROKEN\n#include \"xfce-desktop.h\"\n#include \"xfce-backdrop.h\"" \
+ --fprod "\n/* enumerations from \"@[EMAIL PROTECTED]" */" \
+ --vhead "[EMAIL PROTECTED]@_get_type (void)\n{\n\tstatic GType
type = 0;\n\tif (type == 0) {\n\tstatic const [EMAIL PROTECTED]@Value values[]
= {"\
+ --vprod "\t{ @VALUENAME@, \"@[EMAIL PROTECTED]", \"@[EMAIL
PROTECTED]" }," \
+ --vtail "\t{ 0, NULL, NULL }\n\t};\n\ttype = [EMAIL
PROTECTED]@_register_static (\"@[EMAIL PROTECTED]", values);\n }\n\treturn
type;\n}\n" \
+ $(enum_headers) ) >> xgen-xdetc \
+ && cp xgen-xdetc xfce-desktop-enum-types.c \
+ && rm -f xgen-xdetc
+
+
if ENABLE_FILE_ICONS
BUILT_SOURCES += \
xfdesktop-dbus-bindings-filemanager.h \
xfdesktop-dbus-bindings-trash.h
-DISTCLEANFILES = \
+DISTCLEANFILES += \
xfdesktop-dbus-bindings-filemanager.h \
xfdesktop-dbus-bindings-trash.h
Modified: xfdesktop/trunk/src/xfce-backdrop.c
===
--- xfdesktop/trunk/src/xfce-backdrop.c 2008-08-31 04:16:39 UTC (rev 27622)
+++ xfdesktop/trunk/src/xfce-backdrop.c 2008-08-31 04:17:00 UTC (rev 27623)
@@ -36,14 +36,24 @@
#include
#include "xfce-backdrop.h"
+#include "xfce-desktop-enum-types.h"
#ifndef abs
#define abs(x) ( (x) < 0 ? -(x) : (x) )
#endif
static void xfce_backdrop_class_init(XfceBac
[Xfce4-commits] r27621 - xfdesktop/trunk
Author: kelnos Date: 2008-08-31 04:16:05 + (Sun, 31 Aug 2008) New Revision: 27621 Modified: xfdesktop/trunk/configure.ac.in Log: don't build menu editor by default, since it doesn't work on new menus anyway Modified: xfdesktop/trunk/configure.ac.in === --- xfdesktop/trunk/configure.ac.in 2008-08-31 04:15:52 UTC (rev 27620) +++ xfdesktop/trunk/configure.ac.in 2008-08-31 04:16:05 UTC (rev 27621) @@ -143,11 +143,11 @@ AC_ARG_ENABLE([menu-editor], -AC_HELP_STRING([--disable-menu-editor], -[Do not build the menu editor (default=enabled)]), +AC_HELP_STRING([--enable-menu-editor], +[Build the menu editor (default=disabled)]), [ac_cv_enable_menueditor=$enableval], -[ac_cv_enable_menueditor=yes]) -if test "x$ac_cv_enable_menueditor" = "xno"; then +[ac_cv_enable_menueditor=no]) +if test "x$ac_cv_enable_menueditor" != "xyes"; then build_menueditor="no" else build_menueditor="yes" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27620 - xfdesktop/trunk
Author: kelnos
Date: 2008-08-31 04:15:52 + (Sun, 31 Aug 2008)
New Revision: 27620
Modified:
xfdesktop/trunk/autogen.sh
Log:
fix git svn version fetch
Modified: xfdesktop/trunk/autogen.sh
===
--- xfdesktop/trunk/autogen.sh 2008-08-30 22:25:48 UTC (rev 27619)
+++ xfdesktop/trunk/autogen.sh 2008-08-31 04:15:52 UTC (rev 27620)
@@ -30,10 +30,15 @@
# substitute revision and linguas
linguas=`sed -e '/^#/d' po/LINGUAS`
if [ -d .git/svn ]; then
- revision=`LC_ALL=C git-svn find-rev HEAD`
+ revision=$(git svn find-rev origin/trunk 2>/dev/null ||
+ git svn find-rev trunk 2>/dev/null ||
+ git svn find-rev HEAD 2>/dev/null ||
+ git svn find-rev master 2>/dev/null)
else
revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
fi
+[ "$revision" ] || revision=UNKNOWN
+
sed -e "s/@LINGUAS@/${linguas}/g" \
-e "s/@REVISION@/${revision}/g" \
< "configure.ac.in" > "configure.ac"
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27619 - libxfce4menu/trunk
Author: jannis
Date: 2008-08-30 22:25:48 + (Sat, 30 Aug 2008)
New Revision: 27619
Modified:
libxfce4menu/trunk/autogen.sh
Log:
Fix the previous commit.
Modified: libxfce4menu/trunk/autogen.sh
===
--- libxfce4menu/trunk/autogen.sh 2008-08-30 22:16:11 UTC (rev 27618)
+++ libxfce4menu/trunk/autogen.sh 2008-08-30 22:25:48 UTC (rev 27619)
@@ -32,13 +32,12 @@
# Substitute revision and linguas
linguas=`sed -e '/^#/d' po/LINGUAS`
if test -d .git/svn; then
- revision=$(git svn find-rev trunk 2>/dev/null ||
-git svn find-rev origin/trunk 2>/dev/null ||
-git svn find-rev HEAD 2>/dev/null ||
-git svn find-rev master 2>/dev/null)
+ revision=$(git svn find-rev trunk 2>/dev/null ||
+ git svn find-rev origin/trunk 2>/dev/null ||
+ git svn find-rev HEAD 2>/dev/null ||
+ git svn find-rev master 2>/dev/null)
else
- revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n",
-$2}'`
+ revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n",$2}'`
fi
sed -e "s/@LINGUAS@/${linguas}/g" \
-e "s/@REVISION@/${revision}/g" \
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27618 - libxfce4menu/trunk
Author: jannis
Date: 2008-08-30 22:16:11 + (Sat, 30 Aug 2008)
New Revision: 27618
Modified:
libxfce4menu/trunk/ChangeLog
libxfce4menu/trunk/autogen.sh
Log:
* autogen.sh: Don't print errors when trying to detect the
revision of a git svn repository.
Modified: libxfce4menu/trunk/ChangeLog
===
--- libxfce4menu/trunk/ChangeLog2008-08-30 22:04:41 UTC (rev 27617)
+++ libxfce4menu/trunk/ChangeLog2008-08-30 22:16:11 UTC (rev 27618)
@@ -1,3 +1,8 @@
+2008-08-31 Jannis Pohlmann <[EMAIL PROTECTED]>
+
+ * autogen.sh: Don't print errors when trying to detect the
+ revision of a git svn repository.
+
2008-08-17 Brian Tarricone <[EMAIL PROTECTED]>
* configure.in.in: Set LIBXFCE4MENU_VERSION_API independently
Modified: libxfce4menu/trunk/autogen.sh
===
--- libxfce4menu/trunk/autogen.sh 2008-08-30 22:04:41 UTC (rev 27617)
+++ libxfce4menu/trunk/autogen.sh 2008-08-30 22:16:11 UTC (rev 27618)
@@ -32,10 +32,10 @@
# Substitute revision and linguas
linguas=`sed -e '/^#/d' po/LINGUAS`
if test -d .git/svn; then
- revision=$(git svn find-rev trunk ||
-git svn find-rev origin/trunk ||
-git svn find-rev HEAD ||
-git svn find-rev master)
+ revision=$(git svn find-rev trunk 2>/dev/null ||
+git svn find-rev origin/trunk 2>/dev/null ||
+git svn find-rev HEAD 2>/dev/null ||
+git svn find-rev master 2>/dev/null)
else
revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n",
$2}'`
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27617 - xfce4-panel/trunk
Author: jannis
Date: 2008-08-30 22:04:41 + (Sat, 30 Aug 2008)
New Revision: 27617
Modified:
xfce4-panel/trunk/ChangeLog
xfce4-panel/trunk/autogen.sh
Log:
* autogen.sh: Don't print errors when trying to detect the revision
of a git svn repository.
Modified: xfce4-panel/trunk/ChangeLog
===
--- xfce4-panel/trunk/ChangeLog 2008-08-30 21:16:27 UTC (rev 27616)
+++ xfce4-panel/trunk/ChangeLog 2008-08-30 22:04:41 UTC (rev 27617)
@@ -1,3 +1,8 @@
+2008-08-31 00:04 jannis
+
+ * autogen.sh: Don't print errors when trying to detect the revision
+ of a git svn repository.
+
2008-08-25 06:20 kelnos
* Include panel settings in new settings manager dialog
Modified: xfce4-panel/trunk/autogen.sh
===
--- xfce4-panel/trunk/autogen.sh2008-08-30 21:16:27 UTC (rev 27616)
+++ xfce4-panel/trunk/autogen.sh2008-08-30 22:04:41 UTC (rev 27617)
@@ -30,10 +30,10 @@
# substitute revision and linguas
linguas=`sed -e '/^#/d' po/LINGUAS`
if test -d .git/svn; then
- revision=`git svn find-rev trunk ||
- git svn find-rev origin/trunk ||
- git svn find-rev HEAD ||
- git svn find-rev master`
+ revision=`git svn find-rev trunk 2>/dev/null ||
+ git svn find-rev origin/trunk 2>/dev/null ||
+ git svn find-rev HEAD 2>/dev/null ||
+ git svn find-rev master 2>/dev/null`
else
revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n",
$2}'`
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27616 - in xfce4-settings/trunk: . dialogs/keyboard-settings
Author: jannis Date: 2008-08-30 21:16:27 + (Sat, 30 Aug 2008) New Revision: 27616 Modified: xfce4-settings/trunk/ChangeLog xfce4-settings/trunk/dialogs/keyboard-settings/main.c Log: * dialogs/keyboard-settings/main.c: Don't call gtk_widget_hide() after creating the main dialog. This should fix bug #4335. Modified: xfce4-settings/trunk/ChangeLog === --- xfce4-settings/trunk/ChangeLog 2008-08-30 20:46:37 UTC (rev 27615) +++ xfce4-settings/trunk/ChangeLog 2008-08-30 21:16:27 UTC (rev 27616) @@ -1,3 +1,8 @@ +2008-08-30 Jannis Pohlmann <[EMAIL PROTECTED]> + + * dialogs/keyboard-settings/main.c: Don't call gtk_widget_hide() + after creating the main dialog. This should fix bug #4335. + 2008-08-17 Nick Schermer <[EMAIL PROTECTED]> * xfce4-settings-editor/Makefile.am, Modified: xfce4-settings/trunk/dialogs/keyboard-settings/main.c === --- xfce4-settings/trunk/dialogs/keyboard-settings/main.c 2008-08-30 20:46:37 UTC (rev 27615) +++ xfce4-settings/trunk/dialogs/keyboard-settings/main.c 2008-08-30 21:16:27 UTC (rev 27616) @@ -553,7 +553,6 @@ /* Get dialog widget */ dialog = glade_xml_get_widget (gxml, "keyboard-settings-dialog"); gtk_widget_show_all(dialog); - gtk_widget_hide(dialog); return dialog; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27615 - xfconf/trunk
Author: jannis
Date: 2008-08-30 20:46:37 + (Sat, 30 Aug 2008)
New Revision: 27615
Modified:
xfconf/trunk/autogen.sh
Log:
Don't print errors when trying to determine the revision of a git svn
repository.
Modified: xfconf/trunk/autogen.sh
===
--- xfconf/trunk/autogen.sh 2008-08-30 20:38:23 UTC (rev 27614)
+++ xfconf/trunk/autogen.sh 2008-08-30 20:46:37 UTC (rev 27615)
@@ -35,10 +35,10 @@
# substitute revision and linguas
linguas=$(sed -e '/^#/d' po/LINGUAS)
if [ -d .git/svn ]; then
-revision=$(git svn find-rev trunk ||
- git svn find-rev origin/trunk ||
- git svn find-rev HEAD ||
- git svn find-rev master)
+revision=$(git svn find-rev trunk 2>/dev/null ||
+ git svn find-rev origin/trunk 2>/dev/null ||
+ git svn find-rev HEAD 2>/dev/null ||
+ git svn find-rev master 2>/dev/null)
elif [ -d .svn ]; then
revision=$(LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n",
$2}')
else
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27614 - libexo/trunk
Author: jannis
Date: 2008-08-30 20:38:23 + (Sat, 30 Aug 2008)
New Revision: 27614
Modified:
libexo/trunk/ChangeLog
libexo/trunk/INSTALL
libexo/trunk/autogen.sh
Log:
* autogen.sh: Do not print errors when trying to detect the
revision of a git svn repository.
Modified: libexo/trunk/ChangeLog
===
--- libexo/trunk/ChangeLog 2008-08-30 09:35:46 UTC (rev 27613)
+++ libexo/trunk/ChangeLog 2008-08-30 20:38:23 UTC (rev 27614)
@@ -1,3 +1,8 @@
+2008-08-30 Jannis Pohlmann <[EMAIL PROTECTED]>
+
+ * autogen.sh: Do not print errors when trying to detect the
+ revision of a git svn repository.
+
2008-08-25 Brian Tarricone <[EMAIL PROTECTED]>
* exo-helper/exo-preferred-applications.desktop.in: Include
Modified: libexo/trunk/INSTALL
===
--- libexo/trunk/INSTALL2008-08-30 09:35:46 UTC (rev 27613)
+++ libexo/trunk/INSTALL2008-08-30 20:38:23 UTC (rev 27614)
@@ -2,7 +2,7 @@
*
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
+2006, 2007 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -67,6 +67,9 @@
all sorts of other programs in order to regenerate files that came
with the distribution.
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
Compilers and Options
=
Modified: libexo/trunk/autogen.sh
===
--- libexo/trunk/autogen.sh 2008-08-30 09:35:46 UTC (rev 27613)
+++ libexo/trunk/autogen.sh 2008-08-30 20:38:23 UTC (rev 27614)
@@ -30,10 +30,10 @@
# substitute revision and linguas
linguas=`sed -e '/^#/d' po/LINGUAS`
if [ -d .git/svn ]; then
- revision=`git svn find-rev trunk ||
-git svn find-rev origin/trunk ||
-git svn find-rev HEAD ||
-git svn find-rev master`
+ revision=`git svn find-rev trunk 2>/dev/null ||
+git svn find-rev origin/trunk 2>/dev/null ||
+git svn find-rev HEAD 2>/dev/null ||
+git svn find-rev master 2>/dev/null`
else
revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
fi
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27613 - xfce4-settings/trunk/xfce4-settings-manager
Author: kelnos
Date: 2008-08-30 09:35:46 + (Sat, 30 Aug 2008)
New Revision: 27613
Modified:
xfce4-settings/trunk/xfce4-settings-manager/main.c
Log:
implement nick's suggestion to clamp the settings manager window to a max size
800x600 is pretty arbitrary; could probably use some tweaking... or,
really, a much more complicated algorithm
Modified: xfce4-settings/trunk/xfce4-settings-manager/main.c
===
--- xfce4-settings/trunk/xfce4-settings-manager/main.c 2008-08-29 22:40:58 UTC
(rev 27612)
+++ xfce4-settings/trunk/xfce4-settings-manager/main.c 2008-08-30 09:35:46 UTC
(rev 27613)
@@ -31,6 +31,15 @@
#include "xfce-settings-manager-dialog.h"
+#ifndef MIN
+#define MIN(a, b) ( (a) < (b) ? (a) : (b) )
+#endif
+
+/* somewhat arbitrary; should really do something complicated by
+ * looking at font height/avg width, pixbuf height, etc. */
+#define WINDOW_MAX_WIDTH 800
+#define WINDOW_MAX_HEIGHT 600
+
static gboolean opt_version = FALSE;
static GOptionEntry option_entries[] = {
@@ -54,8 +63,8 @@
gdk_screen_get_monitor_geometry(screen, monitor, &geom);
gtk_window_set_default_size(GTK_WINDOW(dialog),
-geom.width * 2.0 / 3,
-geom.height *2.0 / 3);
+MIN(geom.width * 2.0 / 3, WINDOW_MAX_WIDTH),
+MIN(geom.height *2.0 / 3, WINDOW_MAX_HEIGHT));
}
int
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
