GNOME.org
 

[epiphany-extensions] includes: remove unused files, update others

commit 06be55e9a4f270fc8b44a797e42c7efc3d3904a4
Author: Diego Escalante Urrelo <descalante igalia com>
Date:   Sat Jan 23 10:11:36 2010 -0500

    includes: remove unused files, update others
    
    Remove the include epiphany.h limitation

 include/EphyUtils.h            |   69 ---------------
 include/eel-gconf-extensions.h |    5 +-
 include/egg-editable-toolbar.h |   96 --------------------
 include/egg-toolbars-model.h   |  190 ----------------------------------------
 include/ephy-bookmarks-menu.h  |   64 --------------
 include/ephy-debug.h           |    3 +-
 include/ephy-dnd.h             |    3 +-
 include/ephy-embed-dialog.h    |   71 ---------------
 include/ephy-favicon-cache.h   |   70 ---------------
 include/ephy-file-chooser.h    |    3 +-
 include/ephy-file-helpers.h    |  101 +++++++++------------
 include/ephy-gui.h             |   23 +++---
 include/ephy-prefs.h           |   10 ++-
 include/ephy-string.h          |    1 -
 14 files changed, 67 insertions(+), 642 deletions(-)
---
diff --git a/include/eel-gconf-extensions.h b/include/eel-gconf-extensions.h
index 8de6b60..36ce016 100644
--- a/include/eel-gconf-extensions.h
+++ b/include/eel-gconf-extensions.h
@@ -16,12 +16,11 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Authors: Ramiro Estrugo <ramiro eazel com>
 
-   $Id$
 */
 
 #ifndef EEL_GCONF_EXTENSIONS_H
diff --git a/include/ephy-debug.h b/include/ephy-debug.h
index ced1d5c..7a060e8 100644
--- a/include/ephy-debug.h
+++ b/include/ephy-debug.h
@@ -13,9 +13,8 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- *  $Id$
  */
 
 #ifndef EPHY_DEBUG_H
diff --git a/include/ephy-dnd.h b/include/ephy-dnd.h
index 7819cab..c164167 100644
--- a/include/ephy-dnd.h
+++ b/include/ephy-dnd.h
@@ -13,9 +13,8 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- *  $Id$
  */
 
 #ifndef EPHY_DND_H
diff --git a/include/ephy-file-chooser.h b/include/ephy-file-chooser.h
index 0e33981..286864d 100644
--- a/include/ephy-file-chooser.h
+++ b/include/ephy-file-chooser.h
@@ -13,9 +13,8 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- *  $Id$
  */
 
 #ifndef EPHY_FILE_CHOOSER_H
diff --git a/include/ephy-file-helpers.h b/include/ephy-file-helpers.h
index 6377421..3d0e320 100644
--- a/include/ephy-file-helpers.h
+++ b/include/ephy-file-helpers.h
@@ -17,7 +17,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- *  $Id$
  */
 
 #ifndef EPHY_FILE_HELPERS_H
@@ -27,6 +26,9 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
+/* From libgnome */
+#define GNOME_DOT_GNOME ".gnome2"
+
 extern GQuark ephy_file_helpers_error_quark;
 #define EPHY_FILE_HELPERS_ERROR_QUARK	(ephy_file_helpers_error_quark)
 
@@ -39,63 +41,46 @@ typedef enum
 	EPHY_MIME_PERMISSION_UNKNOWN	= 3
 } EphyMimePermission;
 
-gboolean    ephy_file_helpers_init       (const char *profile_dir,
-					  gboolean private_profile,
-					  gboolean keep_temp_dir,
-					  GError **error);
-
-const char *ephy_file                    (const char *filename);
-
-const char *ephy_dot_dir                 (void);
-
-void        ephy_file_helpers_shutdown   (void);
-
-char       *ephy_file_downloads_dir      (void);
-
-char	   *ephy_file_get_downloads_dir	 (void);
-
-char       *ephy_file_desktop_dir	 (void);
-
-const char *ephy_file_tmp_dir	 	 (void);
-
-char       *ephy_file_tmp_filename	 (const char *base,
-					  const char *extension);
-
-gboolean    ephy_ensure_dir_exists       (const char *dir,
-					  GError **);
-
-GSList     *ephy_file_find               (const char *path,
-				          const char *fname,
-				          gint maxdepth);
-
-gboolean    ephy_file_switch_temp_file (GFile *file,
-					GFile *file_temp);
-
-void	    ephy_file_delete_on_exit	 (GFile *file);
-
-void	    ephy_file_add_recent_item	 (const char *uri,
-					  const char *mime_type);
-
-EphyMimePermission ephy_file_check_mime	 (const char *mime_type);
-
-gboolean    ephy_file_launch_desktop_file (const char *filename,
-					   const char *parameter,
-					   guint32 user_time,
-					   GtkWidget *widget);
-
-gboolean    ephy_file_launch_application (GAppInfo *app,
-					  GList *files,
-					  guint32 user_time,
-					  GtkWidget *parent);
-
-gboolean    ephy_file_launch_handler	 (const char *mime_type,
-					  GFile *file,
-					  guint32 user_time);
-
-gboolean    ephy_file_browse_to		 (GFile *file,
-					  guint32 user_time);
-
-void	   ephy_file_delete_directory	 (const char *path);
+gboolean           ephy_file_helpers_init        (const char  *profile_dir,
+                                                  gboolean     private_profile,
+                                                  gboolean     keep_temp_dir,
+                                                  GError     **error);
+const char *       ephy_file                     (const char  *filename);
+const char *       ephy_dot_dir                  (void);
+void               ephy_file_helpers_shutdown    (void);
+char       *       ephy_file_downloads_dir       (void);
+char	   *       ephy_file_get_downloads_dir   (void);
+char       *       ephy_file_desktop_dir         (void);
+const char *       ephy_file_tmp_dir             (void);
+char       *       ephy_file_tmp_filename        (const char  *base,
+                                                  const char  *extension);
+gboolean           ephy_ensure_dir_exists        (const char  *dir,
+                                                  GError **);
+GSList     *       ephy_file_find                (const char  *path,
+                                                  const char  *fname,
+                                                  gint         maxdepth);
+gboolean           ephy_file_switch_temp_file    (GFile       *file,
+                                                  GFile       *file_temp);
+void               ephy_file_delete_on_exit      (GFile       *file);
+void               ephy_file_add_recent_item     (const char  *uri,
+                                                  const char  *mime_type);
+EphyMimePermission ephy_file_check_mime          (const char  *mime_type);
+gboolean           ephy_file_launch_desktop_file (const char  *filename,
+                                                  const char  *parameter,
+                                                  guint32      user_time,
+                                                  GtkWidget   *widget);
+gboolean           ephy_file_launch_application  (GAppInfo    *app,
+                                                  GList       *files,
+                                                  guint32      user_time,
+                                                  GtkWidget   *widget);
+gboolean           ephy_file_launch_handler      (const char  *mime_type,
+                                                  GFile       *file,
+                                                  guint32      user_time);
+gboolean           ephy_file_browse_to           (GFile       *file,
+                                                  guint32      user_time);
+void               ephy_file_delete_directory    (const char  *path);
+void               ephy_file_delete_uri          (const char  *uri);
+gboolean           ephy_has_private_profile      (void);
 
 G_END_DECLS
 
diff --git a/include/ephy-gui.h b/include/ephy-gui.h
index 7811b80..4f73a49 100644
--- a/include/ephy-gui.h
+++ b/include/ephy-gui.h
@@ -13,17 +13,16 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- *  $Id$
  */
 
 #ifndef EPHY_GUI_H
 #define EPHY_GUI_H
 
-#include <gtk/gtk.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdkkeysyms.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
@@ -61,20 +60,20 @@ gboolean	ephy_gui_is_middle_click		 (void);
 gboolean	ephy_gui_check_location_writable         (GtkWidget *parent,
 							  const char *filename);
 
-void		ephy_gui_help				 (GtkWindow *parent,
-							  const char *file_name,
-							  const char *link_id);
-
-void		ephy_gui_help_with_doc_id		 (GtkWindow *parent,
-							  const char *doc_id,
-							  const char *file_name,
-							  const char *link_id);
+void		ephy_gui_help				 (GtkWidget *parent,
+							  const char *section);
 
 void		ephy_gui_window_update_user_time	 (GtkWidget *window,
 							  guint32 user_time);
 
 GtkWidget      *ephy_gui_message_dialog_get_content_box	 (GtkWidget *dialog);
 
+void		ephy_gui_message_dialog_set_wrap_mode	 (GtkMessageDialog *dialog,
+							  PangoWrapMode wrap_mode);
+
+void		ephy_gui_connect_checkbutton_to_gconf	 (GtkWidget *widget,
+							  const char *pref);
+
 G_END_DECLS
 
 #endif
diff --git a/include/ephy-prefs.h b/include/ephy-prefs.h
index 9af8574..92a7bbe 100644
--- a/include/ephy-prefs.h
+++ b/include/ephy-prefs.h
@@ -13,9 +13,8 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- *  $Id$
  */
 
 #ifndef EPHY_PREFS_H
@@ -28,15 +27,19 @@ G_BEGIN_DECLS
 
 /* General */
 #define CONF_GENERAL_HOMEPAGE			"/apps/epiphany/general/homepage"
+#define CONF_URL_SEARCH     			"/apps/epiphany/general/url_search"
 #define CONF_ALWAYS_SHOW_TABS_BAR		"/apps/epiphany/general/always_show_tabs_bar"
 #define CONF_WINDOWS_SHOW_TOOLBARS		"/apps/epiphany/general/show_toolbars"
 #define CONF_WINDOWS_SHOW_BOOKMARKS_BAR		"/apps/epiphany/general/show_bookmarks_bar"
 #define CONF_WINDOWS_SHOW_STATUSBAR		"/apps/epiphany/general/show_statusbar"
 #define CONF_INTERFACE_MIDDLE_CLICK_OPEN_URL	"/apps/epiphany/general/middle_click_open_url"
 #define CONF_INTERFACE_TOOLBAR_STYLE		"/apps/epiphany/general/toolbar_style"
+#define CONF_INTERFACE_OPEN_NEW_WINDOWS_IN_TAB	"/apps/epiphany/general/open_new_windows_in_tab"
 #define CONF_AUTO_DOWNLOADS			"/apps/epiphany/general/automatic_downloads"
 #define CONF_DESKTOP_IS_HOME_DIR		"/apps/nautilus/preferences/desktop_is_home_dir"
 #define CONF_NETWORK_MANAGED			"/apps/epiphany/general/managed_network"
+#define CONF_DOWNLOADS_HIDDEN			"/apps/epiphany/dialogs/downloads_hidden"
+#define CONF_WARN_ON_CLOSE_UNSUBMITTED_DATA     "/apps/epiphany/dialogs/warn_on_close_unsubmitted_data"
 
 /* Directories */
 #define CONF_STATE_SAVE_DIR		"/apps/epiphany/directories/save"
@@ -65,6 +68,9 @@ G_BEGIN_DECLS
 #define CONF_DESKTOP_BG_PICTURE		"/desktop/gnome/background/picture_filename"
 #define CONF_DESKTOP_BG_TYPE		"/desktop/gnome/background/picture_options"
 
+/* Privacy */
+#define CONF_PRIVACY_REMEMBER_PASSWORDS "/apps/epiphany/general/remember_passwords"
+
 G_END_DECLS
 
 #endif
diff --git a/include/ephy-string.h b/include/ephy-string.h
index de7ebe2..f71ada5 100644
--- a/include/ephy-string.h
+++ b/include/ephy-string.h
@@ -15,7 +15,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- *  $Id$
  */
 
 #ifndef EPHY_STRING_H
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]