Attachment #365592 for bug #485612




gtk_c_sources = $(gtk_base_c_sources)
gtk_all_c_sources = $(gtk_base_c_sources)

gtk_dbus_built_sources = gtkdbusgenerated.c gtkdbusgenerated.h

$(gtk_dbus_built_sources) : Makefile.am gtkdbusinterfaces.xml
	$(AM_V_GEN) gdbus-codegen \
	--interface-prefix org.Gtk. \
	--c-namespace _Gtk \
	--generate-c-code gtkdbusgenerated \
	$(srcdir)/gtkdbusinterfaces.xml

nodist_gtk_c_sources += $(gtk_dbus_built_sources)
gtk_all_c_sources += $(gtk_dbus_built_sources)

gtk_os_unix_c_sources = 		\
	gtkcustompaperunixdialog.c	\
	gtkpagesetupunixdialog.c	\

#
MAINTAINERCLEANFILES = \
	$(gtk_built_sources) 			\
	$(gtk_dbus_built_sources)		\
	$(stamp_files) 				\
	$(GENERATED_ICONS) 			\
	stock-icons/icon-theme.cache


BUILT_SOURCES = \
	$(gtk_built_sources) \
	$(gtk_dbus_built_sources) \
	stamp-icons

# all autogenerated files need to be generated in the srcdir,

dist-hook: ../build/win32/vs9/gtk.vcproj ../build/win32/vs10/gtk.vcxproj ../build/win32/vs10/gtk.vcxproj.filters

../build/win32/vs9/gtk.vcproj: ../build/win32/vs9/gtk.vcprojin
	for F in `echo $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources) | tr '/' '\\'`; do \
		case $$F in \
		*.c) echo '   <File RelativePath="..\..\..\gtk\'$$F'" />' \
		     ;; \

	rm libgtk.sourcefiles

../build/win32/vs10/gtk.vcxproj: ../build/win32/vs10/gtk.vcxprojin
	for F in `echo $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources) | tr '/' '\\'`; do \
		case $$F in \
		*.c) echo '   <ClCompile Include="..\..\..\gtk\'$$F'" />' \
		     ;; \

	gtkprint-win32.c	\
	gtksearchenginequartz.h \
	gtk.gresource.xml	\
	gtkdbusinterfaces.xml	\
	gtk-default.css		\
	gtk-keys.css.default	\
	gtk-keys.css.emacs	\




--- gtk/Makefile.am	2013-10-31 18:20:25.333509265 +0100


#include "gtkmountoperationprivate.h"
#include "gtkbox.h"
#if 0
#include "gtkdbusgenerated.h"
#endif
#include "gtkentry.h"
#include "gtkbox.h"
#include "gtkintl.h"

#include "gtkimagemenuitem.h"
#include "gtkmain.h"

#if 0
#include <glib/gprintf.h>
#endif

/**
 * SECTION:filesystem

  GtkDialog *dialog;
  GdkScreen *screen;

#if 0
  /* bus proxy */
  _GtkMountOperationHandler *handler;
  GCancellable *cancellable;
  gboolean handler_showing;
#endif

  /* for the ask-password dialog */
  GtkWidget *grid;

static void
gtk_mount_operation_init (GtkMountOperation *operation)
{
#if 0
  gchar *name_owner;
#endif

  operation->priv = G_TYPE_INSTANCE_GET_PRIVATE (operation,
                                                 GTK_TYPE_MOUNT_OPERATION,
                                                 GtkMountOperationPrivate);
#if 0
  operation->priv->handler =
    _gtk_mount_operation_handler_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
                                                         G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,


  if (operation->priv->handler)
    g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (operation->priv->handler), G_MAXINT);
#endif
}

static void

  if (priv->screen)
    g_object_unref (priv->screen);

#if 0
  if (priv->handler)
    g_object_unref (priv->handler);
#endif

  G_OBJECT_CLASS (gtk_mount_operation_parent_class)->finalize (object);
}

      break;

    case PROP_IS_SHOWING:
#if 0
      g_value_set_boolean (value, priv->dialog != NULL || priv->handler_showing);
#else
      g_value_set_boolean (value, priv->dialog != NULL);
#endif
      break;

    case PROP_SCREEN:

    }
}

#if 0
static void
gtk_mount_operation_proxy_finish (GtkMountOperation     *op,
                                  GMountOperationResult  result)

  /* drop the reference acquired when calling the proxy method */
  g_object_unref (op);
}
#endif

static void
remember_button_toggled (GtkToggleButton   *button,

  g_object_ref (operation);
}

#if 0
static void
call_password_proxy_cb (GObject      *source,
                        GAsyncResult *res,

                                                  operation->priv->ask_flags, NULL,
                                                  call_password_proxy_cb, operation);
}
#endif

static void
gtk_mount_operation_ask_password (GMountOperation   *mount_op,

  priv = operation->priv;
  priv->ask_flags = flags;

#if 0
  use_gtk = (operation->priv->handler == NULL) ||
    (priv->ask_flags & G_ASK_PASSWORD_NEED_DOMAIN) ||
    (priv->ask_flags & G_ASK_PASSWORD_NEED_USERNAME);

    gtk_mount_operation_ask_password_do_gtk (operation, message, default_user, default_domain);
  else
    gtk_mount_operation_ask_password_do_proxy (operation, message, default_user, default_domain);
#else
    gtk_mount_operation_ask_password_do_gtk (operation, message, default_user, default_domain);
#endif
}

static void

  g_object_ref (op);
}

#if 0
static void
call_question_proxy_cb (GObject      *source,
                        GAsyncResult *res,

                                                  choices, NULL,
                                                  call_question_proxy_cb, operation);
}
#endif

static void
gtk_mount_operation_ask_question (GMountOperation *op,

  gboolean use_gtk;

  operation = GTK_MOUNT_OPERATION (op);
#if 0
  use_gtk = (operation->priv->handler == NULL);

  if (use_gtk)
    gtk_mount_operation_ask_question_do_gtk (operation, message, choices);
  else
    gtk_mount_operation_ask_question_do_proxy (operation, message, choices);
#else
    gtk_mount_operation_ask_question_do_gtk (operation, message, choices);
#endif
}

static void

  return dialog;
}

#if 0
static void
call_processes_proxy_cb (GObject     *source,
                        GAsyncResult *res,

                                                    choices, NULL,
                                                    call_processes_proxy_cb, operation);
}
#endif

static void
gtk_mount_operation_show_processes_do_gtk (GtkMountOperation *op,

  gboolean use_gtk;

  operation = GTK_MOUNT_OPERATION (op);
#if 0
  use_gtk = (operation->priv->handler == NULL);

  if (use_gtk)
    gtk_mount_operation_show_processes_do_gtk (operation, message, processes, choices);
  else
    gtk_mount_operation_show_processes_do_proxy (operation, message, processes, choices);
#else
    gtk_mount_operation_show_processes_do_gtk (operation, message, processes, choices);
#endif
}

static void

      g_object_unref (op);
    }

#if 0
  if (priv->handler != NULL)
    {
      _gtk_mount_operation_handler_call_close (priv->handler, NULL, NULL, NULL);

      priv->handler_showing = FALSE;
      g_object_notify (G_OBJECT (op), "is-showing");
    }
#endif
}

/**

Return to bug 485612

Lines 888-905 Link Here

(-)a/gtk/Makefile.am (-17 / +2 lines)
888	gtk_c_sources = $(gtk_base_c_sources)	888	gtk_c_sources = $(gtk_base_c_sources)
889	gtk_all_c_sources = $(gtk_base_c_sources)	889	gtk_all_c_sources = $(gtk_base_c_sources)
890		890
891	gtk_dbus_built_sources = gtkdbusgenerated.c gtkdbusgenerated.h
892
893	$(gtk_dbus_built_sources) : Makefile.am gtkdbusinterfaces.xml
894	$(AM_V_GEN) gdbus-codegen \
895	--interface-prefix org.Gtk. \
896	--c-namespace _Gtk \
897	--generate-c-code gtkdbusgenerated \
898	$(srcdir)/gtkdbusinterfaces.xml
899
900	nodist_gtk_c_sources += $(gtk_dbus_built_sources)
901	gtk_all_c_sources += $(gtk_dbus_built_sources)
902
903	gtk_os_unix_c_sources = \	891	gtk_os_unix_c_sources = \
904	gtkcustompaperunixdialog.c \	892	gtkcustompaperunixdialog.c \
905	gtkpagesetupunixdialog.c \	893	gtkpagesetupunixdialog.c \
Lines 1068-1074 Link Here
1068	#	1056	#
1069	MAINTAINERCLEANFILES = \	1057	MAINTAINERCLEANFILES = \
1070	$(gtk_built_sources) \	1058	$(gtk_built_sources) \
1071	$(gtk_dbus_built_sources) \
1072	$(stamp_files) \	1059	$(stamp_files) \
1073	$(GENERATED_ICONS) \	1060	$(GENERATED_ICONS) \
1074	stock-icons/icon-theme.cache	1061	stock-icons/icon-theme.cache
Lines 1100-1106 Link Here
1100		1087
1101	BUILT_SOURCES = \	1088	BUILT_SOURCES = \
1102	$(gtk_built_sources) \	1089	$(gtk_built_sources) \
1103	$(gtk_dbus_built_sources) \
1104	stamp-icons	1090	stamp-icons
1105		1091
1106	# all autogenerated files need to be generated in the srcdir,	1092	# all autogenerated files need to be generated in the srcdir,
Lines 1210-1216 Link Here
1210	dist-hook: ../build/win32/vs9/gtk.vcproj ../build/win32/vs10/gtk.vcxproj ../build/win32/vs10/gtk.vcxproj.filters	1196	dist-hook: ../build/win32/vs9/gtk.vcproj ../build/win32/vs10/gtk.vcxproj ../build/win32/vs10/gtk.vcxproj.filters
1211		1197
1212	../build/win32/vs9/gtk.vcproj: ../build/win32/vs9/gtk.vcprojin	1198	../build/win32/vs9/gtk.vcproj: ../build/win32/vs9/gtk.vcprojin
1213	for F in `echo $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources) $(gtk_dbus_built_sources) \| tr '/' '\\'`; do \	1199	for F in `echo $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources) \| tr '/' '\\'`; do \
1214	case $$F in \	1200	case $$F in \
1215	*.c) echo ' <File RelativePath="..\..\..\gtk\'$$F'" />' \	1201	*.c) echo ' <File RelativePath="..\..\..\gtk\'$$F'" />' \
1216	;; \	1202	;; \
Lines 1220-1226 Link Here
1220	rm libgtk.sourcefiles	1206	rm libgtk.sourcefiles
1221		1207
1222	../build/win32/vs10/gtk.vcxproj: ../build/win32/vs10/gtk.vcxprojin	1208	../build/win32/vs10/gtk.vcxproj: ../build/win32/vs10/gtk.vcxprojin
1223	for F in `echo $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources) $(gtk_dbus_built_sources) \| tr '/' '\\'`; do \	1209	for F in `echo $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources) \| tr '/' '\\'`; do \
1224	case $$F in \	1210	case $$F in \
1225	*.c) echo ' <ClCompile Include="..\..\..\gtk\'$$F'" />' \	1211	*.c) echo ' <ClCompile Include="..\..\..\gtk\'$$F'" />' \
1226	;; \	1212	;; \
Lines 1706-1712 Link Here
1706	gtkprint-win32.c \	1692	gtkprint-win32.c \
1707	gtksearchenginequartz.h \	1693	gtksearchenginequartz.h \
1708	gtk.gresource.xml \	1694	gtk.gresource.xml \
1709	gtkdbusinterfaces.xml \
1710	gtk-default.css \	1695	gtk-default.css \
1711	gtk-keys.css.default \	1696	gtk-keys.css.default \
1712	gtk-keys.css.emacs \	1697	gtk-keys.css.emacs \

Line 0 Link Here

(-)a/gtk/gtkmountoperation.c (-1 / +39 lines)
		1	--- gtk/Makefile.am 2013-10-31 18:20:25.333509265 +0100
Lines 29-35 Link Here
29		29
30	#include "gtkmountoperationprivate.h"	30	#include "gtkmountoperationprivate.h"
31	#include "gtkbox.h"	31	#include "gtkbox.h"
		32	#if 0
32	#include "gtkdbusgenerated.h"	33	#include "gtkdbusgenerated.h"
		34	#endif
33	#include "gtkentry.h"	35	#include "gtkentry.h"
34	#include "gtkbox.h"	36	#include "gtkbox.h"
35	#include "gtkintl.h"	37	#include "gtkintl.h"
Lines 50-56 Link Here
50	#include "gtkimagemenuitem.h"	52	#include "gtkimagemenuitem.h"
51	#include "gtkmain.h"	53	#include "gtkmain.h"
52		54
		55	#if 0
53	#include <glib/gprintf.h>	56	#include <glib/gprintf.h>
		57	#endif
54		58
55	/**	59	/**
56	* SECTION:filesystem	60	* SECTION:filesystem
Lines 118-127 Link Here
118	GtkDialog *dialog;	122	GtkDialog *dialog;
119	GdkScreen *screen;	123	GdkScreen *screen;
120		124
		125	#if 0
121	/* bus proxy */	126	/* bus proxy */
122	_GtkMountOperationHandler *handler;	127	_GtkMountOperationHandler *handler;
123	GCancellable *cancellable;	128	GCancellable *cancellable;
124	gboolean handler_showing;	129	gboolean handler_showing;
		130	#endif
125		131
126	/* for the ask-password dialog */	132	/* for the ask-password dialog */
127	GtkWidget *grid;	133	GtkWidget *grid;
Lines 185-196 Link Here
185	static void	191	static void
186	gtk_mount_operation_init (GtkMountOperation *operation)	192	gtk_mount_operation_init (GtkMountOperation *operation)
187	{	193	{
		194	#if 0
188	gchar *name_owner;	195	gchar *name_owner;
		196	#endif
189		197
190	operation->priv = G_TYPE_INSTANCE_GET_PRIVATE (operation,	198	operation->priv = G_TYPE_INSTANCE_GET_PRIVATE (operation,
191	GTK_TYPE_MOUNT_OPERATION,	199	GTK_TYPE_MOUNT_OPERATION,
192	GtkMountOperationPrivate);	200	GtkMountOperationPrivate);
193		201	#if 0
194	operation->priv->handler =	202	operation->priv->handler =
195	_gtk_mount_operation_handler_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,	203	_gtk_mount_operation_handler_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
196	G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,	204	G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
Lines 204-209 Link Here
204		212
205	if (operation->priv->handler)	213	if (operation->priv->handler)
206	g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (operation->priv->handler), G_MAXINT);	214	g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (operation->priv->handler), G_MAXINT);
		215	#endif
207	}	216	}
208		217
209	static void	218	static void
Lines 221-228 Link Here
221	if (priv->screen)	230	if (priv->screen)
222	g_object_unref (priv->screen);	231	g_object_unref (priv->screen);
223		232
		233	#if 0
224	if (priv->handler)	234	if (priv->handler)
225	g_object_unref (priv->handler);	235	g_object_unref (priv->handler);
		236	#endif
226		237
227	G_OBJECT_CLASS (gtk_mount_operation_parent_class)->finalize (object);	238	G_OBJECT_CLASS (gtk_mount_operation_parent_class)->finalize (object);
228	}	239	}
Lines 268-274 Link Here
268	break;	279	break;
269		280
270	case PROP_IS_SHOWING:	281	case PROP_IS_SHOWING:
		282	#if 0
271	g_value_set_boolean (value, priv->dialog != NULL \|\| priv->handler_showing);	283	g_value_set_boolean (value, priv->dialog != NULL \|\| priv->handler_showing);
		284	#else
		285	g_value_set_boolean (value, priv->dialog != NULL);
		286	#endif
272	break;	287	break;
273		288
274	case PROP_SCREEN:	289	case PROP_SCREEN:
Lines 281-286 Link Here
281	}	296	}
282	}	297	}
283		298
		299	#if 0
284	static void	300	static void
285	gtk_mount_operation_proxy_finish (GtkMountOperation *op,	301	gtk_mount_operation_proxy_finish (GtkMountOperation *op,
286	GMountOperationResult result)	302	GMountOperationResult result)
Lines 295-300 Link Here
295	/* drop the reference acquired when calling the proxy method */	311	/* drop the reference acquired when calling the proxy method */
296	g_object_unref (op);	312	g_object_unref (op);
297	}	313	}
		314	#endif
298		315
299	static void	316	static void
300	remember_button_toggled (GtkToggleButton *button,	317	remember_button_toggled (GtkToggleButton *button,
Lines 726-731 Link Here
726	g_object_ref (operation);	743	g_object_ref (operation);
727	}	744	}
728		745
		746	#if 0
729	static void	747	static void
730	call_password_proxy_cb (GObject *source,	748	call_password_proxy_cb (GObject *source,
731	GAsyncResult *res,	749	GAsyncResult *res,
Lines 786-791 Link Here
786	operation->priv->ask_flags, NULL,	804	operation->priv->ask_flags, NULL,
787	call_password_proxy_cb, operation);	805	call_password_proxy_cb, operation);
788	}	806	}
		807	#endif
789		808
790	static void	809	static void
791	gtk_mount_operation_ask_password (GMountOperation *mount_op,	810	gtk_mount_operation_ask_password (GMountOperation *mount_op,
Lines 802-807 Link Here
802	priv = operation->priv;	821	priv = operation->priv;
803	priv->ask_flags = flags;	822	priv->ask_flags = flags;
804		823
		824	#if 0
805	use_gtk = (operation->priv->handler == NULL) \|\|	825	use_gtk = (operation->priv->handler == NULL) \|\|
806	(priv->ask_flags & G_ASK_PASSWORD_NEED_DOMAIN) \|\|	826	(priv->ask_flags & G_ASK_PASSWORD_NEED_DOMAIN) \|\|
807	(priv->ask_flags & G_ASK_PASSWORD_NEED_USERNAME);	827	(priv->ask_flags & G_ASK_PASSWORD_NEED_USERNAME);
Lines 810-815 Link Here
810	gtk_mount_operation_ask_password_do_gtk (operation, message, default_user, default_domain);	830	gtk_mount_operation_ask_password_do_gtk (operation, message, default_user, default_domain);
811	else	831	else
812	gtk_mount_operation_ask_password_do_proxy (operation, message, default_user, default_domain);	832	gtk_mount_operation_ask_password_do_proxy (operation, message, default_user, default_domain);
		833	#else
		834	gtk_mount_operation_ask_password_do_gtk (operation, message, default_user, default_domain);
		835	#endif
813	}	836	}
814		837
815	static void	838	static void
Lines 893-898 Link Here
893	g_object_ref (op);	916	g_object_ref (op);
894	}	917	}
895		918
		919	#if 0
896	static void	920	static void
897	call_question_proxy_cb (GObject *source,	921	call_question_proxy_cb (GObject *source,
898	GAsyncResult *res,	922	GAsyncResult *res,
Lines 949-954 Link Here
949	choices, NULL,	973	choices, NULL,
950	call_question_proxy_cb, operation);	974	call_question_proxy_cb, operation);
951	}	975	}
		976	#endif
952		977
953	static void	978	static void
954	gtk_mount_operation_ask_question (GMountOperation *op,	979	gtk_mount_operation_ask_question (GMountOperation *op,
Lines 959-970 Link Here
959	gboolean use_gtk;	984	gboolean use_gtk;
960		985
961	operation = GTK_MOUNT_OPERATION (op);	986	operation = GTK_MOUNT_OPERATION (op);
		987	#if 0
962	use_gtk = (operation->priv->handler == NULL);	988	use_gtk = (operation->priv->handler == NULL);
963		989
964	if (use_gtk)	990	if (use_gtk)
965	gtk_mount_operation_ask_question_do_gtk (operation, message, choices);	991	gtk_mount_operation_ask_question_do_gtk (operation, message, choices);
966	else	992	else
967	gtk_mount_operation_ask_question_do_proxy (operation, message, choices);	993	gtk_mount_operation_ask_question_do_proxy (operation, message, choices);
		994	#else
		995	gtk_mount_operation_ask_question_do_gtk (operation, message, choices);
		996	#endif
968	}	997	}
969		998
970	static void	999	static void
Lines 1510-1515 Link Here
1510	return dialog;	1539	return dialog;
1511	}	1540	}
1512		1541
		1542	#if 0
1513	static void	1543	static void
1514	call_processes_proxy_cb (GObject *source,	1544	call_processes_proxy_cb (GObject *source,
1515	GAsyncResult *res,	1545	GAsyncResult *res,
Lines 1576-1581 Link Here
1576	choices, NULL,	1606	choices, NULL,
1577	call_processes_proxy_cb, operation);	1607	call_processes_proxy_cb, operation);
1578	}	1608	}
		1609	#endif
1579		1610
1580	static void	1611	static void
1581	gtk_mount_operation_show_processes_do_gtk (GtkMountOperation *op,	1612	gtk_mount_operation_show_processes_do_gtk (GtkMountOperation *op,
Lines 1623-1634 Link Here
1623	gboolean use_gtk;	1654	gboolean use_gtk;
1624		1655
1625	operation = GTK_MOUNT_OPERATION (op);	1656	operation = GTK_MOUNT_OPERATION (op);
		1657	#if 0
1626	use_gtk = (operation->priv->handler == NULL);	1658	use_gtk = (operation->priv->handler == NULL);
1627		1659
1628	if (use_gtk)	1660	if (use_gtk)
1629	gtk_mount_operation_show_processes_do_gtk (operation, message, processes, choices);	1661	gtk_mount_operation_show_processes_do_gtk (operation, message, processes, choices);
1630	else	1662	else
1631	gtk_mount_operation_show_processes_do_proxy (operation, message, processes, choices);	1663	gtk_mount_operation_show_processes_do_proxy (operation, message, processes, choices);
		1664	#else
		1665	gtk_mount_operation_show_processes_do_gtk (operation, message, processes, choices);
		1666	#endif
1632	}	1667	}
1633		1668
1634	static void	1669	static void
Lines 1646-1651 Link Here
1646	g_object_unref (op);	1681	g_object_unref (op);
1647	}	1682	}
1648		1683
		1684	#if 0
1649	if (priv->handler != NULL)	1685	if (priv->handler != NULL)
1650	{	1686	{
1651	_gtk_mount_operation_handler_call_close (priv->handler, NULL, NULL, NULL);	1687	_gtk_mount_operation_handler_call_close (priv->handler, NULL, NULL, NULL);
Lines 1653-1658 Link Here
1653	priv->handler_showing = FALSE;	1689	priv->handler_showing = FALSE;
1654	g_object_notify (G_OBJECT (op), "is-showing");	1690	g_object_notify (G_OBJECT (op), "is-showing");
1655	}	1691	}
		1692	#endif
1656	}	1693	}
1657		1694
1658	/**	1695	/**