org.guifications.plugins: f0cf87fead8379dee5d3f4f358c8974615052254
grim at guifications.org
grim at guifications.org
Fri Apr 4 22:15:21 CDT 2008
-----------------------------------------------------------------
Revision: f0cf87fead8379dee5d3f4f358c8974615052254
Ancestor: 030287bd0e15166fd58c44618b5a26cfd34690dd
Author: grim at guifications.org
Date: 2008-04-05T03:09:02
Branch: org.guifications.plugins
Modified files:
manualsize/manualsize.c
ChangeLog:
a ton of random cleanups
-----------------------------------------------------------------
This revision's diffstat output:
manualsize.c | 109 ++++++++++++++++++++++++++++++++++-------------------------
1 file changed, 64 insertions(+), 45 deletions(-)
-------------- next part --------------
============================================================
--- manualsize/manualsize.c 7f3bbb431006e9fe87c78167e57bc97e7da61000
+++ manualsize/manualsize.c d235efe0b94fa469359ceea546bdeac54b8c5849
@@ -45,18 +45,20 @@ static GtkWidget *
* use it as a base for evaluating position of separator in a GtkVPaned
*/
static GtkWidget *
-find_placed_object(GtkWidget * w, int * client_height) {
- GtkWidget * ret;
- gint border_width;
- border_width = gtk_container_get_border_width( GTK_CONTAINER(w) );
- if ((w->allocation.height > 1)||(gtk_widget_get_parent(w)==NULL)) {
- *client_height = w->allocation.height;
- return w;
- } else {
- ret = find_placed_object( gtk_widget_get_parent(w), client_height );
- *client_height = *client_height - border_width + 2;
- return ret;
- }
+find_placed_object(GtkWidget *w, gint *client_height) {
+ GtkWidget * ret;
+ gint border_width;
+
+ border_width = gtk_container_get_border_width(GTK_CONTAINER(w));
+
+ if((w->allocation.height > 1) || (gtk_widget_get_parent(w)==NULL)) {
+ *client_height = w->allocation.height;
+ return w;
+ } else {
+ ret = find_placed_object(gtk_widget_get_parent(w), client_height);
+ *client_height = *client_height - border_width + 2;
+ return ret;
+ }
}
/*
@@ -66,8 +68,16 @@ get_notebook(GtkWidget * w) {
*/
static GtkWidget *
get_notebook(GtkWidget * w) {
- if (strcmp(GTK_OBJECT_TYPE_NAME(w),"GtkNotebook")==0) return w;
- if (gtk_widget_get_parent(w)==NULL) return NULL;
+ const gchar *name = NULL;
+
+ name = G_OBJECT_TYPE_NAME(w);
+
+ if (name && strcmp("GtkNotebook", name) == 0)
+ return w;
+
+ if(gtk_widget_get_parent(w) == NULL)
+ return NULL;
+
return get_notebook(gtk_widget_get_parent(w));
}
@@ -75,7 +85,9 @@ static void
* Signal handler. Triggers a page_added flag.
*/
static void
-on_page_add( GtkNotebook * book, GtkWidget * widget, guint page_num, gpointer user_data ) {
+on_page_add(GtkNotebook *book, GtkWidget *widget, guint page_num,
+ gpointer user_data)
+{
page_added = TRUE;
return;
}
@@ -84,9 +96,11 @@ static void
* When removing last page, forget this notebook
*/
static void
-on_page_remove( GtkNotebook * book, GtkWidget * widget, guint page_num, gpointer user_data ) {
- if (gtk_notebook_get_n_pages(book) == 0) {
- books_connected = g_list_remove( books_connected, book );
+on_page_remove(GtkNotebook *book, GtkWidget *widget, guint page_num,
+ gpointer user_data)
+{
+ if(gtk_notebook_get_n_pages(book) == 0) {
+ books_connected = g_list_remove(books_connected, book);
printf("Removed!\n");
}
}
@@ -97,8 +111,9 @@ connect_notebook_handler(GtkNotebook * n
*/
static void
connect_notebook_handler(GtkNotebook * notebook) {
- GList * item = g_list_find( books_connected, notebook );
- if (!item) {
+ GList * item = g_list_find(books_connected, notebook);
+
+ if(!item) {
g_signal_connect_after(notebook, "page-added",
G_CALLBACK(on_page_add), NULL);
g_signal_connect_after(notebook, "page-removed",
@@ -119,8 +134,7 @@ static void
* Change "vpaned" divider position
*/
static void
-rebuild_container(PidginConversation * conv) {
-
+rebuild_container(PidginConversation *conv) {
GtkWidget * pane = gtk_widget_get_parent(GTK_WIDGET(conv->lower_hbox));
GtkWidget * top = gtk_widget_get_parent( pane );
GtkWidget * vpaned = gtk_vpaned_new();
@@ -133,7 +147,7 @@ rebuild_container(PidginConversation * c
GValue v = {0, };
gint stored_height = 0;
- if(purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT)
+ if(purple_conversation_get_type(conv->active_conv) == PURPLE_CONV_TYPE_CHAT)
stored_height = purple_prefs_get_int(PREF_CHAT_ENTRY_HEIGHT);
else
stored_height = purple_prefs_get_int(PREF_IM_ENTRY_HEIGHT);
@@ -185,29 +199,35 @@ static void
* Store input area size depending on a conversation type
*/
static void
-store_area_size(PidginConversation * conv) {
+store_area_size(PidginConversation *gtkconv) {
+ GtkWidget *parent = NULL;
+ const gchar *name = NULL;
- gboolean chat = (conv->active_conv->type == PURPLE_CONV_TYPE_CHAT);
-
- if (strcmp("GtkVPaned",(GTK_OBJECT_TYPE_NAME(gtk_widget_get_parent( GTK_WIDGET(conv->lower_hbox)))))==0) {
- if (chat) {
+ parent = gtk_widget_get_parent(GTK_WIDGET(gtkconv->lower_hbox));
+ name = G_OBJECT_TYPE_NAME(parent);
+
+ if(name && strcmp("GtkVPaned", name) == 0) {
+ PurpleConversation *conv = gtkconv->active_conv;
+
+ if(purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
purple_prefs_set_int(PREF_CHAT_ENTRY_HEIGHT,
- conv->lower_hbox->allocation.height);
+ gtkconv->lower_hbox->allocation.height);
} else {
purple_prefs_set_int(PREF_IM_ENTRY_HEIGHT,
- conv->lower_hbox->allocation.height);
+ gtkconv->lower_hbox->allocation.height);
}
}
- return;
}
/*
* Signal handler. Called when conversation created, and rebuilds a conversation pane
*/
static void
-on_display(void* data) {
- PidginConversation * gtkconv = (PidginConversation*)data;
- rebuild_container( gtkconv );
+on_display(gpointer data) {
+ PidginConversation *gtkconv = (PidginConversation *)data;
+
+ if(gtkconv)
+ rebuild_container(gtkconv);
}
/*
@@ -215,13 +235,11 @@ on_destroy(void * data) {
*/
static void
on_destroy(void * data) {
- PurpleConversation * conv = (PurpleConversation*)data;
- PidginConversation * gtkconv;
- if (conv) {
- gtkconv = PIDGIN_CONVERSATION( conv );
- if (gtkconv) {
- store_area_size( gtkconv );
- }
+ PurpleConversation *conv = (PurpleConversation*)data;
+ if(conv) {
+ PidginConversation * gtkconv = PIDGIN_CONVERSATION(conv);
+ if (gtkconv)
+ store_area_size(gtkconv);
}
}
@@ -236,8 +254,8 @@ plugin_load(PurplePlugin *plugin) {
static gboolean
plugin_load(PurplePlugin *plugin) {
- void * gtk_conv_handle = pidgin_conversations_get_handle();
- void * conv_handle = purple_conversations_get_handle();
+ void *gtk_conv_handle = pidgin_conversations_get_handle();
+ void *conv_handle = purple_conversations_get_handle();
purple_prefs_add_none(PREF_PREFIX);
purple_prefs_add_int(PREF_CHAT_ENTRY_HEIGHT, 128);
@@ -253,8 +271,9 @@ plugin_unload(PurplePlugin *plugin) {
static gboolean
plugin_unload(PurplePlugin *plugin) {
- g_list_foreach( books_connected, cleanup_callback, NULL );
- g_list_free( books_connected );
+ g_list_foreach(books_connected, cleanup_callback, NULL);
+ g_list_free(books_connected);
+
return TRUE;
}
More information about the Plugins-commits
mailing list