diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2006-07-14 14:50:36 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2006-07-14 14:50:36 +0000 |
| commit | 74a16a6ca3ea74438ca7d89716529f1e67a72a91 (patch) | |
| tree | 5a6003f4c1032a3657cc78eefa539ab4846454be | |
| parent | b8760224d5b10695887a79de5264f4b1a183be3c (diff) | |
| download | epiphany-gnome-2-6.tar.gz | |
Committing uncommitted changes before svn migration. This branch is DEAD!gnome-2-6
2006-07-14 Christian Persch <chpe@cvs.gnome.org>
Committing uncommitted changes before svn migration.
This branch is DEAD!
* embed/mozilla/Makefile.am:
* lib/ephy-state.c: (paned_sync_position_cb),
(ephy_state_add_paned):
* src/bookmarks/ephy-bookmarks-editor.c:
(ephy_bookmarks_editor_construct):
| -rw-r--r-- | COPYING | 5 | ||||
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | embed/mozilla/Makefile.am | 5 | ||||
| -rw-r--r-- | lib/ephy-state.c | 10 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-editor.c | 2 |
5 files changed, 17 insertions, 16 deletions
@@ -338,8 +338,3 @@ proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. - - -The loading.gif image found in data/art is part of the mozilla project, and -is licensed under the MPL. You can find a copy of this license at -http://www.mozilla.org/MPL/MPL-1.1.html. @@ -1,3 +1,14 @@ +2006-07-14 Christian Persch <chpe@cvs.gnome.org> + + Committing uncommitted changes before svn migration. + This branch is DEAD! + + * embed/mozilla/Makefile.am: + * lib/ephy-state.c: (paned_sync_position_cb), + (ephy_state_add_paned): + * src/bookmarks/ephy-bookmarks-editor.c: + (ephy_bookmarks_editor_construct): + 2005-03-25 Christian Persch <chpe@cvs.gnome.org> * configure.in: diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am index 0bb38d568..bbf5045c4 100644 --- a/embed/mozilla/Makefile.am +++ b/embed/mozilla/Makefile.am @@ -46,11 +46,6 @@ INCLUDES = \ -DALLOW_PRIVATE_STRINGS \ -include $(MOZILLA_INCLUDE_ROOT)/mozilla-config.h -if MAINTAINER_MODE -INCLUDES += -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(MOZILLA_WARN_CXXFLAGS) -endif - noinst_LTLIBRARIES = libephymozillaembed.la libephymozillaembed_la_SOURCES = \ diff --git a/lib/ephy-state.c b/lib/ephy-state.c index d0bf34d31..2a9b008dd 100644 --- a/lib/ephy-state.c +++ b/lib/ephy-state.c @@ -386,15 +386,15 @@ ephy_state_add_window (GtkWidget *window, } static gboolean -paned_size_allocate_cb (GtkWidget *paned, - GtkAllocation *allocation, +paned_sync_position_cb (GtkWidget *paned, + GParamSpec *pspec, EphyNode *node) { int width; GValue value = { 0, }; width = gtk_paned_get_position (GTK_PANED (paned)); - + g_value_init (&value, G_TYPE_INT); g_value_set_int (&value, width); ephy_node_set_property (node, EPHY_NODE_STATE_PROP_WIDTH, @@ -438,8 +438,8 @@ ephy_state_add_paned (GtkWidget *paned, width = ephy_node_get_property_int (node, EPHY_NODE_STATE_PROP_WIDTH); gtk_paned_set_position (GTK_PANED (paned), width); - g_signal_connect (paned, "size_allocate", - G_CALLBACK (paned_size_allocate_cb), node); + g_signal_connect (paned, "notify::position", + G_CALLBACK (paned_sync_position_cb), node); } static void diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index 04d58ca69..77cc47d8f 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -1428,7 +1428,7 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor) "vscrollbar_policy", GTK_POLICY_AUTOMATIC, "shadow_type", GTK_SHADOW_IN, NULL); - gtk_paned_pack1 (GTK_PANED (hpaned), GTK_WIDGET (scrolled_window), TRUE, TRUE); + gtk_paned_pack1 (GTK_PANED (hpaned), GTK_WIDGET (scrolled_window), FALSE, TRUE); gtk_widget_show (scrolled_window); /* Keywords View */ |