[Xfce4-commits] <mousepad:master> * TODO: Remind myself to fix problems with UTF-8 filenames. * mousepad/mousepad-window.c: Fix crash when opening files with the command line. * Mousepad.desktop.in.in, Mousepad.desktop.in.in: Mousepad executable is now lowercase again. * mousepad/mousepad-screen.c: Remove unused signals from the Class.
Nick Schermer
noreply at xfce.org
Sat May 5 21:30:04 CEST 2012
Updating branch refs/heads/master
to ff28ae1045a381c7dc815906b9a0816b87451e2b (commit)
from 62dbff28f0cd78e96933a78c979ef3109a5a43ba (commit)
commit ff28ae1045a381c7dc815906b9a0816b87451e2b
Author: Nick Schermer <nick at xfce.org>
Date: Tue Feb 27 21:28:04 2007 +0000
* TODO: Remind myself to fix problems with UTF-8 filenames.
* mousepad/mousepad-window.c: Fix crash when opening files
with the command line.
* Mousepad.desktop.in.in, Mousepad.desktop.in.in: Mousepad executable
is now lowercase again.
* mousepad/mousepad-screen.c: Remove unused signals from the Class.
(Old svn revision: 25040)
ChangeLog | 9 +++++++++
Mousepad.desktop.in.in | 4 ++--
TODO | 1 +
mousepad/Makefile.am | 21 ++++++++-------------
mousepad/mousepad-screen.c | 10 +++-------
mousepad/mousepad-window.c | 2 +-
6 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 93808dc..641b7e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2007-02-17 Nick Schermer <nick at xfce.org>
+ * TODO: Remind myself to fix problems with UTF-8 filenames.
+ * mousepad/mousepad-window.c: Fix crash when opening files
+ with the command line.
+ * Mousepad.desktop.in.in, Mousepad.desktop.in.in: Mousepad executable
+ is now lowercase again.
+ * mousepad/mousepad-screen.c: Remove unused signals from the Class.
+
+2007-02-17 Nick Schermer <nick at xfce.org>
+
* TODO, NEWS: Update the current status of the rewrite.
* Mousepad.desktop.in.in: Add MimeType and improve Categories.
diff --git a/Mousepad.desktop.in.in b/Mousepad.desktop.in.in
index e7ae985..38a39eb 100644
--- a/Mousepad.desktop.in.in
+++ b/Mousepad.desktop.in.in
@@ -4,8 +4,8 @@ Encoding=UTF-8
_Name=Mousepad
_Comment=Simple Text Editor
_GenericName=Text Editor
-Exec=Mousepad %F
-Icon=Mousepad
+Exec=mousepad %F
+Icon=mousepad
Terminal=false
StartupNotify=true
Type=Application
diff --git a/TODO b/TODO
index da149dc..1e0ed03 100644
--- a/TODO
+++ b/TODO
@@ -13,6 +13,7 @@
- Saving and loading
- Save All option.
+ - Filenames and UTF-8.
- Reload option. Maybe also stat the source file when switching
tabs and tell the user if the source was modified.
diff --git a/mousepad/Makefile.am b/mousepad/Makefile.am
index bb27224..08a4384 100644
--- a/mousepad/Makefile.am
+++ b/mousepad/Makefile.am
@@ -13,9 +13,9 @@ INCLUDES = \
$(PLATFORM_CPPFLAGS)
bin_PROGRAMS = \
- Mousepad
+ mousepad
-Mousepad_SOURCES = \
+mousepad_SOURCES = \
main.c \
mousepad-application.c \
mousepad-application.h \
@@ -34,17 +34,17 @@ Mousepad_SOURCES = \
mousepad-window.h \
mousepad-window-ui.h
-Mousepad_CFLAGS = \
+mousepad_CFLAGS = \
$(EXO_CFLAGS) \
$(GTHREAD_CFLAGS) \
$(PLATFORM_CFLAGS)
-Mousepad_LDFLAGS = \
+mousepad_LDFLAGS = \
-no-undefined \
$(LIBSM_LDFLAGS) \
$(PLATFORM_LDFLAGS)
-Mousepad_LDADD = \
+mousepad_LDADD = \
$(EXO_LIBS) \
$(GTHREAD_LIBS)
@@ -52,23 +52,18 @@ if HAVE_DBUS
mousepad_build_sources = \
mousepad-dbus-infos.h
-Mousepad_SOURCES += \
+mousepad_SOURCES += \
mousepad-dbus.c \
mousepad-dbus.h
-Mousepad_CFLAGS += \
+mousepad_CFLAGS += \
-DDBUS_API_SUBJECT_TO_CHANGE \
$(DBUS_CFLAGS)
-Mousepad_LDADD += \
+mousepad_LDADD += \
$(DBUS_LIBS)
endif
-# install symlink to 'mousepad'
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(bindir)
- -( cd $(DESTDIR)$(bindir) ; ln -sf Mousepad mousepad )
-
if MAINTAINER_MODE
DISTCLEANFILES = \
mousepad-window-ui.h
diff --git a/mousepad/mousepad-screen.c b/mousepad/mousepad-screen.c
index 73ad87d..c643e39 100644
--- a/mousepad/mousepad-screen.c
+++ b/mousepad/mousepad-screen.c
@@ -82,12 +82,6 @@ enum
struct _MousepadScreenClass
{
GtkScrolledWindowClass __parent__;
-
- /* signals */
- void (*selection_changed) (MousepadScreen *screen,
- gboolean selected);
- void (*modified_changed) (MousepadScreen *screen,
- gboolean modified);
};
struct _MousepadScreen
@@ -96,8 +90,10 @@ struct _MousepadScreen
GtkWidget *textview;
- /* file and display name */
+ /* absolute path of the file */
gchar *filename;
+
+ /* name of the file used for the titles */
gchar *display_name;
/* last document modified time */
diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
index 1f7a669..a0da54c 100644
--- a/mousepad/mousepad-window.c
+++ b/mousepad/mousepad-window.c
@@ -537,7 +537,7 @@ mousepad_window_open_files (MousepadWindow *window,
gchar **filenames)
{
gint n;
- gchar *filename;
+ gchar *filename = NULL;
_mousepad_return_if_fail (MOUSEPAD_IS_WINDOW (window));
_mousepad_return_if_fail (working_directory != NULL);
More information about the Xfce4-commits
mailing list