mirror of https://github.com/GNOME/gimp.git
app/widgets/Makefile.am app/widgets/gimpdbusservice.[ch] removed here ...
2008-07-13 Sven Neumann <sven@gimp.org> * app/widgets/Makefile.am * app/widgets/gimpdbusservice.[ch] * app/widgets/dbus-service.xml: removed here ... * app/gui/Makefile.am * app/gui/gimpdbusservice.[ch] * app/gui/dbus-service.xml: ... and moved here. (gimp_dbus_service_activate): raise the first display instead of the toolbox. * app/gui/gui-unique.c (gui_unique_win32_idle_open): same change here, raise the display instead of the toolbox. * app/unique.c: changed accordingly. svn path=/trunk/; revision=26184
This commit is contained in:
Sven Neumann
Sven Neumann
parent
e6e549a2d6
commit
f56bc8493f
17
ChangeLog
17
ChangeLog
|
|
@ -1,3 +1,20 @@
|
|||
2008-07-13 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* app/widgets/Makefile.am
|
||||
* app/widgets/gimpdbusservice.[ch]
|
||||
* app/widgets/dbus-service.xml: removed here ...
|
||||
|
||||
* app/gui/Makefile.am
|
||||
* app/gui/gimpdbusservice.[ch]
|
||||
* app/gui/dbus-service.xml: ... and moved here.
|
||||
(gimp_dbus_service_activate): raise the first display instead of
|
||||
the toolbox.
|
||||
|
||||
* app/gui/gui-unique.c (gui_unique_win32_idle_open): same change
|
||||
here, raise the display instead of the toolbox.
|
||||
|
||||
* app/unique.c: changed accordingly.
|
||||
|
||||
2008-07-13 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* app/unique.c
|
||||
|
|
|
|||
|
|
@ -15,9 +15,11 @@ INCLUDES = \
|
|||
|
||||
noinst_LIBRARIES = libappgui.a
|
||||
|
||||
libappgui_a_SOURCES = \
|
||||
libappgui_a_sources = \
|
||||
color-history.c \
|
||||
color-history.h \
|
||||
gimpdbusservice.c \
|
||||
gimpdbusservice.h \
|
||||
gui.c \
|
||||
gui.h \
|
||||
gui-message.c \
|
||||
|
|
@ -36,4 +38,23 @@ libappgui_a_SOURCES = \
|
|||
ige-mac-menu.c \
|
||||
ige-mac-menu.h
|
||||
|
||||
EXTRA_DIST = makefile.msc
|
||||
libappgui_a_built_sources = gimpdbusservice-glue.h
|
||||
|
||||
libappgui_a_SOURCES = $(libappgui_a_built_sources) $(libappgui_a_sources)
|
||||
|
||||
EXTRA_DIST = \
|
||||
dbus-service.xml \
|
||||
makefile.msc
|
||||
|
||||
|
||||
#
|
||||
# rules to generate built sources
|
||||
#
|
||||
# setup autogeneration dependencies
|
||||
gen_sources = gimpdbusservice-glue.h
|
||||
CLEANFILES = $(gen_sources)
|
||||
|
||||
$(srcdir)/gimpdbusservice.c: gimpdbusservice-glue.h
|
||||
|
||||
gimpdbusservice-glue.h: $(srcdir)/dbus-service.xml
|
||||
$(DBUS_BINDING_TOOL) --mode=glib-server --prefix=gimp $< > $(@F)
|
||||
|
|
|
|||
|
|
@ -26,15 +26,17 @@
|
|||
#include <gtk/gtk.h>
|
||||
#include <dbus/dbus-glib.h>
|
||||
|
||||
#include "widgets-types.h"
|
||||
#include "gui-types.h"
|
||||
|
||||
#include "core/gimp.h"
|
||||
#include "core/gimpcontainer.h"
|
||||
|
||||
#include "file/file-open.h"
|
||||
|
||||
#include "display/gimpdisplay.h"
|
||||
|
||||
#include "gimpdbusservice.h"
|
||||
#include "gimpdbusservice-glue.h"
|
||||
#include "gimpuimanager.h"
|
||||
|
||||
|
||||
static void gimp_dbus_service_class_init (GimpDBusServiceClass *klass);
|
||||
|
|
@ -103,16 +105,13 @@ gboolean
|
|||
gimp_dbus_service_activate (GimpDBusService *service,
|
||||
GError **dbus_error)
|
||||
{
|
||||
const GList *managers;
|
||||
GimpObject *display;
|
||||
|
||||
g_return_val_if_fail (GIMP_IS_DBUS_SERVICE (service), FALSE);
|
||||
|
||||
/* raise the toolbox */
|
||||
managers = gimp_ui_managers_from_name ("<Image>");
|
||||
display = gimp_container_get_first_child (service->gimp->displays);
|
||||
|
||||
if (managers)
|
||||
gimp_ui_manager_activate_action (managers->data,
|
||||
"dialogs", "dialogs-toolbox");
|
||||
gtk_window_present (GTK_WINDOW (GIMP_DISPLAY (display)->shell));
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#include <windows.h>
|
||||
|
|
@ -30,12 +30,14 @@
|
|||
#include <dbus/dbus-glib-lowlevel.h>
|
||||
#endif
|
||||
|
||||
#include "core/core-types.h"
|
||||
#include "gui/gui-types.h"
|
||||
|
||||
#include "core/gimp.h"
|
||||
#include "core/gimpcontainer.h"
|
||||
|
||||
#include "widgets/gimpdbusservice.h"
|
||||
#include "display/gimpdisplay.h"
|
||||
|
||||
#include "gimpdbusservice.h"
|
||||
#include "gui-unique.h"
|
||||
|
||||
|
||||
|
|
@ -158,12 +160,12 @@ gui_unique_win32_idle_open (IdleOpenData *data)
|
|||
}
|
||||
else
|
||||
{
|
||||
/* raise the toolbox */
|
||||
const GList *managers = gimp_ui_managers_from_name ("<Image>");
|
||||
/* raise the first display */
|
||||
GimpObject *display;
|
||||
|
||||
if (managers)
|
||||
gimp_ui_manager_activate_action (managers->data,
|
||||
"dialogs", "dialogs-toolbox");
|
||||
display = gimp_container_get_first_child (unique_gimp->displays);
|
||||
|
||||
gtk_window_present (GTK_WINDOW (GIMP_DISPLAY (display)->shell));
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ gimp_unique_open (const gchar **filenames,
|
|||
#endif
|
||||
}
|
||||
|
||||
#ifndef GIMP_CONSOLE_COMPILATION
|
||||
static gchar *
|
||||
gimp_unique_filename_to_uri (const gchar *filename,
|
||||
const gchar *cwd,
|
||||
|
|
@ -87,6 +88,8 @@ gimp_unique_filename_to_uri (const gchar *filename,
|
|||
|
||||
return uri;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#if HAVE_DBUS_GLIB
|
||||
|
||||
|
|
@ -97,7 +100,7 @@ gimp_unique_dbus_open (const gchar **filenames,
|
|||
#ifndef GIMP_CONSOLE_COMPILATION
|
||||
|
||||
/* for the DBus service names */
|
||||
#include "widgets/gimpdbusservice.h"
|
||||
#include "gui/gimpdbusservice.h"
|
||||
|
||||
DBusGConnection *connection = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
|
||||
|
||||
|
|
|
|||
|
|
@ -11,8 +11,6 @@ INCLUDES = \
|
|||
-I$(top_builddir)/app \
|
||||
-I$(top_srcdir)/app \
|
||||
$(GTK_CFLAGS) \
|
||||
$(PANGOFT2_CFLAGS) \
|
||||
$(DBUS_GLIB_CFLAGS) \
|
||||
-I$(includedir)
|
||||
|
||||
noinst_LIBRARIES = libappwidgets.a
|
||||
|
|
@ -110,8 +108,6 @@ libappwidgets_a_sources = \
|
|||
gimpdataeditor.h \
|
||||
gimpdatafactoryview.c \
|
||||
gimpdatafactoryview.h \
|
||||
gimpdbusservice.c \
|
||||
gimpdbusservice.h \
|
||||
gimpdeviceinfo.c \
|
||||
gimpdeviceinfo.h \
|
||||
gimpdevices.c \
|
||||
|
|
@ -350,30 +346,21 @@ libappwidgets_a_sources = \
|
|||
gtkvwrapbox.c \
|
||||
gtkvwrapbox.h
|
||||
|
||||
libappwidgets_a_built_sources = gimpdbusservice-glue.h widgets-enums.c
|
||||
libappwidgets_a_built_sources = widgets-enums.c
|
||||
|
||||
libappwidgets_a_SOURCES = \
|
||||
$(libappwidgets_a_built_sources) $(libappwidgets_a_sources)
|
||||
|
||||
EXTRA_DIST = \
|
||||
dbus-service.xml \
|
||||
makefile.msc
|
||||
EXTRA_DIST = makefile.msc
|
||||
|
||||
|
||||
#
|
||||
# rules to generate built sources
|
||||
#
|
||||
# setup autogeneration dependencies
|
||||
gen_sources = xgen-wec gimpdbusservice-glue.h
|
||||
gen_sources = xgen-wec
|
||||
CLEANFILES = $(gen_sources)
|
||||
|
||||
|
||||
$(srcdir)/gimpdbusservice.c: gimpdbusservice-glue.h
|
||||
|
||||
gimpdbusservice-glue.h: $(srcdir)/dbus-service.xml
|
||||
$(DBUS_BINDING_TOOL) --mode=glib-server --prefix=gimp $< > $(@F)
|
||||
|
||||
|
||||
widgets-enums.c: $(srcdir)/widgets-enums.h $(GIMP_MKENUMS)
|
||||
$(GIMP_MKENUMS) \
|
||||
--fhead "#include \"config.h\"\n#include <gtk/gtk.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"widgets-enums.h\"\n#include \"gimp-intl.h\"" \
|
||||
|
|
|
|||
Loading…
Reference in New Issue